X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/e60fac44d968469044591dbf1170e5b12aca22bd..b55ac0f2467f8f7502a88c843f37c0123029dd93:/procmail/eqdomains

diff --git a/procmail/eqdomains b/procmail/eqdomains
index 4899f16..b5e434d 100644
--- a/procmail/eqdomains
+++ b/procmail/eqdomains
@@ -4,23 +4,30 @@
   :0
   * !ORIGINAL_TO ?? =.+@.+
   {
-    LOG="eqdomain:    spamtrap message due to missing = in localpart ($ORIGINAL_TO)$NL"
-    :0 fw
-    |$FORMAIL -A"X-Spamtrapped: missing equal sign in eqdomain ($ORIGINAL_TO)"
-    SPAMTRAPPED=eqdomain
+    SPAMTRAPPED="missing equal sign in eqdomain ($ORIGINAL_TO)"
+    LOG="eqdomain:    $SPAMTRAPPED$NL"
   }
 
   :0 E
   {
     :0
     * ORIG_LOCAL ?? ^\/[^=]+
-    { EQ_LOCAL="$MATCH" }
+    {
+      EQ_LOCAL="$MATCH"
+      EQ_TO="$MATCH"
+    }
 
     :0
     * ORIG_LOCAL ?? .+=\/.+
-    { EQ_DOMAIN="$MATCH" }
+    {
+      EQ_DOMAIN="$MATCH"
 
-    LOG="eqdomain:    message to $EQ_LOCAL@$EQ_DOMAIN via $ORIG_DOMAIN$NL"
+      :0
+      * EQ_LOCAL ?? .
+      { EQ_TO="$EQ_TO@$EQ_DOMAIN" }
+    }
+
+    LOG="eqdomain:    message to $EQ_TO via $ORIG_DOMAIN$NL"
   }
 }