summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-10-04 15:05:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:07 -0500
commit58b8f72af68eaba567a273904dcc07c01dc3b00d (patch)
tree1146629f690cfc309236164f302d0b44666c796c
parent71f2d744c9d8396e1a70fa999297f563c804d734 (diff)
downloadsamba-58b8f72af68eaba567a273904dcc07c01dc3b00d.tar.gz
samba-58b8f72af68eaba567a273904dcc07c01dc3b00d.tar.bz2
samba-58b8f72af68eaba567a273904dcc07c01dc3b00d.zip
r19064: This code block is already #ifdef'ed by WITH_ADS which should imply
HAVE_KRB5. If WITH_ADS does not imply KRB5, we have to fix that. Lets see what the build farm thinks about this. Volker (This used to be commit 27b063078dff0d8c5eb552dd73825f6858d04e4b)
-rw-r--r--source3/nsswitch/winbindd_cm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 43a2e286a1..a9f6ea3000 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -782,7 +782,7 @@ static BOOL dcip_to_name( const char *domainname, const char *realm,
namecache_store(name, 0x20, 1, &ip_list);
DEBUG(10,("dcip_to_name: flags = 0x%x\n", (unsigned int)ads->config.flags));
-#ifdef HAVE_KRB5
+
if ((ads->config.flags & ADS_KDC) && ads_sitename_match(ads)) {
/* We're going to use this KDC for this realm/domain.
If we are using sites, then force the krb5 libs
@@ -796,7 +796,7 @@ static BOOL dcip_to_name( const char *domainname, const char *realm,
saf_store( domainname, name);
saf_store( realm, name);
}
-#endif
+
ads_destroy( &ads );
return True;
}