r22602: s/HAVE_SOCKET_IPV6/HAVE_IPV6/ to match the define used by Heimdal.

(This used to be commit 5ff665b6531fdb4c7e56c49b7f923546d93b384c)

diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 664f998bc992fc734f7f7c5530a4f3edc6ecfb27..b78f6ef94e04151b95b044c5a225a5abda1308bb 100644 (file)
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -258,7 +258,7 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
                case PF_INET:
                        name = "ipv4";
                        break;
-#ifdef HAVE_SOCKET_IPV6
+#ifdef HAVE_IPV6
                case PF_INET6:
                        name = "ipv6";
                        break;

diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
index 250b3001eb2bed2d05a8752078840f4923278c53..e9c194ddc4ed50d12fde68b2cd493e6119a9f432 100644 (file)
--- a/source4/lib/socket/config.m4
+++ b/source4/lib/socket/config.m4
@@ -91,7 +91,7 @@ AC_CHECK_FUNCS(gethostbyname2, have_ipv6=true, have_ipv6=false)
 SMB_ENABLE(socket_ipv6, NO)
 if $have_ipv6 = true; then
     SMB_ENABLE(socket_ipv6, YES)
-    AC_DEFINE(HAVE_SOCKET_IPV6,1,[Whether the system has ipv6 support])
+    AC_DEFINE(HAVE_IPV6,1,[Whether the system has ipv6 support])
 fi
 dnl don't build ipv6 by default, unless the above test enables it, or
 dnl the configure uses --with-static-modules=socket_ipv6

diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index eca668885cfaa32784b06cd5bc1c000b12297c0f..d975eae2dc79a9b20251951ff9ee0159d6739bb8 100644 (file)
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -426,7 +426,7 @@ _PUBLIC_ const struct socket_ops *socket_getops_byname(const char *family, enum
                return socket_ipv4_ops(type);
        }
 
-#if HAVE_SOCKET_IPV6
+#if HAVE_IPV6
        if (strcmp("ipv6", family) == 0) {
                if (lp_parm_bool(-1, "socket", "noipv6", False)) {
                        DEBUG(3, ("IPv6 support was disabled in smb.conf"));