Author: vlendec Date: 2007-07-29 09:23:55 +0000 (Sun, 29 Jul 2007) New Revision: 24068
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24068 Log: Fix Coverity id 366 (dead code). We have checked for argc >= 3 above. Modified: branches/SAMBA_3_2/source/rpcclient/cmd_samr.c branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c Changeset: Modified: branches/SAMBA_3_2/source/rpcclient/cmd_samr.c =================================================================== --- branches/SAMBA_3_2/source/rpcclient/cmd_samr.c 2007-07-28 18:52:28 UTC (rev 24067) +++ branches/SAMBA_3_2/source/rpcclient/cmd_samr.c 2007-07-29 09:23:55 UTC (rev 24068) @@ -1873,15 +1873,12 @@ /* 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++) Modified: branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c =================================================================== --- branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c 2007-07-28 18:52:28 UTC (rev 24067) +++ branches/SAMBA_3_2_0/source/rpcclient/cmd_samr.c 2007-07-29 09:23:55 UTC (rev 24068) @@ -1743,15 +1743,12 @@ /* 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++)
