X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/75e25f19dcf7f61080a1e728affd40e5ee7dcea0..e86438abb235192645607a71137b5acdf208cc00:/procmail/tickle

diff --git a/procmail/tickle b/procmail/tickle
index bc4572d..6557848 100644
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,18 +1,17 @@
+# 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 ?? .
 {
-  LOG="tickle:      '$TICKLE'$NL"
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"