From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 29 Jul 2007 09:23:55 +0000 (+0000)
Subject: r24068: Fix Coverity id 366 (dead code). We have checked for argc >= 3 above.
X-Git-Tag: samba-4.0.0alpha6~801^2~5234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5ca533043cbcd69b08fd7b950891f4ea67cb9a6;p=thirdparty%2Fsamba.git

r24068: Fix Coverity id 366 (dead code). We have checked for argc >= 3 above.
(This used to be commit b876bca6bcdb091c4f4f11af3bd758c8ce4db50a)
---

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 2a35b0cf192..b5ccab88863 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -1873,15 +1873,12 @@ static NTSTATUS cmd_samr_lookup_rids(struct rpc_pipe_client *cli,
 	/* Look up rids */
 
 	num_rids = argc - 2;
-	if (num_rids) {
-		if ((rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids)) == NULL) {
-			rpccli_samr_close(cli, mem_ctx, &domain_pol);
-			rpccli_samr_close(cli, mem_ctx, &connect_pol);
-			result = NT_STATUS_NO_MEMORY;
-			goto done;
-		}
-	} else {
-		rids = NULL;
+
+	if ((rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids)) == NULL) {
+		rpccli_samr_close(cli, mem_ctx, &domain_pol);
+		rpccli_samr_close(cli, mem_ctx, &connect_pol);
+		result = NT_STATUS_NO_MEMORY;
+		goto done;
 	}
 
 	for (i = 0; i < argc - 2; i++)