mirror of
https://github.com/samba-team/samba.git
synced 2025-11-12 04:23:49 +03:00
r22602: s/HAVE_SOCKET_IPV6/HAVE_IPV6/ to match the define used by Heimdal.
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
3064d881e3
commit
5ff665b653
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"));
|
||||
|
||||
Reference in New Issue
Block a user