From: Günther Deschner <gd@samba.org>
Date: Wed, 2 Apr 2008 22:23:50 +0000 (+0200)
Subject: Fix rpccli_lsa_lookup_sids_noalloc.
X-Git-Tag: samba-3.3.0pre1~2928
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea3cfadc2504c891b4784719bd8e6debcc38c879;p=thirdparty%2Fsamba.git

Fix rpccli_lsa_lookup_sids_noalloc.

When looking up e.g. a trusted doamin account, there is just no name.

Michael, please check.

Guenther
---

diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index 3d57e22f426..37387a04dd8 100644
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -203,11 +203,19 @@ static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct rpc_pipe_client *cli,
 			dom_name = ref_domains->domains[dom_idx].name.string;
 			name = lsa_names.names[i].name.string;
 
-			(names)[i] = talloc_strdup(mem_ctx, name);
+			if (name) {
+				(names)[i] = talloc_strdup(mem_ctx, name);
+				if ((names)[i] == NULL) {
+					DEBUG(0, ("cli_lsa_lookup_sids_noalloc(): out of memory\n"));
+					result = NT_STATUS_UNSUCCESSFUL;
+					goto done;
+				}
+			} else {
+				(names)[i] = NULL;
+			}
 			(domains)[i] = talloc_strdup(mem_ctx, dom_name);
 			(types)[i] = lsa_names.names[i].sid_type;
-
-			if (((names)[i] == NULL) || ((domains)[i] == NULL)) {
+			if (((domains)[i] == NULL)) {
 				DEBUG(0, ("cli_lsa_lookup_sids_noalloc(): out of memory\n"));
 				result = NT_STATUS_UNSUCCESSFUL;
 				goto done;