From 8990865c7f5f52c615c5d571cec50d49deda7322 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 11 Sep 2009 12:16:35 +0200 Subject: lsa: use lsa_LookupNamesLevel in lsa_LookupSids{2,3}. Guenther --- librpc/gen_ndr/cli_lsa.c | 12 ++++++------ librpc/gen_ndr/cli_lsa.h | 12 ++++++------ librpc/gen_ndr/lsa.h | 6 +++--- librpc/gen_ndr/ndr_lsa.c | 18 +++++++++--------- librpc/idl/lsa.idl | 6 +++--- 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'librpc') diff --git a/librpc/gen_ndr/cli_lsa.c b/librpc/gen_ndr/cli_lsa.c index bc51b71798..cfaf7e50b5 100644 --- a/librpc/gen_ndr/cli_lsa.c +++ b/librpc/gen_ndr/cli_lsa.c @@ -2479,7 +2479,7 @@ struct tevent_req *rpccli_lsa_LookupSids_send(TALLOC_CTX *mem_ctx, struct lsa_SidArray *_sids /* [in] [ref] */, struct lsa_RefDomainList **_domains /* [out] [ref] */, struct lsa_TransNameArray *_names /* [in,out] [ref] */, - uint16_t _level /* [in] */, + enum lsa_LookupNamesLevel _level /* [in] */, uint32_t *_count /* [in,out] [ref] */) { struct tevent_req *req; @@ -2602,7 +2602,7 @@ NTSTATUS rpccli_lsa_LookupSids(struct rpc_pipe_client *cli, struct lsa_SidArray *sids /* [in] [ref] */, struct lsa_RefDomainList **domains /* [out] [ref] */, struct lsa_TransNameArray *names /* [in,out] [ref] */, - uint16_t level /* [in] */, + enum lsa_LookupNamesLevel level /* [in] */, uint32_t *count /* [in,out] [ref] */) { struct lsa_LookupSids r; @@ -9365,7 +9365,7 @@ struct tevent_req *rpccli_lsa_LookupSids2_send(TALLOC_CTX *mem_ctx, struct lsa_SidArray *_sids /* [in] [ref] */, struct lsa_RefDomainList **_domains /* [out] [ref] */, struct lsa_TransNameArray2 *_names /* [in,out] [ref] */, - uint16_t _level /* [in] */, + enum lsa_LookupNamesLevel _level /* [in] */, uint32_t *_count /* [in,out] [ref] */, uint32_t _unknown1 /* [in] */, uint32_t _unknown2 /* [in] */) @@ -9492,7 +9492,7 @@ NTSTATUS rpccli_lsa_LookupSids2(struct rpc_pipe_client *cli, struct lsa_SidArray *sids /* [in] [ref] */, struct lsa_RefDomainList **domains /* [out] [ref] */, struct lsa_TransNameArray2 *names /* [in,out] [ref] */, - uint16_t level /* [in] */, + enum lsa_LookupNamesLevel level /* [in] */, uint32_t *count /* [in,out] [ref] */, uint32_t unknown1 /* [in] */, uint32_t unknown2 /* [in] */) @@ -12331,7 +12331,7 @@ struct tevent_req *rpccli_lsa_LookupSids3_send(TALLOC_CTX *mem_ctx, struct lsa_SidArray *_sids /* [in] [ref] */, struct lsa_RefDomainList **_domains /* [out] [ref] */, struct lsa_TransNameArray2 *_names /* [in,out] [ref] */, - uint16_t _level /* [in] */, + enum lsa_LookupNamesLevel _level /* [in] */, uint32_t *_count /* [in,out] [ref] */, uint32_t _unknown1 /* [in] */, uint32_t _unknown2 /* [in] */) @@ -12456,7 +12456,7 @@ NTSTATUS rpccli_lsa_LookupSids3(struct rpc_pipe_client *cli, struct lsa_SidArray *sids /* [in] [ref] */, struct lsa_RefDomainList **domains /* [out] [ref] */, struct lsa_TransNameArray2 *names /* [in,out] [ref] */, - uint16_t level /* [in] */, + enum lsa_LookupNamesLevel level /* [in] */, uint32_t *count /* [in,out] [ref] */, uint32_t unknown1 /* [in] */, uint32_t unknown2 /* [in] */) diff --git a/librpc/gen_ndr/cli_lsa.h b/librpc/gen_ndr/cli_lsa.h index d9a7362620..a7eed18911 100644 --- a/librpc/gen_ndr/cli_lsa.h +++ b/librpc/gen_ndr/cli_lsa.h @@ -218,7 +218,7 @@ struct tevent_req *rpccli_lsa_LookupSids_send(TALLOC_CTX *mem_ctx, struct lsa_SidArray *_sids /* [in] [ref] */, struct lsa_RefDomainList **_domains /* [out] [ref] */, struct lsa_TransNameArray *_names /* [in,out] [ref] */, - uint16_t _level /* [in] */, + enum lsa_LookupNamesLevel _level /* [in] */, uint32_t *_count /* [in,out] [ref] */); NTSTATUS rpccli_lsa_LookupSids_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, @@ -229,7 +229,7 @@ NTSTATUS rpccli_lsa_LookupSids(struct rpc_pipe_client *cli, struct lsa_SidArray *sids /* [in] [ref] */, struct lsa_RefDomainList **domains /* [out] [ref] */, struct lsa_TransNameArray *names /* [in,out] [ref] */, - uint16_t level /* [in] */, + enum lsa_LookupNamesLevel level /* [in] */, uint32_t *count /* [in,out] [ref] */); struct tevent_req *rpccli_lsa_CreateSecret_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, @@ -814,7 +814,7 @@ struct tevent_req *rpccli_lsa_LookupSids2_send(TALLOC_CTX *mem_ctx, struct lsa_SidArray *_sids /* [in] [ref] */, struct lsa_RefDomainList **_domains /* [out] [ref] */, struct lsa_TransNameArray2 *_names /* [in,out] [ref] */, - uint16_t _level /* [in] */, + enum lsa_LookupNamesLevel _level /* [in] */, uint32_t *_count /* [in,out] [ref] */, uint32_t _unknown1 /* [in] */, uint32_t _unknown2 /* [in] */); @@ -827,7 +827,7 @@ NTSTATUS rpccli_lsa_LookupSids2(struct rpc_pipe_client *cli, struct lsa_SidArray *sids /* [in] [ref] */, struct lsa_RefDomainList **domains /* [out] [ref] */, struct lsa_TransNameArray2 *names /* [in,out] [ref] */, - uint16_t level /* [in] */, + enum lsa_LookupNamesLevel level /* [in] */, uint32_t *count /* [in,out] [ref] */, uint32_t unknown1 /* [in] */, uint32_t unknown2 /* [in] */); @@ -1035,7 +1035,7 @@ struct tevent_req *rpccli_lsa_LookupSids3_send(TALLOC_CTX *mem_ctx, struct lsa_SidArray *_sids /* [in] [ref] */, struct lsa_RefDomainList **_domains /* [out] [ref] */, struct lsa_TransNameArray2 *_names /* [in,out] [ref] */, - uint16_t _level /* [in] */, + enum lsa_LookupNamesLevel _level /* [in] */, uint32_t *_count /* [in,out] [ref] */, uint32_t _unknown1 /* [in] */, uint32_t _unknown2 /* [in] */); @@ -1047,7 +1047,7 @@ NTSTATUS rpccli_lsa_LookupSids3(struct rpc_pipe_client *cli, struct lsa_SidArray *sids /* [in] [ref] */, struct lsa_RefDomainList **domains /* [out] [ref] */, struct lsa_TransNameArray2 *names /* [in,out] [ref] */, - uint16_t level /* [in] */, + enum lsa_LookupNamesLevel level /* [in] */, uint32_t *count /* [in,out] [ref] */, uint32_t unknown1 /* [in] */, uint32_t unknown2 /* [in] */); diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h index 9ee5fab4c8..ed0982b102 100644 --- a/librpc/gen_ndr/lsa.h +++ b/librpc/gen_ndr/lsa.h @@ -954,7 +954,7 @@ struct lsa_LookupSids { struct { struct policy_handle *handle;/* [ref] */ struct lsa_SidArray *sids;/* [ref] */ - uint16_t level; + enum lsa_LookupNamesLevel level; struct lsa_TransNameArray *names;/* [ref] */ uint32_t *count;/* [ref] */ } in; @@ -1549,7 +1549,7 @@ struct lsa_LookupSids2 { struct { struct policy_handle *handle;/* [ref] */ struct lsa_SidArray *sids;/* [ref] */ - uint16_t level; + enum lsa_LookupNamesLevel level; uint32_t unknown1; uint32_t unknown2; struct lsa_TransNameArray2 *names;/* [ref] */ @@ -1756,7 +1756,7 @@ struct lsa_CREDRRENAME { struct lsa_LookupSids3 { struct { struct lsa_SidArray *sids;/* [ref] */ - uint16_t level; + enum lsa_LookupNamesLevel level; uint32_t unknown1; uint32_t unknown2; struct lsa_TransNameArray2 *names;/* [ref] */ diff --git a/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c index 4d09807a6e..c3c67ea977 100644 --- a/librpc/gen_ndr/ndr_lsa.c +++ b/librpc/gen_ndr/ndr_lsa.c @@ -6607,7 +6607,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_lsa_LookupSids(struct ndr_push *ndr, int fla return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); } NDR_CHECK(ndr_push_lsa_TransNameArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.names)); - NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.level)); + NDR_CHECK(ndr_push_lsa_LookupNamesLevel(ndr, NDR_SCALARS, r->in.level)); if (r->in.count == NULL) { return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); } @@ -6667,7 +6667,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupSids(struct ndr_pull *ndr, int fla NDR_PULL_SET_MEM_CTX(ndr, r->in.names, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_lsa_TransNameArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.names)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_names_0, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.level)); + NDR_CHECK(ndr_pull_lsa_LookupNamesLevel(ndr, NDR_SCALARS, &r->in.level)); if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->in.count); } @@ -6742,7 +6742,7 @@ _PUBLIC_ void ndr_print_lsa_LookupSids(struct ndr_print *ndr, const char *name, ndr->depth++; ndr_print_lsa_TransNameArray(ndr, "names", r->in.names); ndr->depth--; - ndr_print_uint16(ndr, "level", r->in.level); + ndr_print_lsa_LookupNamesLevel(ndr, "level", r->in.level); ndr_print_ptr(ndr, "count", r->in.count); ndr->depth++; ndr_print_uint32(ndr, "count", *r->in.count); @@ -10838,7 +10838,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_lsa_LookupSids2(struct ndr_push *ndr, int fl return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); } NDR_CHECK(ndr_push_lsa_TransNameArray2(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.names)); - NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.level)); + NDR_CHECK(ndr_push_lsa_LookupNamesLevel(ndr, NDR_SCALARS, r->in.level)); if (r->in.count == NULL) { return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); } @@ -10900,7 +10900,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupSids2(struct ndr_pull *ndr, int fl NDR_PULL_SET_MEM_CTX(ndr, r->in.names, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_lsa_TransNameArray2(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.names)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_names_0, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.level)); + NDR_CHECK(ndr_pull_lsa_LookupNamesLevel(ndr, NDR_SCALARS, &r->in.level)); if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->in.count); } @@ -10977,7 +10977,7 @@ _PUBLIC_ void ndr_print_lsa_LookupSids2(struct ndr_print *ndr, const char *name, ndr->depth++; ndr_print_lsa_TransNameArray2(ndr, "names", r->in.names); ndr->depth--; - ndr_print_uint16(ndr, "level", r->in.level); + ndr_print_lsa_LookupNamesLevel(ndr, "level", r->in.level); ndr_print_ptr(ndr, "count", r->in.count); ndr->depth++; ndr_print_uint32(ndr, "count", *r->in.count); @@ -12254,7 +12254,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_lsa_LookupSids3(struct ndr_push *ndr, int fl return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); } NDR_CHECK(ndr_push_lsa_TransNameArray2(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.names)); - NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.level)); + NDR_CHECK(ndr_push_lsa_LookupNamesLevel(ndr, NDR_SCALARS, r->in.level)); if (r->in.count == NULL) { return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); } @@ -12308,7 +12308,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupSids3(struct ndr_pull *ndr, int fl NDR_PULL_SET_MEM_CTX(ndr, r->in.names, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_lsa_TransNameArray2(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.names)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_names_0, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.level)); + NDR_CHECK(ndr_pull_lsa_LookupNamesLevel(ndr, NDR_SCALARS, &r->in.level)); if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->in.count); } @@ -12381,7 +12381,7 @@ _PUBLIC_ void ndr_print_lsa_LookupSids3(struct ndr_print *ndr, const char *name, ndr->depth++; ndr_print_lsa_TransNameArray2(ndr, "names", r->in.names); ndr->depth--; - ndr_print_uint16(ndr, "level", r->in.level); + ndr_print_lsa_LookupNamesLevel(ndr, "level", r->in.level); ndr_print_ptr(ndr, "count", r->in.count); ndr->depth++; ndr_print_uint32(ndr, "count", *r->in.count); diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl index 7f8ed4afe3..329a477cf6 100644 --- a/librpc/idl/lsa.idl +++ b/librpc/idl/lsa.idl @@ -525,7 +525,7 @@ import "misc.idl", "security.idl"; [in,ref] lsa_SidArray *sids, [out,ref] lsa_RefDomainList **domains, [in,out,ref] lsa_TransNameArray *names, - [in] uint16 level, + [in] lsa_LookupNamesLevel level, [in,out,ref] uint32 *count ); @@ -1104,7 +1104,7 @@ import "misc.idl", "security.idl"; [in,ref] lsa_SidArray *sids, [out,ref] lsa_RefDomainList **domains, [in,out,ref] lsa_TransNameArray2 *names, - [in] uint16 level, + [in] lsa_LookupNamesLevel level, [in,out,ref] uint32 *count, [in] uint32 unknown1, [in] uint32 unknown2 @@ -1266,7 +1266,7 @@ import "misc.idl", "security.idl"; [in,ref] lsa_SidArray *sids, [out,ref] lsa_RefDomainList **domains, [in,out,ref] lsa_TransNameArray2 *names, - [in] uint16 level, + [in] lsa_LookupNamesLevel level, [in,out,ref] uint32 *count, [in] uint32 unknown1, [in] uint32 unknown2 -- cgit