From: Wietse Venema <wietse@porcupine.org>
Date: Fri, 1 Nov 2002 05:00:00 +0000 (-0500)
Subject: postfix-1.1.11-20021101
X-Git-Tag: v2.0.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341ed7c6888402c833ebd963fe6add203050e841;p=thirdparty%2Fpostfix.git

postfix-1.1.11-20021101
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 9e2c2f2f9..6f4b7c3eb 100644
--- 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 932aacb8e..77734a8b0 100644
--- 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 df19c49c1..19131642d 100644
--- 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 9acb71596..1daffa041 100644
--- 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 a2e529805..609a8b514 100644
--- 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 6952a93c7..215895054 100644
--- 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;
 	}