From bcbac69d1a38e128ffe8b763ac027d6eab33dcec Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 21 Apr 2008 19:59:27 +0200 Subject: cldap: avoid duplicate definitions so remove ads_cldap.h. Guenther (This used to be commit 538eefe22ad69540b9f73ffaa613d6be045de199) --- source3/libads/ldap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/libads') diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 99df4ed8a3..b0f27b598b 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -151,14 +151,14 @@ bool ads_sitename_match(ADS_STRUCT *ads) bool ads_closest_dc(ADS_STRUCT *ads) { - if (ads->config.flags & ADS_CLOSEST) { - DEBUG(10,("ads_closest_dc: ADS_CLOSEST flag set\n")); + if (ads->config.flags & NBT_SERVER_CLOSEST) { + DEBUG(10,("ads_closest_dc: NBT_SERVER_CLOSEST flag set\n")); return True; } /* not sure if this can ever happen */ if (ads_sitename_match(ads)) { - DEBUG(10,("ads_closest_dc: ADS_CLOSEST flag not set but sites match\n")); + DEBUG(10,("ads_closest_dc: NBT_SERVER_CLOSEST flag not set but sites match\n")); return True; } @@ -207,7 +207,7 @@ bool ads_try_connect(ADS_STRUCT *ads, const char *server ) /* Check the CLDAP reply flags */ - if ( !(cldap_reply.server_type & ADS_LDAP) ) { + if ( !(cldap_reply.server_type & NBT_SERVER_LDAP) ) { DEBUG(1,("ads_try_connect: %s's CLDAP reply says it is not an LDAP server!\n", srv)); ret = false; -- cgit