[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2089-g604e1ec
Günther Deschner
gd at samba.org
Tue Feb 12 08:54:17 GMT 2008
The branch, v3-2-test has been updated
via 604e1ec5a603fd151bd1e7f303e308169ae80de3 (commit)
via 7028d3390b1bb1718dd334ea1463d08b9831aa50 (commit)
from cdae43530932b807d6dadf402db6553090f76320 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 604e1ec5a603fd151bd1e7f303e308169ae80de3
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 12 09:52:46 2008 +0100
Re-run make idl.
Guenther
commit 7028d3390b1bb1718dd334ea1463d08b9831aa50
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 12 03:14:12 2008 +0100
Fix IDL for samr_EnumDomainGroups.
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 | 27 ++++++++++++++++++++++++---
source/librpc/gen_ndr/samr.h | 2 +-
source/librpc/gen_ndr/srv_samr.c | 2 +-
source/librpc/idl/samr.idl | 4 ++--
6 files changed, 30 insertions(+), 9 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 efedb00..f428214 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -487,8 +487,8 @@ NTSTATUS rpccli_samr_EnumDomainGroups(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_handle,
uint32_t *resume_handle,
+ struct samr_SamArray **sam,
uint32_t max_size,
- struct samr_SamArray *sam,
uint32_t *num_entries)
{
struct samr_EnumDomainGroups r;
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 9eac177..a2db39b 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -61,8 +61,8 @@ NTSTATUS rpccli_samr_EnumDomainGroups(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_handle,
uint32_t *resume_handle,
+ struct samr_SamArray **sam,
uint32_t max_size,
- struct samr_SamArray *sam,
uint32_t *num_entries);
NTSTATUS rpccli_samr_CreateUser(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index 13227f7..cb9cef9 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -6333,7 +6333,10 @@ static enum ndr_err_code ndr_push_samr_EnumDomainGroups(struct ndr_push *ndr, in
if (r->out.sam == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sam));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.sam));
+ if (*r->out.sam) {
+ NDR_CHECK(ndr_push_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sam));
+ }
if (r->out.num_entries == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
@@ -6345,9 +6348,11 @@ static enum ndr_err_code ndr_push_samr_EnumDomainGroups(struct ndr_push *ndr, in
static enum ndr_err_code ndr_pull_samr_EnumDomainGroups(struct ndr_pull *ndr, int flags, struct samr_EnumDomainGroups *r)
{
+ uint32_t _ptr_sam;
TALLOC_CTX *_mem_save_domain_handle_0;
TALLOC_CTX *_mem_save_resume_handle_0;
TALLOC_CTX *_mem_save_sam_0;
+ TALLOC_CTX *_mem_save_sam_1;
TALLOC_CTX *_mem_save_num_entries_0;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
@@ -6387,7 +6392,18 @@ static enum ndr_err_code ndr_pull_samr_EnumDomainGroups(struct ndr_pull *ndr, in
}
_mem_save_sam_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.sam, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sam));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sam));
+ if (_ptr_sam) {
+ NDR_PULL_ALLOC(ndr, *r->out.sam);
+ } else {
+ *r->out.sam = NULL;
+ }
+ if (*r->out.sam) {
+ _mem_save_sam_1 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, *r->out.sam, 0);
+ NDR_CHECK(ndr_pull_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sam));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sam_1, 0);
+ }
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sam_0, LIBNDR_FLAG_REF_ALLOC);
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.num_entries);
@@ -6431,7 +6447,12 @@ _PUBLIC_ void ndr_print_samr_EnumDomainGroups(struct ndr_print *ndr, const char
ndr->depth--;
ndr_print_ptr(ndr, "sam", r->out.sam);
ndr->depth++;
- ndr_print_samr_SamArray(ndr, "sam", r->out.sam);
+ ndr_print_ptr(ndr, "sam", *r->out.sam);
+ ndr->depth++;
+ if (*r->out.sam) {
+ ndr_print_samr_SamArray(ndr, "sam", *r->out.sam);
+ }
+ ndr->depth--;
ndr->depth--;
ndr_print_ptr(ndr, "num_entries", r->out.num_entries);
ndr->depth++;
diff --git a/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h
index 2d6126a..5a436fb 100644
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -913,7 +913,7 @@ struct samr_EnumDomainGroups {
} in;
struct {
- struct samr_SamArray *sam;/* [ref] */
+ struct samr_SamArray **sam;/* [ref] */
uint32_t *num_entries;/* [ref] */
uint32_t *resume_handle;/* [ref] */
NTSTATUS result;
diff --git a/source/librpc/gen_ndr/srv_samr.c b/source/librpc/gen_ndr/srv_samr.c
index 47a51ed..768c3b7 100644
--- a/source/librpc/gen_ndr/srv_samr.c
+++ b/source/librpc/gen_ndr/srv_samr.c
@@ -913,7 +913,7 @@ static bool api_samr_EnumDomainGroups(pipes_struct *p)
ZERO_STRUCT(r->out);
r->out.resume_handle = r->in.resume_handle;
- r->out.sam = talloc_zero(r, struct samr_SamArray);
+ r->out.sam = talloc_zero(r, struct samr_SamArray *);
if (r->out.sam == NULL) {
talloc_free(r);
return false;
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 6841420..3bb1677 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -317,10 +317,10 @@ import "misc.idl", "lsa.idl", "security.idl";
/************************/
/* Function 0x0b */
NTSTATUS samr_EnumDomainGroups(
- [in,ref] policy_handle *domain_handle,
+ [in] policy_handle *domain_handle,
[in,out,ref] uint32 *resume_handle,
+ [out,ref] samr_SamArray **sam,
[in] uint32 max_size,
- [out,ref] samr_SamArray *sam,
[out,ref] uint32 *num_entries
);
--
Samba Shared Repository
More information about the samba-cvs
mailing list