From 0615b2dfa2add9b427700b2a0f2f7938c54e977b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 15 Dec 2009 14:01:43 +0100
Subject: [PATCH] s3: Fix _samr_GetAliasMembership for results with 0 rids
 (cherry picked from commit 526ceefc9d2df46b5b172a15d196f1f1de6ff6c7)

---
 source3/rpc_server/srv_samr_nt.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index f3a48a8d8fe..d50c6c3e0e6 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5360,6 +5360,14 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
 	r->out.rids->count = num_alias_rids;
 	r->out.rids->ids = alias_rids;
 
+	if (r->out.rids->ids == NULL) {
+		/* Windows domain clients don't accept a NULL ptr here */
+		r->out.rids->ids = talloc_zero(p->mem_ctx, uint32_t);
+	}
+	if (r->out.rids->ids == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
+
 	return NT_STATUS_OK;
 }
 
-- 
2.11.4.GIT