gracefully handle local message without orig-to

diff --git a/procmail/defines b/procmail/defines
index 2aae636af0d1852acd93838a6d52c119a3c04905..754ba493adb5817be95a5e595f5f0e7ebba26031 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -148,6 +148,7 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E

+* ^Received:

 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0

diff --git a/procmail/normalise b/procmail/normalise
index b20569414c845b90f0bc191aa1695816490fe1d7..bd8d0a799026b164683fada0c323d94fd9e601a4 100644 (file)
--- a/procmail/normalise
+++ b/procmail/normalise
@@ -1,5 +1,6 @@
-# add hostname if missing
+# add hostname if missing, but only if ORIGINAL_TO is not empty

 :0
 :0

+* ORIGINAL_TO ?? .

 * ! ORIGINAL_TO ?? @
 { ORIGINAL_TO="$ORIGINAL_TO@$HOSTNAME" }
 
 * ! ORIGINAL_TO ?? @
 { ORIGINAL_TO="$ORIGINAL_TO@$HOSTNAME" }