From: martin f. krafft <madduck@seamus.madduck.net>
Date: Fri, 17 Aug 2007 14:28:15 +0000 (+0200)
Subject: add spamtrapped header at the end
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/2d564054d3ad157320ae0a24256ab27fb979f987

add spamtrapped header at the end
---

diff --git a/procmail/addheaders b/procmail/addheaders
index 74fb503..34f38d3 100644
--- a/procmail/addheaders
+++ b/procmail/addheaders
@@ -2,6 +2,10 @@
 *$ !$MSG_DEJAVU
 |$FORMAIL -A"$DEJAVU_HEADER: $ID"
 
+:0 fw
+* SPAMTRAPPED ?? .
+|$FORMAIL -A"X-Spamtrapped: $SPAMTRAPPED"
+
 :0 fw
 * JUSTME ?? .
 |$FORMAIL -A"X-Justme: $JUSTME"
diff --git a/procmail/eqdomains b/procmail/eqdomains
index 4899f16..45e66e4 100644
--- a/procmail/eqdomains
+++ b/procmail/eqdomains
@@ -4,10 +4,8 @@
   :0
   * !ORIGINAL_TO ?? =.+@.+
   {
-    LOG="eqdomain:    spamtrap message due to missing = in localpart ($ORIGINAL_TO)$NL"
-    :0 fw
-    |$FORMAIL -A"X-Spamtrapped: missing equal sign in eqdomain ($ORIGINAL_TO)"
-    SPAMTRAPPED=eqdomain
+    SPAMTRAPPED="missing equal sign in eqdomain ($ORIGINAL_TO)"
+    LOG="eqdomain:    $SPAMTRAPPED$NL"
   }
 
   :0 E
diff --git a/procmail/spammers b/procmail/spammers
index b5dd34b..f1a1fa5 100644
--- a/procmail/spammers
+++ b/procmail/spammers
@@ -10,10 +10,8 @@ SPAMMER
 :0
 * SPAMMER ?? @
 {
-  LOG="spammers:    message from known spam sender$NL"
-  :0 fw
-  |$FORMAIL -A"X-Spamtrapped: from known spammer ($SPAMMER)"
-  SPAMTRAPPED=known-spammer
+  SPAMTRAPPED='from known spammer ($SPAMMER)'
+  LOG="spammers:    $SPAMTRAPPED$NL"
 }
 SPAMMER
 
diff --git a/procmail/spamtraps b/procmail/spamtraps
index adb1087..51c3706 100644
--- a/procmail/spamtraps
+++ b/procmail/spamtraps
@@ -1,10 +1,8 @@
 :0
 * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/spamtraps
 {
-  LOG="spamtraps:   message to known spamtrap$NL"
-  :0 fw
-  |$FORMAIL -A"X-Spamtrapped: message to known spamtrap ($ORIGINAL_TO)"
-  SPAMTRAPPED=known-spamtrap
+  SPAMTRAPPED="message to known spamtrap ($ORIGINAL_TO)"
+  LOG="spamtraps:   $SPAMTRAPPED$NL"
 }
 
 # vim:ft=procmail