X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/e86438abb235192645607a71137b5acdf208cc00..7bcfad116b7fc0ab32770a6c37042d763433a1a8:/procmail/rules/admin

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 7ba755c..e8dd402 100644
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -1,6 +1,9 @@
 :0
 * ORIG_DOMAIN ?? ^admin\.madduck\.net$
 {
+  DEST=admin
+  DELAY
+
   # require that messages sent to foo=bar@admin.madduck.net have passed the
   # machine at bar, meaning have been Delivered-To there, or originating from
   # there:
@@ -9,13 +12,12 @@
   *$ !^Received:$RE_SPACE+by $EQ_DOMAIN
   {
     LOG="rules/admin: spamtrap message as never passed $EQ_DOMAIN$NL"
-    SPAMTRAPPED="never passed eqdomain"
     :0 fw
-    |$FORMAIL -A"X-Spamtrapped: $SPAMTRAPPED"
+    |$FORMAIL -A"X-Spamtrapped: never passed eqdomain"
+    RETRAIN=spam
+    INCLUDERC=$PMDIR/handlespam
   }
 
-  DEST=admin
-
 #  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
 #
 #  :0