r23974: Fix Coverity ID 361. num_rids == 0 is caught on function entry
authorVolker Lendecke <vlendec@samba.org>
Thu, 19 Jul 2007 14:08:01 +0000 (14:08 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:28:51 +0000 (12:28 -0500)
(This used to be commit 839d64add4ebf900863f1ed3e7a379db9b6fdf69)

source3/nsswitch/wb_client.c

index 3926a218e9e057a56c806a20033f9b173e115eaf..59664e0719cb2d03ad430cf253a5312fd653896a 100644 (file)
@@ -145,7 +145,7 @@ BOOL winbind_lookup_rids(TALLOC_CTX *mem_ctx,
                               "%ld\n", rids[i]);
        }
 
-       if ((num_rids != 0) && (ridlist == NULL)) {
+       if (ridlist == NULL) {
                return False;
        }
 
@@ -163,16 +163,11 @@ BOOL winbind_lookup_rids(TALLOC_CTX *mem_ctx,
 
        *domain_name = talloc_strdup(mem_ctx, response.data.domain_name);
 
-       if (num_rids) {
-               *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
-               *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
+       *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
+       *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
 
-               if ((*names == NULL) || (*types == NULL)) {
-                       goto fail;
-               }
-       } else {
-               *names = NULL;
-               *types = NULL;
+       if ((*names == NULL) || (*types == NULL)) {
+               goto fail;
        }
 
        p = (char *)response.extra_data.data;