also skip spamfiltering for reinjected messages

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 2ffec514a5310a4093cb13f7355eb5a1b22c6921..95a0cbce80455c10f20afc941ee7b25b871fc52b 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -30,15 +30,20 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #}
 
 # check whether this message is being reinjected
 #}
 
 # check whether this message is being reinjected

-TRAINED_AS

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

-* ^X-Trained-As: \/(h|sp)am

 {
 {

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

   :0
   :0

-  * MATCH ?? spam
-  { IS_SPAM=already-trained }
+  * ^X-Trained-As: \/(h|sp)am
+  {
+    LOG="spamfilter:  skipping already trained $MATCH$NL"
+    :0
+    * MATCH ?? spam
+    { IS_SPAM=already-trained }
+  }
+
+  :0 E
+  { LOG="spamfilter:  skipping reinjected message$NL" }

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