svn commit: samba r22602 - in branches/SAMBA_4_0: .
source/auth/kerberos source/lib/socket
jelmer at samba.org
jelmer at samba.org
Mon Apr 30 11:27:43 GMT 2007
Author: jelmer
Date: 2007-04-30 11:27:41 +0000 (Mon, 30 Apr 2007)
New Revision: 22602
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22602
Log:
s/HAVE_SOCKET_IPV6/HAVE_IPV6/ to match the define used by Heimdal.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
branches/SAMBA_4_0/source/lib/socket/config.m4
branches/SAMBA_4_0/source/lib/socket/socket.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
...skipped...
Modified: branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c 2007-04-30 11:16:50 UTC (rev 22601)
+++ branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c 2007-04-30 11:27:41 UTC (rev 22602)
@@ -258,7 +258,7 @@
case PF_INET:
name = "ipv4";
break;
-#ifdef HAVE_SOCKET_IPV6
+#ifdef HAVE_IPV6
case PF_INET6:
name = "ipv6";
break;
Modified: branches/SAMBA_4_0/source/lib/socket/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/config.m4 2007-04-30 11:16:50 UTC (rev 22601)
+++ branches/SAMBA_4_0/source/lib/socket/config.m4 2007-04-30 11:27:41 UTC (rev 22602)
@@ -91,7 +91,7 @@
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
Modified: branches/SAMBA_4_0/source/lib/socket/socket.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/socket.c 2007-04-30 11:16:50 UTC (rev 22601)
+++ branches/SAMBA_4_0/source/lib/socket/socket.c 2007-04-30 11:27:41 UTC (rev 22602)
@@ -426,7 +426,7 @@
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"));
More information about the samba-cvs
mailing list