From: martin f. krafft <madduck@madduck.net>
Date: Fri, 29 Feb 2008 14:42:15 +0000 (+0100)
Subject: fix rules/admin eqdomain spamtrapping
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/e86438abb235192645607a71137b5acdf208cc00?ds=sidebyside

fix rules/admin eqdomain spamtrapping
---

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 8598da6..7ba755c 100644
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -2,14 +2,16 @@
 * ORIG_DOMAIN ?? ^admin\.madduck\.net$
 {
   # require that messages sent to foo=bar@admin.madduck.net have passed the
-  # machine at bar, meaning have been Delivered-To there.
+  # machine at bar, meaning have been Delivered-To there, or originating from
+  # there:
   :0
   *$ !^Delivered-To: .+@$EQ_DOMAIN
+  *$ !^Received:$RE_SPACE+by $EQ_DOMAIN
   {
-    LOG="spamtrap message as it was never delivered to $EQ_DOMAIN$NL"
+    LOG="rules/admin: spamtrap message as never passed $EQ_DOMAIN$NL"
+    SPAMTRAPPED="never passed eqdomain"
     :0 fw
-    |$FORMAIL -A'X-Spamtrapped: not delivered to eqdomain'
-    SPAMTRAPPED
+    |$FORMAIL -A"X-Spamtrapped: $SPAMTRAPPED"
   }
 
   DEST=admin