proper handling of X-Postponed header

[etc/mailfilter.git] / procmail / get-msgid

diff --git a/procmail/get-msgid b/procmail/get-msgid
index e859f2dd44366fe73f5685832564e2ca456a7b78..50fbef4f01459bfcf76d826deb330ba099840ffb 100644 (file)
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -5,15 +5,24 @@
 :0
 * MSGID ?? ^[  ]*$|^<>$
 {
-  TMPFILE="`tempfile -p msgid`"
-  LOG="get-msgid:   LACKING MSGID header, DUMPING to $TMPFILE$NL"
+  :0
+  * ^Resent-Message-Id:[       ]*\/[^  ]+
+  {
+    LOG="get-msgid:   lacking message-id, using resent-message-id...$NL"
+    :0 fw
+    |$FORMAIL -R Resent-Message-ID Message-ID
+  }
 
-  :0 ifw
-  |cat > $TMPFILE
+  :0 E
+  {
+    LOG="get-msgid:   lacking message-id, generating one...$NL"
+    :0 fw
+    |$FORMAIL -a Message-ID:
+  }
 
-  EX_DEFER=75
-  EXITCODE=$EX_DEFER
-  HOST
+  :0
+  * ^Message-Id:[      ]*\/[^  ]+
+  { MSGID="$MATCH" }
 }
 
 :0
@@ -27,13 +36,8 @@
 *$ MSGID ?? .+@$RE_MAILRELAYS>
 *$ !^Return-Path: .+@$RE_MAILRELAYS\>
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
+* MSGID ?? ^<\/[^>]+
 {
   LOG="get-msgid:   missing message ID added by one of our mail relays$NL"
-
-  :0 fw
-  |$SED -re "s/^([Mm]essage-[Ii][Dd]:[^@]+@$RE_MAILRELAYS)\>/\1.MSGID-ADDED/"
-
-  :0
-  * ^Message-Id:[      ]*\/[^  ]+
-  { MSGID="$MATCH" }
+  MSGID="<${MATCH}.MSGID-ADDED>"
 }