Changeset 22 for trunk/samba/source/nsswitch/winbindd_ads.c

Timestamp:

Mar 25, 2007, 5:18:51 PM (18 years ago)

Author:

Yuri Dario

Message:

Source code upgrade to 3.0.25pre2.

File:

• trunk/samba/source/nsswitch/winbindd_ads.c (modified) (4 diffs)

trunk/samba/source/nsswitch/winbindd_ads.c

@@ -41 +41 @@
         ADS_STRUCT *ads;
         ADS_STATUS status;
+        fstring dc_name;
+        struct in_addr dc_ip;   
 
         DEBUG(10,("ads_cached_connection\n"));
@@ -115 +117 @@
         ads->auth.renewable = WINBINDD_PAM_AUTH_KRB5_RENEW_TIME;
 
+        /* Setup the server affinity cache.  We don't reaally care
+           about the name.  Just setup affinity and the KRB5_CONFIG 
+           file. */
+
+        get_dc_name( ads->server.workgroup, ads->server.realm, dc_name, &dc_ip );
+        
         status = ads_connect(ads);
         if (!ADS_ERR_OK(status) || !ads->config.realm) {
@@ -608 +616 @@
         size_t num_groups = 0;
         DOM_SID *group_sids = NULL;
-        char *escaped_dn;
         int i;
 
@@ -620 +627 @@
         }
 
-        if (!(escaped_dn = escape_ldap_string_alloc(user_dn))) {
-                status = NT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        rc = ads_search_retry_extended_dn(ads, &res, escaped_dn, attrs, 
+        rc = ads_search_retry_extended_dn(ads, &res, user_dn, attrs, 
                                           ADS_EXTENDED_DN_HEX_STRING);
         
-        SAFE_FREE(escaped_dn);
-
         if (!ADS_ERR_OK(rc) || !res) {
                 DEBUG(1,("lookup_usergroups_memberof ads_search member=%s: %s\n",