From cab7466c08fec71c48cba5a77beee08ec3b190a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= <ask@develooper.com>
Date: Mon, 18 Dec 2006 10:45:25 +0000
Subject: [PATCH]   Make the badmailfrom plugin support (optional) rejection
 messages after the   rejection pattern (Robin Hugh Johnson)

git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@697 958fd67b-6ff1-0310-b445-bb7760255be9
---
 Changes                   |  3 +++
 plugins/check_badmailfrom | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 142b01f..b9434ca 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,9 @@
 
   Support "module" plugins ("My::Plugin" in the config/plugins file)
 
+  Make the badmailfrom plugin support (optional) rejection messages after the 
+  rejection pattern (Robin Hugh Johnson)
+
   The ill-named $transaction->body_size() is depreceated now, use 
   $transaction->data_size() instead. Check your logs for LOGWARN messages 
   about "body_size" and fix your plugins. (Hanno Hecker)
diff --git a/plugins/check_badmailfrom b/plugins/check_badmailfrom
index 5030412..45267b5 100644
--- a/plugins/check_badmailfrom
+++ b/plugins/check_badmailfrom
@@ -1,7 +1,7 @@
 # -*- perl -*-
 =head1 NAME
 
-check_badmailfrom - checks the standard badmailfrom config
+check_badmailfrom - checks the badmailfrom config, with per-line reasons
 
 =head1 DESCRIPTION
 
@@ -13,6 +13,9 @@ recipient address for a message if the envelope sender address is
 listed in badmailfrom.  A line in badmailfrom may be of the form
 @host, meaning every address at host."
 
+You may optionally include a message after the sender address (leave a space),
+which is used when rejecting the sender.
+
 =head1 NOTES
 
 According to the SMTP protocol, we can't reject until after the RCPT
@@ -33,11 +36,14 @@ sub hook_mail {
   my $from = lc($sender->user) . '@' . $host;
 
   for my $bad (@badmailfrom) {
+    my $reason = $bad;
+    $reason =~ s/^\s*(\S+)[\t\s]+//;
+    $reason = "sorry, your envelope sender is in my badmailfrom list" unless $reason;
     $bad =~ s/^\s*(\S+).*/$1/;
     next unless $bad;
     $bad = lc $bad;
     $self->log(LOGWARN, "Bad badmailfrom config: No \@ sign in $bad") and next unless $bad =~ m/\@/;
-    $transaction->notes('badmailfrom', "sorry, your envelope sender is in my badmailfrom list")
+    $transaction->notes('badmailfrom', $reason)
       if ($bad eq $from) || (substr($bad,0,1) eq '@' && $bad eq "\@$host");
   }
   return (DECLINED);