fix admin eqdomain spamtrapping

[etc/mailfilter.git] / procmail / delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 3caf9f226f1bdfd000bcaf072e5d9e5e61ce5145..9b795343cf9283ea54d3376ba47bd53c4aeb620b 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,13 +1,10 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
+* ! DISABLE_DELAYS ?? .
 * DELAY ?? .
 * ! DELAYED ?? .
 {
-  :0
-  * DELAY ?? ^[0-9]
-  { DELAY="now + $DELAY" }
-
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 
@@ -26,11 +23,11 @@
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
     :0 fw
-    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I "X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
+
+    INCLUDERC=$PMDIR/record-delayed-mail
 
     :0
     $DELAYED_QUEUE
-
-    INCLUDERC=$PMDIR/record-delayed-mail
   }
 }