postfix-2.8.9

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 71ac5fbafb11083d58c39d77557415157da33c26..2982dc1c86778106dd6cfdccff19281a0393950f 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -16747,3 +16747,22 @@ 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
+
+       Cleanup: missing #include statement for bugfix code added
+       20111226. File: local/unknown.c.

diff --git a/postfix/src/cleanup/cleanup_milter.c b/postfix/src/cleanup/cleanup_milter.c
index e29feebed52ed6e6ae22d729a3e961950219b8f5..4877611fe1c20b327ce518a953b9a4d8e3dfd078 100644 (file)
--- a/postfix/src/cleanup/cleanup_milter.c
+++ b/postfix/src/cleanup/cleanup_milter.c
@@ -840,8 +840,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 cc33bb8ecf433b3caad7d6c7efa447576fb836b7..6b7abb1e18e2da1afa8fd330be396bf6e2ef1972 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      "20120201"
-#define MAIL_VERSION_NUMBER    "2.8.8"
+#define MAIL_RELEASE_DATE      "20120302"
+#define MAIL_VERSION_NUMBER    "2.8.9"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE     "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/local/Makefile.in b/postfix/src/local/Makefile.in
index 291664b5aab7bae35163c558147cc6e8af8d577d..4cd7eadb276796d8a78460b61c45b11b4a498e59 100644 (file)
--- a/postfix/src/local/Makefile.in
+++ b/postfix/src/local/Makefile.in
@@ -590,6 +590,7 @@ unknown.o: ../../include/argv.h
 unknown.o: ../../include/attr.h
 unknown.o: ../../include/been_here.h
 unknown.o: ../../include/bounce.h
+unknown.o: ../../include/defer.h
 unknown.o: ../../include/deliver_pass.h
 unknown.o: ../../include/deliver_request.h
 unknown.o: ../../include/delivered_hdr.h

diff --git a/postfix/src/local/unknown.c b/postfix/src/local/unknown.c
index 57e49af849e2d0ca9ae187fb401ba128d846e422..c98cac725343e8b8a24918aae6bf2fd30b447c30 100644 (file)
--- a/postfix/src/local/unknown.c
+++ b/postfix/src/local/unknown.c
@@ -72,6 +72,7 @@
 #include <mail_addr.h>
 #include <sent.h>
 #include <deliver_pass.h>
+#include <defer.h>
 
 /* Application-specific. */
 

diff --git a/postfix/src/postlog/postlog.c b/postfix/src/postlog/postlog.c
index 000ff70d68bd813f3bdf9fee4412e45d1e778b47..e2a7877d5729de2abf9f3ebc618585c292d7802f 100644 (file)
--- a/postfix/src/postlog/postlog.c
+++ b/postfix/src/postlog/postlog.c
@@ -206,7 +206,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;
 
     /*
      * Parse switches.