diff options
| author | Jeremy Allison <jra@samba.org> | 2006-09-15 14:18:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:51:49 -0500 |
| commit | a0aaa82f6d360f2fe688f95791640b58231ed873 (patch) | |
| tree | 9489ab56903e85e02d384a85519b34a7c4cfe6c2 /source3/libads | |
| parent | 07e9f4e61ae909d7ccc7ec7b650438510468829d (diff) | |
| download | samba-a0aaa82f6d360f2fe688f95791640b58231ed873.tar.gz samba-a0aaa82f6d360f2fe688f95791640b58231ed873.tar.bz2 samba-a0aaa82f6d360f2fe688f95791640b58231ed873.zip | |
r18552: Ensure the sitename matches before we SAF store a DC in ADS mode.
Jeremy.
(This used to be commit 03e1078b459531af5a2336b584b3c886c5dd1e29)
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 6b18bbf594..7b31586f7d 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -115,7 +115,6 @@ static int ldap_search_with_timeout(LDAP *ld, return result; } -#ifdef HAVE_KRB5 /********************************************** Do client and server sitename match ? **********************************************/ @@ -139,7 +138,6 @@ BOOL ads_sitename_match(ADS_STRUCT *ads) ads->config.client_site_name ? ads->config.client_site_name : "NULL")); return False; } -#endif /* try a connection to a given ldap server, returning True and setting the servers IP @@ -394,8 +392,10 @@ got_connection: } /* cache the successful connection for workgroup and realm */ - saf_store( ads->server.workgroup, inet_ntoa(ads->ldap_ip)); - saf_store( ads->server.realm, inet_ntoa(ads->ldap_ip)); + if (ads_sitename_match(ads)) { + saf_store( ads->server.workgroup, inet_ntoa(ads->ldap_ip)); + saf_store( ads->server.realm, inet_ntoa(ads->ldap_ip)); + } ldap_set_option(ads->ld, LDAP_OPT_PROTOCOL_VERSION, &version); |