From 2f6e8a75e3027cabe02791b1266a0229a2243095 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 7 Feb 2008 14:24:21 +0100
Subject: Re-run make idl.

Guenther
(This used to be commit cfaf47883d7135d66d5d40c7d474b8dbf60eb64d)
---
 source3/librpc/gen_ndr/cli_samr.c |  2 +-
 source3/librpc/gen_ndr/cli_samr.h |  2 +-
 source3/librpc/gen_ndr/ndr_samr.c | 27 ++++++++++++++++++++++++---
 source3/librpc/gen_ndr/samr.h     |  2 +-
 source3/librpc/gen_ndr/srv_samr.c |  2 +-
 5 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/librpc/gen_ndr/cli_samr.c b/source3/librpc/gen_ndr/cli_samr.c
index 4c9709da21..b98c89c4a8 100644
--- a/source3/librpc/gen_ndr/cli_samr.c
+++ b/source3/librpc/gen_ndr/cli_samr.c
@@ -1728,7 +1728,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_GetGroupsForUser(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
 				      struct policy_handle *user_handle,
-				      struct samr_RidWithAttributeArray *rids)
+				      struct samr_RidWithAttributeArray **rids)
 {
 	struct samr_GetGroupsForUser r;
 	NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_samr.h b/source3/librpc/gen_ndr/cli_samr.h
index 27b2c5cb21..3e2029ec35 100644
--- a/source3/librpc/gen_ndr/cli_samr.h
+++ b/source3/librpc/gen_ndr/cli_samr.h
@@ -215,7 +215,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_GetGroupsForUser(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
 				      struct policy_handle *user_handle,
-				      struct samr_RidWithAttributeArray *rids);
+				      struct samr_RidWithAttributeArray **rids);
 NTSTATUS rpccli_samr_QueryDisplayInfo(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
 				      struct policy_handle *domain_handle,
diff --git a/source3/librpc/gen_ndr/ndr_samr.c b/source3/librpc/gen_ndr/ndr_samr.c
index 733391050b..5848e3b800 100644
--- a/source3/librpc/gen_ndr/ndr_samr.c
+++ b/source3/librpc/gen_ndr/ndr_samr.c
@@ -8980,7 +8980,10 @@ static enum ndr_err_code ndr_push_samr_GetGroupsForUser(struct ndr_push *ndr, in
 		if (r->out.rids == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
-		NDR_CHECK(ndr_push_samr_RidWithAttributeArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.rids));
+		NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.rids));
+		if (*r->out.rids) {
+			NDR_CHECK(ndr_push_samr_RidWithAttributeArray(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.rids));
+		}
 		NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
@@ -8988,8 +8991,10 @@ static enum ndr_err_code ndr_push_samr_GetGroupsForUser(struct ndr_push *ndr, in
 
 static enum ndr_err_code ndr_pull_samr_GetGroupsForUser(struct ndr_pull *ndr, int flags, struct samr_GetGroupsForUser *r)
 {
+	uint32_t _ptr_rids;
 	TALLOC_CTX *_mem_save_user_handle_0;
 	TALLOC_CTX *_mem_save_rids_0;
+	TALLOC_CTX *_mem_save_rids_1;
 	if (flags & NDR_IN) {
 		ZERO_STRUCT(r->out);
 
@@ -9009,7 +9014,18 @@ static enum ndr_err_code ndr_pull_samr_GetGroupsForUser(struct ndr_pull *ndr, in
 		}
 		_mem_save_rids_0 = NDR_PULL_GET_MEM_CTX(ndr);
 		NDR_PULL_SET_MEM_CTX(ndr, r->out.rids, LIBNDR_FLAG_REF_ALLOC);
-		NDR_CHECK(ndr_pull_samr_RidWithAttributeArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.rids));
+		NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_rids));
+		if (_ptr_rids) {
+			NDR_PULL_ALLOC(ndr, *r->out.rids);
+		} else {
+			*r->out.rids = NULL;
+		}
+		if (*r->out.rids) {
+			_mem_save_rids_1 = NDR_PULL_GET_MEM_CTX(ndr);
+			NDR_PULL_SET_MEM_CTX(ndr, *r->out.rids, 0);
+			NDR_CHECK(ndr_pull_samr_RidWithAttributeArray(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.rids));
+			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_rids_1, 0);
+		}
 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_rids_0, LIBNDR_FLAG_REF_ALLOC);
 		NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
 	}
@@ -9037,7 +9053,12 @@ _PUBLIC_ void ndr_print_samr_GetGroupsForUser(struct ndr_print *ndr, const char
 		ndr->depth++;
 		ndr_print_ptr(ndr, "rids", r->out.rids);
 		ndr->depth++;
-		ndr_print_samr_RidWithAttributeArray(ndr, "rids", r->out.rids);
+		ndr_print_ptr(ndr, "rids", *r->out.rids);
+		ndr->depth++;
+		if (*r->out.rids) {
+			ndr_print_samr_RidWithAttributeArray(ndr, "rids", *r->out.rids);
+		}
+		ndr->depth--;
 		ndr->depth--;
 		ndr_print_NTSTATUS(ndr, "result", r->out.result);
 		ndr->depth--;
diff --git a/source3/librpc/gen_ndr/samr.h b/source3/librpc/gen_ndr/samr.h
index 085604dd71..d02b577612 100644
--- a/source3/librpc/gen_ndr/samr.h
+++ b/source3/librpc/gen_ndr/samr.h
@@ -1316,7 +1316,7 @@ struct samr_GetGroupsForUser {
 	} in;
 
 	struct {
-		struct samr_RidWithAttributeArray *rids;/* [ref] */
+		struct samr_RidWithAttributeArray **rids;/* [ref] */
 		NTSTATUS result;
 	} out;
 
diff --git a/source3/librpc/gen_ndr/srv_samr.c b/source3/librpc/gen_ndr/srv_samr.c
index 57fc0e2e8a..24b1abb222 100644
--- a/source3/librpc/gen_ndr/srv_samr.c
+++ b/source3/librpc/gen_ndr/srv_samr.c
@@ -3119,7 +3119,7 @@ static bool api_samr_GetGroupsForUser(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
-	r->out.rids = talloc_zero(r, struct samr_RidWithAttributeArray);
+	r->out.rids = talloc_zero(r, struct samr_RidWithAttributeArray *);
 	if (r->out.rids == NULL) {
 		talloc_free(r);
 		return false;
-- 
cgit