From: Volker Lendecke <vl@samba.org>
Date: Tue, 15 Dec 2009 13:01:43 +0000 (+0100)
Subject: s3: Fix _samr_GetAliasMembership for results with 0 rids
X-Git-Tag: samba-4.0.0alpha11~604
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=20bcdf85f16216c45ded886217fedc4516cc591c;p=samba.git

s3: Fix _samr_GetAliasMembership for results with 0 rids
---

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 2bfd6c3a899..6b403857446 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5361,6 +5361,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;
 }