From: Wietse Venema <wietse@porcupine.org>
Date: Thu, 19 Oct 2006 05:00:00 +0000 (-0500)
Subject: postfix-2.4-20061019
X-Git-Tag: v2.4.0-RC1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=184360b175feaad836808b3c878e817ff272892b;p=thirdparty%2Fpostfix.git

postfix-2.4-20061019
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 1a86bb7c2..2891b9e4b 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -12804,6 +12804,16 @@ Apologies for any names omitted.
 	MAIL FROM and RCPT TO events to external form.  File:
 	cleanup/cleanup_milter.c.
 
+20061017
+
+	Cleanup: removed spurious warning when the cleanup server
+	attempts to bounce mail with soft_bounce=yes. Problem
+	reported by Ralf Hildebrandt. File: cleanup/cleanup_bounce.c.
+
+	Bugfix: null pointer bug when receiving a non-protocol
+	response on a cached SMTP/LMTP connection.  Report by Brian
+	Kantor.  Fix by Victor Duchovni.  File: smtp/smtp_reuse.c.
+
 Wish list:
 
 	Find out if with Sendmail, a Milter "add recipient" request
diff --git a/postfix/src/cleanup/cleanup_bounce.c b/postfix/src/cleanup/cleanup_bounce.c
index e6deb9586..bf8f52368 100644
--- a/postfix/src/cleanup/cleanup_bounce.c
+++ b/postfix/src/cleanup/cleanup_bounce.c
@@ -67,10 +67,15 @@ static void cleanup_bounce_append(CLEANUP_STATE *state, RECIPIENT *rcpt,
 {
     MSG_STATS stats;
 
+    /*
+     * Don't log a spurious warning (for example, when soft_bounce is turned
+     * on). bounce_append() already logs a record when the logfile can't be
+     * updated. Set the write error flag, so that a maildrop queue file won't
+     * be destroyed.
+     */
     if (bounce_append(BOUNCE_FLAG_CLEAN, state->queue_id,
 		      CLEANUP_MSG_STATS(&stats, state),
 		      rcpt, "none", dsn) != 0) {
-	msg_warn("%s: bounce logfile update error", state->queue_id);
 	state->errs |= CLEANUP_STAT_WRITE;
     }
 }
diff --git a/postfix/src/cleanup/cleanup_milter.c b/postfix/src/cleanup/cleanup_milter.c
index b63ddb28a..87a079577 100644
--- a/postfix/src/cleanup/cleanup_milter.c
+++ b/postfix/src/cleanup/cleanup_milter.c
@@ -1697,7 +1697,7 @@ static void usage(void)
     msg_warn("    del_rcpt addr");
 }
 
-/* flatten_args unparse partial command line */
+/* flatten_args - unparse partial command line */
 
 static void flatten_args(VSTRING *buf, char **argv)
 {
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 3329b61f8..7efa772c4 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20061015"
+#define MAIL_RELEASE_DATE	"20061019"
 #define MAIL_VERSION_NUMBER	"2.4"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/smtp/smtp_reuse.c b/postfix/src/smtp/smtp_reuse.c
index 361e4366e..1ed72d73b 100644
--- a/postfix/src/smtp/smtp_reuse.c
+++ b/postfix/src/smtp/smtp_reuse.c
@@ -175,6 +175,7 @@ static SMTP_SESSION *smtp_reuse_common(SMTP_STATE *state, int fd,
 	return (0);
     }
     state->session = session;
+    session->state = state;
 
     /*
      * XXX Temporary fix.