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

Timestamp:

May 27, 2007, 12:26:26 AM (19 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

File:

• trunk/samba/source/nsswitch/winbindd_ads.c (modified) (1 diff)

trunk/samba/source/nsswitch/winbindd_ads.c

@@ -962 +962 @@
         */
 
-        (*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
-        (*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
-        (*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
-
-        if ((num_members != 0) &&
-            ((members == NULL) || (*sid_mem == NULL) ||
-             (*name_types == NULL) || (*names == NULL))) {
-                DEBUG(1, ("talloc failed\n"));
-                status = NT_STATUS_NO_MEMORY;
-                goto done;
+        if (num_members) {
+                (*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
+                (*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
+                (*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
+
+                if ((members == NULL) || (*sid_mem == NULL) ||
+                     (*name_types == NULL) || (*names == NULL)) {
+                        DEBUG(1, ("talloc failed\n"));
+                        status = NT_STATUS_NO_MEMORY;
+                        goto done;
+                }
+        } else {
+                (*sid_mem) = NULL;
+                (*name_types) = NULL;
+                (*names) = NULL;
         }