Changeset 272 for branches/samba-3.2.x/source/groupdb

Timestamp:

Jun 16, 2009, 5:52:30 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.12

File:

• branches/samba-3.2.x/source/groupdb/mapping_ldb.c (modified) (7 diffs)

branches/samba-3.2.x/source/groupdb/mapping_ldb.c

@@ -223 +223 @@
 
         ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res);
+        if (ret != LDB_SUCCESS) {
+                goto failed;
+        }
         talloc_steal(dn, res);
-        if (ret != LDB_SUCCESS || res->count != 1) {
+        if (res->count != 1) {
                 goto failed;
         }
@@ -252 +255 @@
 
         ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res);
+        if (ret != LDB_SUCCESS) {
+                goto failed;
+        }
         talloc_steal(expr, res);
-        if (ret != LDB_SUCCESS || res->count != 1) goto failed;
+        if (res->count != 1) {
+                goto failed;
+        }
         
         if (!msg_to_group_map(res->msgs[0], map)) goto failed;
@@ -278 +286 @@
 
         ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res);
+        if (ret != LDB_SUCCESS) {
+                goto failed;
+        }
         talloc_steal(expr, res);
-        if (ret != LDB_SUCCESS || res->count != 1) goto failed;
+        if (res->count != 1) {
+                goto failed;
+        }
         
         if (!msg_to_group_map(res->msgs[0], map)) goto failed;
@@ -343 +356 @@
 
         ret = ldb_search(ldb, basedn, LDB_SCOPE_SUBTREE, expr, NULL, &res);
+        if (ret != LDB_SUCCESS) goto failed;
         talloc_steal(tmp_ctx, res);
-        if (ret != LDB_SUCCESS) goto failed;
 
         (*pp_rmap) = NULL;
@@ -396 +409 @@
 
         ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, attrs, &res);
+        if (ret != LDB_SUCCESS) {
+                goto failed;
+        }
         talloc_steal(expr, res);
-        if (ret != LDB_SUCCESS) {
-                goto failed;
-        }
 
         for (i=0;i<res->count;i++) {
@@ -517 +530 @@
 
         ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, attrs, &res);
-        talloc_steal(dn, res);
         if (ret == LDB_SUCCESS && res->count == 0) {
+                talloc_free(res);
                 talloc_free(dn);
                 return NT_STATUS_OK;
@@ -526 +539 @@
                 return NT_STATUS_INTERNAL_DB_CORRUPTION;
         }
+        talloc_steal(dn, res);
 
         el = ldb_msg_find_element(res->msgs[0], "member");
         if (el == NULL) {
                 talloc_free(dn);
-                return NT_STATUS_INTERNAL_DB_CORRUPTION;
+                return NT_STATUS_OK;
         }