From 3758992dd8b832ebb0ca8c3b0d490979665fa73c Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Thu, 31 May 2007 00:00:00 -0500
Subject: [PATCH] postfix-2.3.11

---
 postfix/HISTORY                   | 6 ++++++
 postfix/src/global/mail_version.h | 4 ++--
 postfix/src/qmqpd/qmqpd_peer.c    | 2 ++
 postfix/src/smtpd/smtpd_peer.c    | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 12b51a03a..603153856 100644
--- 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 1d71e5227..2cb95c5f3 100644
--- 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 f97a52452..711501981 100644
--- 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 e61e8233e..508ed2160 100644
--- 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);