undelay on senders, not from

diff --git a/config/undelayed-senders b/config/undelayed-senders
index d9c296a0bb0ccbd7774665ccd2ad715f8268191e..a82e64ea6eab2496c93fad1ab01c915a6b0a1742 100644 (file)
--- a/config/undelayed-senders
+++ b/config/undelayed-senders
@@ -1,8 +1,9 @@
-^Ruth Krafft <ruth@krafftwerk\.de>$
-^Hartmut Krafft <krafft@gestion\.de>$
-^Thomas Krafft <tkrafft@gmx\.net>$
-^Andreas Krafft <andy@madduck\.net>$
-^Isabel Junker <isajunker@gmx\.ch>$
+^ruth@krafftwerk\.de$
+^krafft@gestion\.de$
+^tkrafft@gmx\.net$
+^andy@madduck\.net$
+^isajunker@gmx\.ch$

 ^isabel\.junker@bafu\.admin\.ch$
 ^isabel\.junker@bafu\.admin\.ch$

-^Gian-Marco Baschera <gmbaschera@gmail\.com>$
-^Penny Leach <penny@she\.geek\.nz>$
+^gmbaschera@gmail\.com$
+^penny@she\.geek\.nz$
+^penny@mjollnir\.org$

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 14102c1258768dc62500644b33b0f71b76499785..339e3b696916328d5f741ae2993c2f6eb70e48c3 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -16,9 +16,9 @@
 
 :0 E
 * ! TICKLE ?? .
 
 :0 E
 * ! TICKLE ?? .

-* ? echo "$FROM" | $EGREP -qif $CONF/undelayed-senders
+* ? echo "$SENDER" | $EGREP -qif $CONF/undelayed-senders

 {
 {

-  LOG="delay:       do not delay mail from $FROM$NL"
+  LOG="delay:       do not delay mail from $SENDER$NL"

 }
 
 :0 E
 }
 
 :0 E