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)

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 970311d5ca43d10d3a7fe0052b0cdfb308e186b0..6c3ab75340cae67631727afe5447a96ac5dfccad 100644 (file)
--- 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 ce4e3cae18c579fd6e756dd0ce2500387af633ac..efee477c0d4751f9055ad60634af7938de86e528 100644 (file)
--- 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)) {