separate from email from sender

diff --git a/procmail/defines b/procmail/defines
index 32a6e8f56b7286103009a8ea971dc3ac66ef6500..218ba89d7830c87688c5624503c99ecbed15b3b2 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -121,6 +121,18 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^From:$RE_EXTRACT_HEADER_VALUE
 { FROM="$MATCH" }
 
 *$ ^From:$RE_EXTRACT_HEADER_VALUE
 { FROM="$MATCH" }
 

+:0
+*$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+{ FROMEMAIL="$MATCH" }
+
+:0 E
+* FROM ?? ^.+ <\/[^>]+
+{ FROMEMAIL="$MATCH" }
+
+:0 E
+* FROM ?? ^.+ \(\/[^\)]+
+{ FROMEMAIL="$MATCH" }
+

 # if $SENDER is undefined or not an email address, get it from the message
 :0
 * !SENDER ?? @
 # if $SENDER is undefined or not an email address, get it from the message
 :0
 * !SENDER ?? @


@@ -130,16 +142,7 @@ INCLUDERC=$PMDIR/get-msgid
   { SENDER="$MATCH" }
 
   :0 E
   { SENDER="$MATCH" }
 
   :0 E

-  *$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
-  { SENDER="$MATCH" }
-
-  :0 E
-  * FROM ?? ^.+ <\/[^>]+
-  { SENDER="$MATCH" }
-
-  :0 E
-  * FROM ?? ^.+ \(\/[^\)]+
-  { SENDER="$MATCH" }
+  { SENDER="$FROMEMAIL" }

 }
 
 :0
 }
 
 :0

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

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

 {
   LOG="delay:       do not delay mail from $SENDER$NL"
 }
 {
   LOG="delay:       do not delay mail from $SENDER$NL"
 }

diff --git a/procmail/logging b/procmail/logging
index 67d77124efb9ec4aad089dfc6709f743c00fcab4..2f16c839966befbe6e8fec296bceabb5a36a7206 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -36,8 +36,8 @@ LOG="===========================================================================
 LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)

-from:        $FROM

 sender:      $SENDER
 sender:      $SENDER

+from:        $FROMEMAIL ($FROM)

 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"