diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-04-30 11:27:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:50 -0500 |
| commit | b481b29a1a8279d70efa1e1b6e13520336336f53 (patch) | |
| tree | 9d0c51ad1b20409a12780e17c3b9b83e6f46c7e5 | |
| parent | b8bba729ddbaa4a45aea72e8ac4b7ab802e26e44 (diff) | |
| download | samba-b481b29a1a8279d70efa1e1b6e13520336336f53.tar.gz samba-b481b29a1a8279d70efa1e1b6e13520336336f53.tar.bz2 samba-b481b29a1a8279d70efa1e1b6e13520336336f53.zip | |
r22602: s/HAVE_SOCKET_IPV6/HAVE_IPV6/ to match the define used by Heimdal.
(This used to be commit 5ff665b6531fdb4c7e56c49b7f923546d93b384c)
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.c | 2 | ||||
| -rw-r--r-- | source4/lib/socket/config.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/socket/socket.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index 664f998bc9..b78f6ef94e 100644 --- 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 250b3001eb..e9c194ddc4 100644 --- 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 eca668885c..d975eae2dc 100644 --- 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")); |