[prev in list] [next in list] [prev in thread] [next in thread] 

List:       samba-cvs
Subject:    Rev 12057: s/HAVE_SOCKET_IPV6/HAVE_IPV6/ to match the define used
From:       Jelmer Vernooij <jelmer () samba ! org>
Date:       2007-04-30 11:28:04
Message-ID: 20070430122728.ADA165C40C6 () ganieda ! vernstok ! nl
[Download RAW message or body]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 12057
revision-id: jelmer@samba.org-20070430122712-arhynllyq91devqe
parent: svn-v2:22601@0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer@samba.org>
branch nick: SAMBA_4_0
timestamp: Mon 2007-04-30 14:27:12 +0200
message:
  s/HAVE_SOCKET_IPV6/HAVE_IPV6/ to match the define used by Heimdal.
modified:
  source/auth/kerberos/krb5_init_context.c \
svn-v2:10286@0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fauth%2fkerberos%2fkrb5_init_context.c
  source/lib/socket/config.m4    \
svn-v2:2328@0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fsocket%2fconfig.m4
  source/lib/socket/socket.c     \
svn-v2:2328@0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fsocket%2fsocket.c
 === modified file 'source/auth/kerberos/krb5_init_context.c'
--- a/source/auth/kerberos/krb5_init_context.c	2007-01-24 02:48:40 +0000
+++ b/source/auth/kerberos/krb5_init_context.c	2007-04-30 12:27:12 +0000
@@ -258,7 +258,7 @@
 		case PF_INET:
 			name = "ipv4";
 			break;
-#ifdef HAVE_SOCKET_IPV6
+#ifdef HAVE_IPV6
 		case PF_INET6:
 			name = "ipv6";
 			break;

=== modified file 'source/lib/socket/config.m4'
--- a/source/lib/socket/config.m4	2006-09-15 19:14:36 +0000
+++ b/source/lib/socket/config.m4	2007-04-30 12:27:12 +0000
@@ -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 file 'source/lib/socket/socket.c'
--- a/source/lib/socket/socket.c	2006-07-23 02:50:08 +0000
+++ b/source/lib/socket/socket.c	2007-04-30 12:27:12 +0000
@@ -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"));


[prev in list] [next in list] [prev in thread] [next in thread]