postfix-2.5-20070531

diff --git a/postfix/HISTORY b/postfix/HISTORY
index d924587a98083a7f4fd15b36f65771974ac86edf..fd58a8fe8faae81e3965e17f30b38468ecdf96f4 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13582,6 +13582,12 @@ Apologies for any names omitted.
        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.
+
 Wish list:
 
        Update attr_print/scan() so they can send/receive file

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 41f73f7ca5b99f3c76c57093c9701b48a96978bb..5d88f456a8dbdab50afc0601612a9dc240004ed9 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      "20070530"
+#define MAIL_RELEASE_DATE      "20070531"
 #define MAIL_VERSION_NUMBER    "2.5"
 
 #ifdef SNAPSHOT

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);
 

diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 14ee3eef09352e6096c2f27268e16a5d61458a1f..49445bd1fc94de2a338e0ada0f2ec67cadde1e0b 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -73,6 +73,19 @@
 #define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
 #endif
 
+#ifdef FREEBSD2
+#define getsid(p) getpgrp()
+#ifndef CMSG_SPACE
+#define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(len))
+#endif
+#ifndef CMSG_LEN
+#define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+#endif
+#ifndef CMSG_ALIGN
+#define CMSG_ALIGN(n) ALIGN(n)
+#endif
+#endif                                 /* FREEBSD2 */
+
 #ifdef BSDI4
 /* #define HAS_IPV6 find out interface lookup method */
 #endif