fix rules/admin eqdomain spamtrapping

[etc/mailfilter.git] / procmail / tickle
diff --git a/procmail/tickle b/procmail/tickle

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