fix rules/admin eqdomain spamtrapping

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index fbb8a760f0eb17603afcc7efa627c00d490409af..65578489063b6d0fe28542b57ab87eedebf93826 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,16 +1,16 @@
+# The X-Tickle header has priority over the Original-To address
 :0
-* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
-* ORIGINAL_TO ?? ^\/[^@]+
+*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
 { TICKLE="$MATCH" }
 
 :0 E
-*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
+* ORIGINAL_TO ?? ^\/[^@]+
 { TICKLE="$MATCH" }
 
 :0
 * TICKLE ?? .
 * ! DEST ?? .
-* ! TICKLE_DELIVERED ?? .
 {
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"