X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/f133cb12ac933b7a2fe3849938621cc59cdab43b..ec33cde8f8ecb3f68c805ce48b4d62838647a739:/procmail/spamfilter diff --git a/procmail/spamfilter b/procmail/spamfilter index 95a0cbc..9e88642 100755 --- a/procmail/spamfilter +++ b/procmail/spamfilter @@ -29,21 +29,21 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail} # |$FORMAIL -I"X-Spam: spamtrapped" #} -# check whether this message is being reinjected +# check whether this message is being resubmitted :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 - * MATCH ?? spam + * TRAINED_AS ?? spam { 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