diff options
| author | Jeremy Allison <jra@samba.org> | 2006-09-05 06:32:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:43:24 -0500 |
| commit | 8d812f8eed301365a550bf36394c0f2774d57188 (patch) | |
| tree | 4aef85603115e061e088bfcfe1239447205866da | |
| parent | d2465b17300168c37230de34f71e99d5b02d306d (diff) | |
| download | samba-8d812f8eed301365a550bf36394c0f2774d57188.tar.gz samba-8d812f8eed301365a550bf36394c0f2774d57188.tar.bz2 samba-8d812f8eed301365a550bf36394c0f2774d57188.zip | |
r18063: When we get a successful connection using ADS,
cache the SAF name under both the domain name
and the realm name, as we could be looking up
under both. Jerry please check.
Jeremy.
(This used to be commit 9d954d2deb46698b3834c7caf5ee0cfe628086b5)
| -rw-r--r-- | source3/libads/ldap.c | 3 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 970311d5ca..6c3ab75340 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -393,8 +393,9 @@ got_connection: return ADS_ERROR(LDAP_OPERATIONS_ERROR); } - /* cache the successful 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)); ldap_set_option(ads->ld, LDAP_OPT_PROTOCOL_VERSION, &version); diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index ce4e3cae18..efee477c0d 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -363,6 +363,9 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain, /* cache the server name for later connections */ saf_store( domain->name, (*cli)->desthost ); + if (domain->alt_name) { + saf_store( domain->alt_name, (*cli)->desthost ); + } if (!cli_send_tconX(*cli, "IPC$", "IPC", "", 0)) { |