X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/38207b0c0e50475d745e937b085da41c7260006d..c129057ca2dab217adf182bbbd59d409d02e829f:/procmail/procmailrc diff --git a/procmail/procmailrc b/procmail/procmailrc index 9b66cee..9a55625 100755 --- a/procmail/procmailrc +++ b/procmail/procmailrc @@ -8,39 +8,6 @@ PMDIR=$HOME/.etc/mailfilter/procmail INCLUDERC=$PMDIR/defer -FROM_ALBATROSS=! -:0 -* ^X-Been-There: madduck@albatross -{ - M=$MATCH - :0 - * M ?? ^\+.+\+\/[^@]+ - { - # we have two +, so it's a virtual domain - L=$MATCH - - :0 - * M ?? ^\+\/[^+]+ - { D=$MATCH } - - OT="$L@$D" - L - D - } - - :0 E - * M ?? ^\/\+?[^@]* - { OT="madduck$MATCH@madduck.net" } - M - - :0 fw - |formail -I "X-Original-To: $OT" -A'X-From-Albatross: yes' - OT - - FROM_ALBATROSS - LOG="log: *** received $MSGID from albatross$NL" -} - INCLUDERC=$PMDIR/defines INCLUDERC=$PMDIR/ignore @@ -72,4 +39,6 @@ INCLUDERC=$PMDIR/handlespam INCLUDERC=$PMDIR/lurker +INCLUDERC=$PMDIR/listquirks + INCLUDERC=$PMRULES/all