postfix-2.9.1

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 88c64f22949a825ccc685a6771a7ed44f194827c..b7fdfcdca846c0b34723791f6948442f5e6091c9 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -17608,3 +17608,24 @@ Apologies for any names omitted.
        have been updated when it was re-purposed to handle DSN
        SUCCESS notifications. Problem reported by Sabahattin
        Gucukoglu.  File: bounce/bounce_trace_service.c.
+
+20120202
+
+       Bugfix (introduced: Postfix 2.3): the "change header" milter
+       request could replace the wrong header. A long header name
+       could match a shorter one, because a length check was done
+       on the wrong string.  Reported by Vladimir Vassiliev.  File:
+       cleanup/cleanup_milter.c.
+
+20120214
+
+       Bugfix (introduced: Postfix 2.4): extraneous null assignment
+       caused core dump when postlog emitted the "usage" message.
+       Reported by Kant (fnord.hammer). File: postlog/postlog.c.
+
+20120217
+
+       Bugfix (introduced 20111219): sendmail -bs segfault, due
+       to a missing guard statement after an smtpd_check_rewrite()
+       call was moved closer to the command processor loop. Fix
+       by Bartek Szady. File: smtpd/smtpd.c.

diff --git a/postfix/src/cleanup/cleanup_milter.c b/postfix/src/cleanup/cleanup_milter.c
index 18957fe1dd4d5f94d48a12b076de3a4565b65ba5..7616780f5ebd35cfc44e46ec297e1f564c592c67 100644 (file)
--- a/postfix/src/cleanup/cleanup_milter.c
+++ b/postfix/src/cleanup/cleanup_milter.c
@@ -845,8 +845,7 @@ static off_t cleanup_find_header_start(CLEANUP_STATE *state, ssize_t index,
             /* Reset the saved PTR record and update last_type. */ ;
        else if ((header_label == 0
                  || (strncasecmp(header_label, STR(buf), len) == 0
-                     && (IS_SPACE_TAB(STR(buf)[len])
-                         || STR(buf)[len] == ':')))
+                     && (strlen(header_label) == len)))
                 && --index == 0) {
            /* If we have a saved PTR record, it points to start of header. */
            break;

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index addabbd432b7ab4e37bfea3ae80125f227002608..b3747370e03e21f3127997fd2d5093d86624d7f0 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20120131"
-#define MAIL_VERSION_NUMBER    "2.9.0"
+#define MAIL_RELEASE_DATE      "20120218"
+#define MAIL_VERSION_NUMBER    "2.9.1"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE     "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/postlog/postlog.c b/postfix/src/postlog/postlog.c
index 90f0f2b4cbd4818c751c555c91f3378a54712673..6384396bdc8e19c487c9b25be04ca47817d7cb93 100644 (file)
--- a/postfix/src/postlog/postlog.c
+++ b/postfix/src/postlog/postlog.c
@@ -207,7 +207,6 @@ int     main(int argc, char **argv)
     if (isatty(STDERR_FILENO))
        msg_vstream_init(tag, VSTREAM_ERR);
     msg_syslog_init(tag, LOG_PID, LOG_FACILITY);
-    tag = 0;
 
     /*
      * Check the Postfix library version as soon as we enable logging.

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index a95f08a97e7c1f070fca87ac9befd58216f5d1ab..aeecbf883c930694dd6e09585373e12dc326a2ad 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -2353,12 +2353,14 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
            return (-1);
        }
     }
-    err = smtpd_check_rewrite(state);
-    if (err != 0) {
-       /* XXX Reset access map side effects. */
-       mail_reset(state);
-       smtpd_chat_reply(state, "%s", err);
-       return (-1);
+    if (SMTPD_STAND_ALONE(state) == 0) {
+       err = smtpd_check_rewrite(state);
+       if (err != 0) {
+           /* XXX Reset access map side effects. */
+           mail_reset(state);
+           smtpd_chat_reply(state, "%s", err);
+           return (-1);
+       }
     }
 
     /*