The branch, v3-2-test has been updated
via 07faaadd5ff2a94fc0db15f68836ffbdb2763461 (commit)
via ed087ca5bcc3cd2fc503c7a1f2d51a86b4bfd358 (commit)
from 03dff0194b917099d0fab78f94075d29b553f3ad (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 07faaadd5ff2a94fc0db15f68836ffbdb2763461
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Feb 7 13:43:48 2008 +0100
Re-run make idl.
Guenther
commit ed087ca5bcc3cd2fc503c7a1f2d51a86b4bfd358
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Feb 7 13:24:20 2008 +0100
Fix IDL for samr_QueryGroupInfo().
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_samr.c | 2 +-
source/librpc/gen_ndr/cli_samr.h | 2 +-
source/librpc/gen_ndr/ndr_samr.c | 33 +++++++++++++++++++++++++++------
source/librpc/gen_ndr/samr.h | 2 +-
source/librpc/gen_ndr/srv_samr.c | 2 +-
source/librpc/idl/samr.idl | 2 +-
6 files changed, 32 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index 4bd4e5c..4c9709d 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -911,7 +911,7 @@ NTSTATUS rpccli_samr_QueryGroupInfo(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *group_handle,
enum samr_GroupInfoEnum level,
- union samr_GroupInfo *info)
+ union samr_GroupInfo **info)
{
struct samr_QueryGroupInfo r;
NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 0855ade..27b2c5c 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -122,7 +122,7 @@ NTSTATUS rpccli_samr_QueryGroupInfo(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *group_handle,
enum samr_GroupInfoEnum level,
- union samr_GroupInfo *info);
+ union samr_GroupInfo **info);
NTSTATUS rpccli_samr_SetGroupInfo(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *group_handle,
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index a7c0f4d..7333910 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -7339,8 +7339,11 @@ static enum ndr_err_code
ndr_push_samr_QueryGroupInfo(struct ndr_push *ndr, int
if (r->out.info == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.info,
r->in.level));
- NDR_CHECK(ndr_push_samr_GroupInfo(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.info));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.info));
+ if (*r->out.info) {
+ NDR_CHECK(ndr_push_set_switch_value(ndr, *r->out.info,
r->in.level));
+ NDR_CHECK(ndr_push_samr_GroupInfo(ndr,
NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+ }
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
return NDR_ERR_SUCCESS;
@@ -7348,8 +7351,10 @@ static enum ndr_err_code
ndr_push_samr_QueryGroupInfo(struct ndr_push *ndr, int
static enum ndr_err_code ndr_pull_samr_QueryGroupInfo(struct ndr_pull *ndr,
int flags, struct samr_QueryGroupInfo *r)
{
+ uint32_t _ptr_info;
TALLOC_CTX *_mem_save_group_handle_0;
TALLOC_CTX *_mem_save_info_0;
+ TALLOC_CTX *_mem_save_info_1;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
@@ -7370,8 +7375,19 @@ static enum ndr_err_code
ndr_pull_samr_QueryGroupInfo(struct ndr_pull *ndr, int
}
_mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.info, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.info,
r->in.level));
- NDR_CHECK(ndr_pull_samr_GroupInfo(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.info));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
+ if (_ptr_info) {
+ NDR_PULL_ALLOC(ndr, *r->out.info);
+ } else {
+ *r->out.info = NULL;
+ }
+ if (*r->out.info) {
+ _mem_save_info_1 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, *r->out.info, 0);
+ NDR_CHECK(ndr_pull_set_switch_value(ndr, *r->out.info,
r->in.level));
+ NDR_CHECK(ndr_pull_samr_GroupInfo(ndr,
NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_1, 0);
+ }
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
}
@@ -7400,8 +7416,13 @@ _PUBLIC_ void ndr_print_samr_QueryGroupInfo(struct
ndr_print *ndr, const char *n
ndr->depth++;
ndr_print_ptr(ndr, "info", r->out.info);
ndr->depth++;
- ndr_print_set_switch_value(ndr, r->out.info, r->in.level);
- ndr_print_samr_GroupInfo(ndr, "info", r->out.info);
+ ndr_print_ptr(ndr, "info", *r->out.info);
+ ndr->depth++;
+ if (*r->out.info) {
+ ndr_print_set_switch_value(ndr, *r->out.info,
r->in.level);
+ ndr_print_samr_GroupInfo(ndr, "info", *r->out.info);
+ }
+ ndr->depth--;
ndr->depth--;
ndr_print_NTSTATUS(ndr, "result", r->out.result);
ndr->depth--;
diff --git a/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h
index 0108396..085604d 100644
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -1049,7 +1049,7 @@ struct samr_QueryGroupInfo {
} in;
struct {
- union samr_GroupInfo *info;/* [ref,switch_is(level)] */
+ union samr_GroupInfo **info;/* [ref,switch_is(level)] */
NTSTATUS result;
} out;
diff --git a/source/librpc/gen_ndr/srv_samr.c b/source/librpc/gen_ndr/srv_samr.c
index 470c45c..57fc0e2 100644
--- a/source/librpc/gen_ndr/srv_samr.c
+++ b/source/librpc/gen_ndr/srv_samr.c
@@ -1677,7 +1677,7 @@ static bool api_samr_QueryGroupInfo(pipes_struct *p)
}
ZERO_STRUCT(r->out);
- r->out.info = talloc_zero(r, union samr_GroupInfo);
+ r->out.info = talloc_zero(r, union samr_GroupInfo *);
if (r->out.info == NULL) {
talloc_free(r);
return false;
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 4d618ad..131654b 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -465,7 +465,7 @@ import "misc.idl", "lsa.idl", "security.idl";
NTSTATUS samr_QueryGroupInfo(
[in,ref] policy_handle *group_handle,
[in] samr_GroupInfoEnum level,
- [out,ref,switch_is(level)] samr_GroupInfo *info
+ [out,ref,switch_is(level)] samr_GroupInfo **info
);
/************************/
--
Samba Shared Repository
