X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/29eaf6d1140ab9365c64b7edead45e6ac89eaa0d..039818c50e3af456c49a920ceaacdef62fa4ea14:/procmail/rules/admin

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 7574544..e8dd402 100644
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -1,20 +1,23 @@
 :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.
+  # machine at bar, meaning have been Delivered-To there, or originating from
+  # there:
   :0
   *$ !^Delivered-To: .+@$EQ_DOMAIN
+  *$ !^Received:$RE_SPACE+by $EQ_DOMAIN
   {
-    LOG="spamtrap message as it was never delivered to $EQ_DOMAIN$NL"
+    LOG="rules/admin: spamtrap message as never passed $EQ_DOMAIN$NL"
     :0 fw
-    |$FORMAIL -A'X-Spamtrapped: not delivered to eqdomain'
-    SPAMTRAPPED
+    |$FORMAIL -A"X-Spamtrapped: never passed eqdomain"
+    RETRAIN=spam
+    INCLUDERC=$PMDIR/handlespam
   }
 
-  DELAY="$DELAY_TONIGHT"
-  DEST=admin
-
 #  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
 #
 #  :0