postfix-2.6.18

diff --git a/postfix/HISTORY b/postfix/HISTORY
index b65ad789a1ccd0fb54c2b2367bb70727b1d6fc29..9f4fc07d6346d00458b98a26ab63f3df05c219c6 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -15669,3 +15669,30 @@ Apologies for any names omitted.
 
        Bugfix (introduced: 20000314): AUTH is not allowed after
        MAIL. Timo Sirainen.  File: smtpd/smtpd_sasl_proto.c.
+
+20121003
+
+       Bugfix: the postscreen_access_list feature was case-sensitive
+       in the first character of permit, reject, etc. Reported by
+       Francis Picabia. File: global/server_acl.c.
+
+20121010
+
+       Bugfix (introduced: Postfix 2.5): memory leak in program
+       initialization. Reported by Coverity. File: tls/tls_misc.c.
+
+       Bugfix (introduced: Postfix 2.3): memory leak in the unused
+       oqmgr program. Reported by Coverity. File: oqmgr/qmgr_message.c.
+
+20121013
+
+       Cleanup: to compute the LDAP connection cache lookup key,
+       join the numeric fields with null, just like string fields.
+       Viktor Dukhovni. File: global/dict_ldap.c.
+
+20121029
+
+       Workaround: strip datalink suffix from IPv6 addresses
+       returned by the system getaddrinfo() routine.  Such suffixes
+       mess up the default mynetworks value, host name/address
+       verification and possibly more. File: util/myaddrinfo.c.

diff --git a/postfix/makedefs b/postfix/makedefs
index 137ec71569d5faeef3b003cb13a9dfd146d3db68..fb72b7a9ac2173c67d8d76d5ff2952eb6767827e 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -146,6 +146,8 @@ case "$SYSTEM.$RELEASE" in
                ;;
   FreeBSD.8*)  SYSTYPE=FREEBSD8
                ;;
+  FreeBSD.9*)  SYSTYPE=FREEBSD9
+               ;;
   OpenBSD.2*)  SYSTYPE=OPENBSD2
                ;;
   OpenBSD.3*)  SYSTYPE=OPENBSD3

diff --git a/postfix/src/global/dict_ldap.c b/postfix/src/global/dict_ldap.c
index db91011f0ac2609c1b8976e5f54213d8bc3056cc..9054587bad22fbc0d1e236d5ce309228f755b016 100644 (file)
--- a/postfix/src/global/dict_ldap.c
+++ b/postfix/src/global/dict_ldap.c
@@ -792,8 +792,11 @@ static void dict_ldap_conn_find(DICT_LDAP *dict_ldap)
 #endif
     LDAP_CONN *conn;
 
+    /*
+     * Join key fields with null characters.
+     */
 #define ADDSTR(vp, s) vstring_memcat((vp), (s), strlen((s))+1)
-#define ADDINT(vp, i) vstring_sprintf_append((vp), "%lu", (unsigned long)(i))
+#define ADDINT(vp, i) vstring_sprintf_append((vp), "%lu%c", (unsigned long)(i), 0)
 
     ADDSTR(keybuf, dict_ldap->server_host);
     ADDINT(keybuf, dict_ldap->server_port);

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2a3d4c27e75b1e8a5e2ad014c829006d5fdc4a8a..cddbd4af27a9ce362a166657c847a584960cd639 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      "20120801"
-#define MAIL_VERSION_NUMBER    "2.6.17"
+#define MAIL_RELEASE_DATE      "20121213"
+#define MAIL_VERSION_NUMBER    "2.6.18"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE     "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/oqmgr/qmgr_message.c b/postfix/src/oqmgr/qmgr_message.c
index 27c5c92bbd05efcde2f072346a56173aa2257429..d8f892ac7081bc4860466865bcda694c0e7713b3 100644 (file)
--- a/postfix/src/oqmgr/qmgr_message.c
+++ b/postfix/src/oqmgr/qmgr_message.c
@@ -739,7 +739,7 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
        if (rec_type > 0)
            msg_warn("%s: ignoring out-of-order DSN original recipient <%.200s>",
                     message->queue_id, dsn_orcpt);
-       myfree(orig_rcpt);
+       myfree(dsn_orcpt);
     }
     if (orig_rcpt != 0) {
        if (rec_type > 0)

diff --git a/postfix/src/util/myaddrinfo.c b/postfix/src/util/myaddrinfo.c
index 171528c22939be23e278110ffc2455f84f18cc5f..eb2a425c790c6650ed457d720d18411dd60e4b03 100644 (file)
--- a/postfix/src/util/myaddrinfo.c
+++ b/postfix/src/util/myaddrinfo.c
@@ -68,6 +68,7 @@
 /*     into printable form. The result buffers should be large
 /*     enough to hold the printable address or port including the
 /*     null terminator.
+/*     This function strips off the IPv6 datalink suffix.
 /*
 /*     sockaddr_to_hostname() converts a binary network address
 /*     into a hostname or service.  The result buffer should be
@@ -188,6 +189,7 @@
 #include <msg.h>
 #include <inet_proto.h>
 #include <myaddrinfo.h>
+#include <split_at.h>
 
 /* Application-specific. */
 
@@ -592,16 +594,20 @@ int     sockaddr_to_hostaddr(const struct sockaddr * sa, SOCKADDR_SIZE salen,
     }
     return (0);
 #else
+    int     ret;
 
     /*
      * Native getnameinfo(3) version.
      */
-    return (getnameinfo(sa, salen,
-                       hostaddr ? hostaddr->buf : (char *) 0,
-                       hostaddr ? sizeof(hostaddr->buf) : 0,
-                       portnum ? portnum->buf : (char *) 0,
-                       portnum ? sizeof(portnum->buf) : 0,
-                       NI_NUMERICHOST | NI_NUMERICSERV));
+    ret = getnameinfo(sa, salen,
+                     hostaddr ? hostaddr->buf : (char *) 0,
+                     hostaddr ? sizeof(hostaddr->buf) : 0,
+                     portnum ? portnum->buf : (char *) 0,
+                     portnum ? sizeof(portnum->buf) : 0,
+                     NI_NUMERICHOST | NI_NUMERICSERV);
+    if (hostaddr != 0 && ret == 0 && sa->sa_family == AF_INET6)
+       (void) split_at(hostaddr->buf, '%');
+    return (ret);
 #endif
 }
 

diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 67de2c7ddf336ac1470a7decba6449cea030febd..88f2d248c7731288919217caae14cdf231f1102f 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -25,7 +25,7 @@
   */
 #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
     || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
-    || defined(FREEBSD8) \
+    || defined(FREEBSD8) || defined(FREEBSD9) \
     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
     || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \