fix admin eqdomain spamtrapping

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 7ba755ce79e73869d4dae287b086b37dd348fc16..a08a038ea9c28821807f6f330ab6359efdd49d6c 100644 (file)
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -4,18 +4,19 @@
   # 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:
   # 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:

+  DEST=admin
+

   :0
   *$ !^Delivered-To: .+@$EQ_DOMAIN
   *$ !^Received:$RE_SPACE+by $EQ_DOMAIN
   {
     LOG="rules/admin: spamtrap message as never passed $EQ_DOMAIN$NL"
   :0
   *$ !^Delivered-To: .+@$EQ_DOMAIN
   *$ !^Received:$RE_SPACE+by $EQ_DOMAIN
   {
     LOG="rules/admin: spamtrap message as never passed $EQ_DOMAIN$NL"

-    SPAMTRAPPED="never passed eqdomain"

     :0 fw
     :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
 #  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
 #
 #  :0