add spamtrapped header at the end

diff --git a/procmail/addheaders b/procmail/addheaders
index 74fb503bd3c6d90d9c1c5eee8720b61269582165..34f38d3a21ee3158e0524a6eaee9e658d76f273f 100644 (file)
--- 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 4899f165f86f32164fe56597caf593f7084dc120..45e66e4b092de6b31cd4bb199823dcafe5f72c2e 100644 (file)
--- 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 b5dd34b5fc49f4e05a5acd084e91c0bdb7c4aa17..f1a1fa5630643923d3499b76bef15d596a7289dd 100644 (file)
--- 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 adb108751e911524ec692a5dfbe1941bc9254595..51c37064888da47711fcfbe718812790f851b085 100644 (file)
--- 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