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/libsmb | |
| 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/libsmb')
| -rw-r--r-- | source3/libsmb/dsgetdcname.c | 14 | ||||
| -rw-r--r-- | source3/libsmb/namequery_dc.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c index 0b3b3d9bbf..7834632806 100644 --- a/source3/libsmb/dsgetdcname.c +++ b/source3/libsmb/dsgetdcname.c @@ -225,26 +225,26 @@ static bool check_cldap_reply_required_flags(uint32_t ret_flags, uint32_t req_flags) { if (req_flags & DS_PDC_REQUIRED) - RETURN_ON_FALSE(ret_flags & ADS_PDC); + RETURN_ON_FALSE(ret_flags & NBT_SERVER_PDC); if (req_flags & DS_GC_SERVER_REQUIRED) - RETURN_ON_FALSE(ret_flags & ADS_GC); + RETURN_ON_FALSE(ret_flags & NBT_SERVER_GC); if (req_flags & DS_ONLY_LDAP_NEEDED) - RETURN_ON_FALSE(ret_flags & ADS_LDAP); + RETURN_ON_FALSE(ret_flags & NBT_SERVER_LDAP); if ((req_flags & DS_DIRECTORY_SERVICE_REQUIRED) || (req_flags & DS_DIRECTORY_SERVICE_PREFERRED)) - RETURN_ON_FALSE(ret_flags & ADS_DS); + RETURN_ON_FALSE(ret_flags & NBT_SERVER_DS); if (req_flags & DS_KDC_REQUIRED) - RETURN_ON_FALSE(ret_flags & ADS_KDC); + RETURN_ON_FALSE(ret_flags & NBT_SERVER_KDC); if (req_flags & DS_TIMESERV_REQUIRED) - RETURN_ON_FALSE(ret_flags & ADS_TIMESERV); + RETURN_ON_FALSE(ret_flags & NBT_SERVER_TIMESERV); if (req_flags & DS_WRITABLE_REQUIRED) - RETURN_ON_FALSE(ret_flags & ADS_WRITABLE); + RETURN_ON_FALSE(ret_flags & NBT_SERVER_WRITABLE); return true; } diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c index 06926a762b..d080f8f0b7 100644 --- a/source3/libsmb/namequery_dc.c +++ b/source3/libsmb/namequery_dc.c @@ -99,7 +99,7 @@ static bool ads_dc_name(const char *domain, } #ifdef HAVE_KRB5 - if (is_our_primary_domain(domain) && (ads->config.flags & ADS_KDC)) { + if (is_our_primary_domain(domain) && (ads->config.flags & NBT_SERVER_KDC)) { if (ads_closest_dc(ads)) { /* We're going to use this KDC for this realm/domain. If we are using sites, then force the krb5 libs |