replace existing x-tickle-delivered header

[etc/mailfilter.git] / procmail / eqdomains

diff --git a/procmail/eqdomains b/procmail/eqdomains
index 4899f165f86f32164fe56597caf593f7084dc120..b5e434d6aad8f5b1730c661ef26b7d39dcb9b214 100644 (file)
--- a/procmail/eqdomains
+++ b/procmail/eqdomains
@@ -4,23 +4,30 @@
   :0
   * !ORIGINAL_TO ?? =.+@.+
   {
   :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 ?? ^\/[^=]+
   }
 
   :0 E
   {
     :0
     * ORIG_LOCAL ?? ^\/[^=]+

-    { EQ_LOCAL="$MATCH" }
+    {
+      EQ_LOCAL="$MATCH"
+      EQ_TO="$MATCH"
+    }

 
     :0
     * ORIG_LOCAL ?? .+=\/.+
 
     :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"

   }
 }
 
   }
 }