X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/77db0127feeb3654994cee2c75fa53b530e84eeb..ce01c73dbc58af7f829bbed24b3547e7ff7588e4:/procmail/spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 066b9cb..95a0cbc 100755
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -30,15 +30,20 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #}
 
 # check whether this message is being reinjected
-TRAINED_AS
 :0
 *$ $MSG_DEJAVU
-* ^X-Trained-As: \/(h|sp)am
 {
-  LOG="spamfilter:  skipping already trained $MATCH$NL"
   :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
@@ -261,6 +266,7 @@ TRAINED_AS
   |$FORMAIL -I"X-Spam: spamtrapped ham"
   IS_SPAM=spamtrapped-ham
   RETRAIN=spam
+  SPAM_UNSURE
 }
 
 #VERBOSE=no