From be8b0685a55700c6bce3681734800ec6434b0364 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 30 Apr 2007 02:39:34 +0000
Subject: r22589: Make TALLOC_ARRAY consistent across all uses. Jeremy. (This
 used to be commit 8968808c3b5b0208cbad9ac92eaf948f2c546dd9)

---
 source3/nsswitch/winbindd_rpc.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'source3/nsswitch/winbindd_rpc.c')

diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index 3707f0311f..4432676414 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -342,9 +342,13 @@ NTSTATUS msrpc_rids_to_names(struct winbindd_domain *domain,
 
 	DEBUG(3, ("rids_to_names [rpc] for domain %s\n", domain->name ));
 
-	sids = TALLOC_ARRAY(mem_ctx, DOM_SID, num_rids);
-	if (sids == NULL) {
-		return NT_STATUS_NO_MEMORY;
+	if (num_rids) {
+		sids = TALLOC_ARRAY(mem_ctx, DOM_SID, num_rids);
+		if (sids == NULL) {
+			return NT_STATUS_NO_MEMORY;
+		}
+	} else {
+		sids = NULL;
 	}
 
 	for (i=0; i<num_rids; i++) {
@@ -560,10 +564,13 @@ NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain,
 		DEBUG(10,("rpc: lookup_useraliases: entering query %d for %d sids\n", 
 			num_queries, num_query_sids));	
 
-
-		query_sids = TALLOC_ARRAY(mem_ctx, DOM_SID2, num_query_sids);
-		if (query_sids == NULL) {
-			return NT_STATUS_NO_MEMORY;
+		if (num_query_sids) {
+			query_sids = TALLOC_ARRAY(mem_ctx, DOM_SID2, num_query_sids);
+			if (query_sids == NULL) {
+				return NT_STATUS_NO_MEMORY;
+			}
+		} else {
+			query_sids = NULL;
 		}
 
 		for (i=0; i<num_query_sids; i++) {
-- 
cgit