postfix-2.5-20071227

diff --git a/postfix/HISTORY b/postfix/HISTORY
index a5890f1c3175953f311fb360d48da51e6ad4178e..a09b76006c2c259a15f4a5cae4c8b8de3b54d05c 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -14060,7 +14060,7 @@ Apologies for any names omitted.
        Milter can now update its own macros instead of clobbering
        the global copy that is shared with other Milters. Also an
        opportunity to clean up some ad-hoc code for sending macro
-       lists from smtp(8) to cleanup(8). Files: milter/milter.c,
+       lists from smtpd(8) to cleanup(8). Files: milter/milter.c,
        milter/milter8.c, milter/milter_macros.c.
 
 20071224
@@ -14070,4 +14070,10 @@ Apologies for any names omitted.
        milter/milter.c, milter/milter8.c, milter/milter_macros.c.
 
        Cleanup: name_code(3) and name_mask(3) now support read-only
-       tables. Files: util/name_code.[hc] util/name_mask.[hc].
+       tables. Files: util/name_code.[hc], util/name_mask.[hc].
+
+20071227
+
+       Cleanup: further refinements of the Milter code, allowing
+       for multiple macro overrides. The code is now ready for
+       serious testing. File: milter/milter8.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 78c67017db9316d848f5074b5b57d01d67a0b8b9..09cb25eb6d294a12a5b8db7a7a253eaea2a74d6e 100644 (file)
--- 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      "20071224"
+#define MAIL_RELEASE_DATE      "20071227"
 #define MAIL_VERSION_NUMBER    "2.5"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/milter/milter8.c b/postfix/src/milter/milter8.c
index 17aa1ee0287812be435a2ff3f63034e3d2e2bb4d..491e34d8828d8769cf13aa9166f58f8e37475301 100644 (file)
--- a/postfix/src/milter/milter8.c
+++ b/postfix/src/milter/milter8.c
@@ -319,7 +319,7 @@ static const NAME_CODE smfim_table[] = {
 
  /*
   * Mapping from external macro set numbers to our internal MILTER_MACROS
-  * structure members, without using an array or switch statement.
+  * structure members, without using a switch statement.
   */
 static const size_t milter8_macro_offsets[] = {
     offsetof(MILTER_MACROS, conn_macros),      /* SMFIM_CONNECT */
@@ -1740,7 +1740,7 @@ static void milter8_connect(MILTER8 *milter)
               && milter8_read_data(milter, &data_len,
                                    MILTER8_DATA_HLONG, &mac_type,
                                    MILTER8_DATA_STRING, buf,
-                                   MILTER8_DATA_END) == 0) {
+                                   MILTER8_DATA_MORE) == 0) {
            smfim_name = str_name_code(smfim_table, mac_type);
            if (smfim_name == 0) {
                msg_warn("milter %s: ignoring unknown macro type %u",
@@ -2599,13 +2599,12 @@ MILTER *milter8_receive(VSTREAM *stream, MILTERS *parent)
 #endif
     } else if ((fd = LOCAL_RECV_FD(vstream_fileno(stream))) < 0) {
        FREE_MACROS_AND_RETURN(0);
+    } else {
 #ifdef MUST_READ_AFTER_SENDING_FD
-    } else if (attr_print(stream, ATTR_FLAG_NONE,
+       (void) attr_print(stream, ATTR_FLAG_NONE,
                          ATTR_TYPE_STR, MAIL_ATTR_DUMMY, "",
-                         ATTR_TYPE_END) != 0) {
-       FREE_MACROS_AND_RETURN(0);
+                         ATTR_TYPE_END);
 #endif
-    } else {
 #define NO_PROTOCOL    ((char *) 0)
 
        if (msg_verbose)