delete X-Trained-As header after storing value in variable

[etc/mailfilter.git] / procmail / spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 95a0cbce80455c10f20afc941ee7b25b871fc52b..9e88642e942f76a32de62fad70bb7bad5e5f13cb 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -29,21 +29,21 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 

-# check whether this message is being reinjected
+# check whether this message is being resubmitted

 :0
 *$ $MSG_DEJAVU
 {
   :0
 :0
 *$ $MSG_DEJAVU
 {
   :0

-  * ^X-Trained-As: \/(h|sp)am
+  * TRAINED_AS ?? .

   {
   {

-    LOG="spamfilter:  skipping already trained $MATCH$NL"
+    LOG="spamfilter:  skipping already trained $TRAINED_AS$NL"

     :0
     :0

-    * MATCH ?? spam
+    * TRAINED_AS ?? spam

     { IS_SPAM=already-trained }
   }
 
   :0 E
     { IS_SPAM=already-trained }
   }
 
   :0 E

-  { LOG="spamfilter:  skipping reinjected message$NL" }
+  { LOG="spamfilter:  skipping resubmitted message$NL" }

 }
 
 # let earlier parts of the mailfilter cause bypassing the checks
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks