allow early scripts to properly log

diff --git a/procmail/defines b/procmail/defines
index 55508cb1032602ad93e4c7cdc567ce865ba719bc..1c55b63f4cda5c10c4001b798d463dc3bacbd1c1 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -150,7 +150,7 @@ INCLUDERC=$PMDIR/get-msgid
 { ORIGINAL_TO="$MATCH" }
 :0 E
 * ^Received:
 { ORIGINAL_TO="$MATCH" }
 :0 E
 * ^Received:

-{ LOG="NO ORIGINAL_TO: $MSGID" }
+{ LOGLATER="NO ORIGINAL_TO: $MSGID" }

 
 :0
 *$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
 
 :0
 *$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE

diff --git a/procmail/get-msgid b/procmail/get-msgid
index 50fbef4f01459bfcf76d826deb330ba099840ffb..61eca10419a0afa18aa5283daf8e4917fa354e37 100644 (file)
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -8,14 +8,14 @@
   :0
   * ^Resent-Message-Id:[       ]*\/[^  ]+
   {
   :0
   * ^Resent-Message-Id:[       ]*\/[^  ]+
   {

-    LOG="get-msgid:   lacking message-id, using resent-message-id...$NL"
+    LOGLATER="get-msgid:   lacking message-id, using resent-message-id...$NL"

     :0 fw
     |$FORMAIL -R Resent-Message-ID Message-ID
   }
 
   :0 E
   {
     :0 fw
     |$FORMAIL -R Resent-Message-ID Message-ID
   }
 
   :0 E
   {

-    LOG="get-msgid:   lacking message-id, generating one...$NL"
+    LOGLATER="get-msgid:   lacking message-id, generating one...$NL"

     :0 fw
     |$FORMAIL -a Message-ID:
   }
     :0 fw
     |$FORMAIL -a Message-ID:
   }


@@ -28,7 +28,7 @@
 :0
 * ! MSGID ?? ^<[^>]+>$
 {
 :0
 * ! MSGID ?? ^<[^>]+>$
 {

-  LOG="get-msgid:   message-id '$MSGID' not enclosed in <>, fixing it...$NL"
+  LOGLATER="get-msgid:   message-id '$MSGID' not enclosed in <>, fixing it...$NL"

   MSGID="<$MSGID>"
 }
 
   MSGID="<$MSGID>"
 }
 


@@ -38,6 +38,6 @@
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
 * MSGID ?? ^<\/[^>]+
 {
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
 * MSGID ?? ^<\/[^>]+
 {

-  LOG="get-msgid:   missing message ID added by one of our mail relays$NL"
+  LOGLATER="get-msgid:   missing message ID added by one of our mail relays$NL"

   MSGID="<${MATCH}.MSGID-ADDED>"
 }
   MSGID="<${MATCH}.MSGID-ADDED>"
 }

diff --git a/procmail/logging b/procmail/logging
index a1e199a89e9ead5e6202368ace47ba7452af58ec..d6fc08387847daf8ed4a1b913d328de6d400091c 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -12,8 +12,13 @@ MSGIDDIR=$PMVAR/msgid
 MASTERLOGFILE="$LOGFILE"
 LOGFILE="$THISLOGFILE"
 
 MASTERLOGFILE="$LOGFILE"
 LOGFILE="$THISLOGFILE"
 

-LOG="==============================================================================
-msgid:       $MSGID
+LOG="==============================================================================$NL"
+
+:0
+* LOGLATER ?? .
+{ LOG="$LOGLATER" }
+
+LOG="msgid:       $MSGID

 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 from:        $FROM
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 from:        $FROM