postfix-2.4.3

diff --git a/postfix/HISTORY b/postfix/HISTORY
index de0699759f16b5d1688cdbb555c31223599f2ac0..462a94a5130e75e7a3e1a9cb2c9a0e1ef89cdfda 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13475,3 +13475,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 eb26de4b5b84c505c00a9dae546289424895fc9b..220e0fc814ca0d15e8df723724cf3a30e5423a10 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.4.2"
+#define MAIL_RELEASE_DATE      "20070531"
+#define MAIL_VERSION_NUMBER    "2.4.3"
 
 #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 e6a7b2aef80a4a151b09ec9b87713c1a98ec6542..7e2423371259e93c2539752cdeb55c7100b1638d 100644 (file)
--- a/postfix/src/smtpd/smtpd_peer.c
+++ b/postfix/src/smtpd/smtpd_peer.c
@@ -196,7 +196,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);