[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1909-ga769acc

Jeremy Allison jra at samba.org
Tue Feb 5 21:44:52 GMT 2008


The branch, v3-2-test has been updated
       via  a769acc0ba72ddd751e70558e0c2d9b2e6d71164 (commit)
      from  b3ac8073a23afbba19d045302aa0700197c58bd5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit a769acc0ba72ddd751e70558e0c2d9b2e6d71164
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 5 13:44:22 2008 -0800

    The krb5 locator should now be correctly able to handle
    IPV6, so (a) use the correct #ifdef (it's HAVE_IPV6, not
    HAVE_IPv6) and (b) don't deliberately terminate on an
    IPv6 address family.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/nsswitch/winbind_krb5_locator.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbind_krb5_locator.c b/source/nsswitch/winbind_krb5_locator.c
index eef57ca..33a68f0 100644
--- a/source/nsswitch/winbind_krb5_locator.c
+++ b/source/nsswitch/winbind_krb5_locator.c
@@ -90,7 +90,7 @@ static const char *family_name(int family)
 			return "AF_UNSPEC";
 		case AF_INET:
 			return "AF_INET";
-#if defined(HAVE_IPv6)
+#if defined(HAVE_IPV6)
 		case AF_INET6:
 			return "AF_INET6";
 #endif
@@ -137,9 +137,9 @@ static int smb_krb5_locator_lookup_sanity_check(enum locate_service_type svc,
 		case AF_UNSPEC:
 		case AF_INET:
 			break;
-#if defined(HAVE_IPv6)
-		case AF_INET6: /* not yet */
-			return KRB5_PLUGIN_NO_HANDLE;
+#if defined(HAVE_IPV6)
+		case AF_INET6:
+			break;
 #endif
 		default:
 			return EINVAL;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list