postfix-1.1.11-20021101

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 9e2c2f2f98e9d6039b4e9ebc6f893f412619ab81..6f4b7c3ebb59e528cd963ebe02d967ce6c53477d 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -7139,6 +7139,12 @@ Apologies for any names omitted.
        lock management and requires extra code to remove broken
        files. Files:  util/dict_db.c, global/mkmap*.[hc].
 
+20021101
+
+       Bugfix: don't complain about out-of-order original recipient
+       records for finished recipients. Files:  *qmgr/qmgr_message.c,
+       cleanup/cleanup_envelope.c, cleanup/cleanup_extracted.c.
+
 Open problems:
 
        Low: revise other local delivery agent duplicate filters.

diff --git a/postfix/src/cleanup/cleanup_envelope.c b/postfix/src/cleanup/cleanup_envelope.c
index 932aacb8eb7edfa865d9b35779d0e352bab64a3b..77734a8b0af3ddb317b29ef27af4069f2ad2bc03 100644 (file)
--- a/postfix/src/cleanup/cleanup_envelope.c
+++ b/postfix/src/cleanup/cleanup_envelope.c
@@ -145,8 +145,9 @@ static void cleanup_envelope_process(CLEANUP_STATE *state, int type, char *buf,
 
     if (type != REC_TYPE_RCPT) {
        if (state->orig_rcpt != 0) {
-           msg_warn("%s: out-of-order original recipient record <%.200s>",
-                    state->queue_id, state->orig_rcpt);
+           if (type != REC_TYPE_DONE)
+               msg_warn("%s: out-of-order original recipient record <%.200s>",
+                        state->queue_id, state->orig_rcpt);
            myfree(state->orig_rcpt);
            state->orig_rcpt = 0;
        }

diff --git a/postfix/src/cleanup/cleanup_extracted.c b/postfix/src/cleanup/cleanup_extracted.c
index df19c49c1937af4a84aacc808390742c9c8feb75..19131642d11718a7068958665e9749a89d21e15d 100644 (file)
--- a/postfix/src/cleanup/cleanup_extracted.c
+++ b/postfix/src/cleanup/cleanup_extracted.c
@@ -132,8 +132,9 @@ static void cleanup_extracted_process(CLEANUP_STATE *state, int type, char *buf,
      */
     if (type != REC_TYPE_RCPT) {
        if (state->orig_rcpt != 0) {
-           msg_warn("%s: out-of-order original recipient record <%.200s>",
-                    state->queue_id, buf);
+           if (type != REC_TYPE_DONE)
+               msg_warn("%s: out-of-order original recipient record <%.200s>",
+                        state->queue_id, buf);
            myfree(state->orig_rcpt);
            state->orig_rcpt = 0;
        }

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 9acb715967db0ef2d57f12f2ebd204aa6ecb9159..1daffa041c1b9c23914dfb219e2d63105837fda6 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE      "20021031"
+#define MAIL_RELEASE_DATE      "20021101"
 
 #define VAR_MAIL_VERSION       "mail_version"
 #define DEF_MAIL_VERSION       "1.1.11-" MAIL_RELEASE_DATE

diff --git a/postfix/src/nqmgr/qmgr_message.c b/postfix/src/nqmgr/qmgr_message.c
index a2e5298051c889740aa9c6baf8a1ddc47d8dab1b..609a8b51412a83ddf915d169a8fe512cde137dd7 100644 (file)
--- a/postfix/src/nqmgr/qmgr_message.c
+++ b/postfix/src/nqmgr/qmgr_message.c
@@ -462,8 +462,9 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
            }
        }
        if (orig_rcpt != 0) {
-           msg_warn("%s: out-of-order original recipient record <%.200s>",
-                    message->queue_id, start);
+           if (rec_type != REC_TYPE_DONE)
+               msg_warn("%s: out-of-order original recipient record <%.200s>",
+                        message->queue_id, start);
            myfree(orig_rcpt);
            orig_rcpt = 0;
        }

diff --git a/postfix/src/qmgr/qmgr_message.c b/postfix/src/qmgr/qmgr_message.c
index 6952a93c7747702681ea16d6ba142a69afa04359..21589505442392115d9ce68c0f603952dc8e3288 100644 (file)
--- a/postfix/src/qmgr/qmgr_message.c
+++ b/postfix/src/qmgr/qmgr_message.c
@@ -342,8 +342,9 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
            }
        }
        if (orig_rcpt != 0) {
-           msg_warn("%s: out-of-order original recipient record <%.200s>",
-                    message->queue_id, start);
+           if (rec_type != REC_TYPE_DONE)
+               msg_warn("%s: out-of-order original recipient record <%.200s>",
+                        message->queue_id, start);
            myfree(orig_rcpt);
            orig_rcpt = 0;
        }