cleanup and put has dirs into relative logfile name

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

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 9e8e02a5345c7d8876982928c69ff4f3999e8a5d..cf4837d1a31646b965dc25a94fb073b64d02ac8a 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -14,6 +14,13 @@
   LOG="delay:       delays disabled, thus not delaying$NL"
 }
 
   LOG="delay:       delays disabled, thus not delaying$NL"
 }
 

+:0 E
+* ! TICKLE ?? .
+* ? echo "$FROMEMAIL" | $EGREP -qif $CONF/undelayed-senders
+{
+  LOG="delay:       do not delay mail from $SENDER$NL"
+}
+

 :0 E
 * 1^0 DELAY ?? .
 * 1^0 RELEASE ?? .
 :0 E
 * 1^0 DELAY ?? .
 * 1^0 RELEASE ?? .


@@ -42,7 +49,6 @@
     :0 fw
     |$FORMAIL -I"X-Postponed: $RELEASE"
 
     :0 fw
     |$FORMAIL -I"X-Postponed: $RELEASE"
 

-    INCLUDERC=$PMDIR/record-delayed-mail

     :0
     $DELAYED_QUEUE
   }
     :0
     $DELAYED_QUEUE
   }