summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-02-05 13:44:22 -0800
committerJeremy Allison <jra@samba.org>2008-02-05 13:44:22 -0800
commit1b24afc89601eda4fd01c897f2853e098fbfb2d9 (patch)
tree02c2214206d653b947d5153ffdac17d7d7d433d9
parent47666c93a78dc7a9c18212bfe7be3e6487313226 (diff)
downloadsamba-1b24afc89601eda4fd01c897f2853e098fbfb2d9.tar.gz
samba-1b24afc89601eda4fd01c897f2853e098fbfb2d9.tar.bz2
samba-1b24afc89601eda4fd01c897f2853e098fbfb2d9.zip
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. (This used to be commit a769acc0ba72ddd751e70558e0c2d9b2e6d71164)
-rw-r--r--source3/nsswitch/winbind_krb5_locator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/winbind_krb5_locator.c b/source3/nsswitch/winbind_krb5_locator.c
index eef57ca2c0..33a68f0cdc 100644
--- a/source3/nsswitch/winbind_krb5_locator.c
+++ b/source3/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;