postfix-2.3.11

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 12b51a03ad0de6309fdffd808c93776fb5a0d82f..603153856ec26fbd2acc5511e2736db0f1a4d2ce 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13039,3 +13039,9 @@ Apologies for any names omitted.
        to fail when the machine name is not found in /etc/hosts,
        or that cause Postfix processes to hang when the network
        is down.
+
+20070531
+
+       Portability: Victor helpfully pointed out that change
+       20070425 broke on non-IPv6 systems. Files: smtpd/smtpd_peer.c,
+       qmqpd/qmqpd_peer.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 1d71e5227b53a46df7d526306768565399f20720..2cb95c5f3e8f1d664b6fa113c5acec426e9031ab 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      "20070530"
-#define MAIL_VERSION_NUMBER    "2.3.10"
+#define MAIL_RELEASE_DATE      "20070531"
+#define MAIL_VERSION_NUMBER    "2.3.11"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE     "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/qmqpd/qmqpd_peer.c b/postfix/src/qmqpd/qmqpd_peer.c
index f97a524528fd686efe32eb1aa74624ba14664d94..711501981effcdc0236c2f9de167ccf88b0b2f7c 100644 (file)
--- a/postfix/src/qmqpd/qmqpd_peer.c
+++ b/postfix/src/qmqpd/qmqpd_peer.c
@@ -122,7 +122,9 @@ void    qmqpd_peer_init(QMQPD_STATE *state)
         */
        if (strchr((char *) proto_info->sa_family_list, sa->sa_family) == 0)
            msg_fatal("cannot handle socket type %s with \"%s = %s\"",
+#ifdef AF_INET6
                      sa->sa_family == AF_INET6 ? "AF_INET6" :
+#endif
                      sa->sa_family == AF_INET ? "AF_INET" :
                      "other", VAR_INET_PROTOCOLS, var_inet_protocols);
 

diff --git a/postfix/src/smtpd/smtpd_peer.c b/postfix/src/smtpd/smtpd_peer.c
index e61e8233e9a3d75f22783c65f6115b367d292846..508ed21600ac7e980557a3da51fc4b6e9f70cee2 100644 (file)
--- a/postfix/src/smtpd/smtpd_peer.c
+++ b/postfix/src/smtpd/smtpd_peer.c
@@ -189,7 +189,9 @@ void    smtpd_peer_init(SMTPD_STATE *state)
         */
        if (strchr((char *) proto_info->sa_family_list, sa->sa_family) == 0)
            msg_fatal("cannot handle socket type %s with \"%s = %s\"",
+#ifdef AF_INET6
                      sa->sa_family == AF_INET6 ? "AF_INET6" :
+#endif
                      sa->sa_family == AF_INET ? "AF_INET" :
                      "other", VAR_INET_PROTOCOLS, var_inet_protocols);