Changeset 736 for branches/samba-3.5.x/source3/winbindd/winbindd_ads.c

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

File:

• branches/samba-3.5.x/source3/winbindd/winbindd_ads.c (modified) (4 diffs)

branches/samba-3.5.x/source3/winbindd/winbindd_ads.c

@@ -181 +181 @@
 
         rc = ads_search_retry(ads, &res, "(objectCategory=user)", attrs);
-        if (!ADS_ERR_OK(rc) || !res) {
+        if (!ADS_ERR_OK(rc)) {
                 DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
+                status = ads_ntstatus(rc);
+        } else if (!res) {
+                DEBUG(1,("query_user_list ads_search returned NULL res\n"));
+
                 goto done;
         }
@@ -326 +330 @@
 
         rc = ads_search_retry(ads, &res, filter, attrs);
-        if (!ADS_ERR_OK(rc) || !res) {
+        if (!ADS_ERR_OK(rc)) {
+                status = ads_ntstatus(rc);
                 DEBUG(1,("enum_dom_groups ads_search: %s\n", ads_errstr(rc)));
+                goto done;
+        } else if (!res) {
+                DEBUG(1,("enum_dom_groups ads_search returned NULL res\n"));
                 goto done;
         }
@@ -533 +541 @@
         }
         rc = ads_search_retry(ads, &msg, ldap_exp, attrs);
-        free(ldap_exp);
+        SAFE_FREE(ldap_exp);
         TALLOC_FREE(sidstr);
-        if (!ADS_ERR_OK(rc) || !msg) {
+        if (!ADS_ERR_OK(rc)) {
                 DEBUG(1,("query_user(sid=%s) ads_search: %s\n",
                          sid_string_dbg(sid), ads_errstr(rc)));
-                goto done;
+                return ads_ntstatus(rc);
+        } else if (!msg) {
+                DEBUG(1,("query_user(sid=%s) ads_search returned NULL res\n",
+                         sid_string_dbg(sid)));
+                return NT_STATUS_INTERNAL_ERROR;
         }
 
@@ -633 +645 @@
         rc = ads_search_retry(ads, &res, ldap_exp, group_attrs);
 
-        if (!ADS_ERR_OK(rc) || !res) {
+        if (!ADS_ERR_OK(rc)) {
                 DEBUG(1,("lookup_usergroups ads_search member=%s: %s\n", user_dn, ads_errstr(rc)));
                 return ads_ntstatus(rc);
-        }
+        } else if (!res) {
+                DEBUG(1,("lookup_usergroups ads_search returned NULL res\n"));
+                return NT_STATUS_INTERNAL_ERROR;
+        }
+
 
         count = ads_count_replies(ads, res);