possibly better handling of NULL secdesc (thanks to lukeh)

(This used to be commit a1230f1b4b0b06d08bfe7c8a7e4863357db1ca5a)

3 files changed, 57 insertions, 27 deletions

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index aa3ab9c799..2b47abe461 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -34,11 +34,16 @@
 
 	/******************/
 	/* Function: 0x03 */
+
+	typedef struct {
+		uint32 sd_size;
+		[subcontext] security_descriptor *sd;
+	} samr_SdBuf;
+
 	NTSTATUS samr_QuerySecurity (
 		[in,ref]          policy_handle *handle,
 		[in]              uint32 sec_info,
-		[out]             uint32 *length,
-		[out,subcontext]  security_descriptor *sd
+		[out]             samr_SdBuf *sdbuf
 		);
 
 	/******************/
diff --git a/source4/librpc/ndr/ndr_samr.c b/source4/librpc/ndr/ndr_samr.c
index c98d47b573..4669fd6270 100644
--- a/source4/librpc/ndr/ndr_samr.c
+++ b/source4/librpc/ndr/ndr_samr.c
@@ -527,27 +527,40 @@ NTSTATUS ndr_pull_samr_SetSecurity(struct ndr_pull *ndr, struct samr_SetSecurity
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_samr_QuerySecurity(struct ndr_pull *ndr, struct samr_QuerySecurity *r)
+NTSTATUS ndr_pull_samr_SdBuf(struct ndr_pull *ndr, int ndr_flags, struct samr_SdBuf *r)
 {
-	uint32 _ptr_length;
 	uint32 _ptr_sd;
-	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_length));
-	if (_ptr_length) {
-		NDR_ALLOC(ndr, r->out.length);
+	NDR_CHECK(ndr_pull_struct_start(ndr));
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_align(ndr, 4));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->sd_size));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sd));
+	if (_ptr_sd) {
+		NDR_ALLOC(ndr, r->sd);
 	} else {
-		r->out.length = NULL;
+		r->sd = NULL;
 	}
-	if (r->out.length) {
-		NDR_CHECK(ndr_pull_uint32(ndr, r->out.length));
+	ndr_pull_struct_end(ndr);
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->sd) {
+	NDR_CHECK(ndr_pull_subcontext_flags_fn(ndr, r->sd, (ndr_pull_flags_fn_t) ndr_pull_security_descriptor));
 	}
-	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sd));
-	if (_ptr_sd) {
-		NDR_ALLOC(ndr, r->out.sd);
+done:
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_pull_samr_QuerySecurity(struct ndr_pull *ndr, struct samr_QuerySecurity *r)
+{
+	uint32 _ptr_sdbuf;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_sdbuf));
+	if (_ptr_sdbuf) {
+		NDR_ALLOC(ndr, r->out.sdbuf);
 	} else {
-		r->out.sd = NULL;
+		r->out.sdbuf = NULL;
 	}
-	if (r->out.sd) {
-	NDR_CHECK(ndr_pull_subcontext_flags_fn(ndr, r->out.sd, (ndr_pull_flags_fn_t) ndr_pull_security_descriptor));
+	if (r->out.sdbuf) {
+		NDR_CHECK(ndr_pull_samr_SdBuf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sdbuf));
 	}
 	NDR_CHECK(ndr_pull_NTSTATUS(ndr, &r->out.result));
 
@@ -2445,6 +2458,20 @@ void ndr_print_samr_SetSecurity(struct ndr_print *ndr, const char *name, int fla
 	ndr->depth--;
 }
 
+void ndr_print_samr_SdBuf(struct ndr_print *ndr, const char *name, struct samr_SdBuf *r)
+{
+	ndr_print_struct(ndr, name, "samr_SdBuf");
+	ndr->depth++;
+	ndr_print_uint32(ndr, "sd_size", r->sd_size);
+	ndr_print_ptr(ndr, "sd", r->sd);
+	ndr->depth++;
+	if (r->sd) {
+		ndr_print_security_descriptor(ndr, "sd", r->sd);
+	}
+	ndr->depth--;
+	ndr->depth--;
+}
+
 void ndr_print_samr_QuerySecurity(struct ndr_print *ndr, const char *name, int flags, struct samr_QuerySecurity *r)
 {
 	ndr_print_struct(ndr, name, "samr_QuerySecurity");
@@ -2462,16 +2489,10 @@ void ndr_print_samr_QuerySecurity(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QuerySecurity");
 	ndr->depth++;
-	ndr_print_ptr(ndr, "length", r->out.length);
-	ndr->depth++;
-	if (r->out.length) {
-		ndr_print_uint32(ndr, "length", *r->out.length);
-	}
-	ndr->depth--;
-	ndr_print_ptr(ndr, "sd", r->out.sd);
+	ndr_print_ptr(ndr, "sdbuf", r->out.sdbuf);
 	ndr->depth++;
-	if (r->out.sd) {
-		ndr_print_security_descriptor(ndr, "sd", r->out.sd);
+	if (r->out.sdbuf) {
+		ndr_print_samr_SdBuf(ndr, "sdbuf", r->out.sdbuf);
 	}
 	ndr->depth--;
 	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
diff --git a/source4/librpc/ndr/ndr_samr.h b/source4/librpc/ndr/ndr_samr.h
index b7b568b034..ef5f290680 100644
--- a/source4/librpc/ndr/ndr_samr.h
+++ b/source4/librpc/ndr/ndr_samr.h
@@ -109,6 +109,11 @@ struct samr_SetSecurity {
 
 };
 
+struct samr_SdBuf {
+	uint32 sd_size;
+	struct security_descriptor *sd;
+};
+
 struct samr_QuerySecurity {
 	struct {
 		struct policy_handle *handle;
@@ -116,8 +121,7 @@ struct samr_QuerySecurity {
 	} in;
 
 	struct {
-		uint32 *length;
-		struct security_descriptor *sd;
+		struct samr_SdBuf *sdbuf;
 		NTSTATUS result;
 	} out;