fix rules/admin eqdomain spamtrapping

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 8598da6c1ea1c01d2ec01a274a1408569eb7a203..7ba755ce79e73869d4dae287b086b37dd348fc16 100644 (file)
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -2,14 +2,16 @@
 * ORIG_DOMAIN ?? ^admin\.madduck\.net$
 {
   # require that messages sent to foo=bar@admin.madduck.net have passed the
 * ORIG_DOMAIN ?? ^admin\.madduck\.net$
 {
   # 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
   :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"
+    SPAMTRAPPED="never passed eqdomain"

     :0 fw
     :0 fw

-    |$FORMAIL -A'X-Spamtrapped: not delivered to eqdomain'
-    SPAMTRAPPED
+    |$FORMAIL -A"X-Spamtrapped: $SPAMTRAPPED"

   }
 
   DEST=admin
   }
 
   DEST=admin