diff options
| author | Günther Deschner <gd@samba.org> | 2008-04-21 19:59:27 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-04-21 20:21:40 +0200 |
| commit | bcbac69d1a38e128ffe8b763ac027d6eab33dcec (patch) | |
| tree | 3f9c8917a791e4eee03758746ddc063e371f62d2 /source3/libads | |
| parent | 1dd7ab38e7f7b5dae46cef4567957c71d6b5cc23 (diff) | |
| download | samba-bcbac69d1a38e128ffe8b763ac027d6eab33dcec.tar.gz samba-bcbac69d1a38e128ffe8b763ac027d6eab33dcec.tar.bz2 samba-bcbac69d1a38e128ffe8b763ac027d6eab33dcec.zip | |
cldap: avoid duplicate definitions so remove ads_cldap.h.
Guenther
(This used to be commit 538eefe22ad69540b9f73ffaa613d6be045de199)
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/ldap.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; |