From e3c063243da36c0d30775d046188b954e85309e6 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 11 Mar 2008 17:25:52 +0100 Subject: [PATCH] rerun 'make idl' metze --- source/librpc/gen_ndr/ndr_winbind_protocol.c | 485 ++++++++++--------- source/librpc/gen_ndr/ndr_winbind_protocol.h | 2 +- source/librpc/gen_ndr/winbind_protocol.h | 17 +- 3 files changed, 274 insertions(+), 230 deletions(-) diff --git a/source/librpc/gen_ndr/ndr_winbind_protocol.c b/source/librpc/gen_ndr/ndr_winbind_protocol.c index f9771f20f51..5ddae788cb7 100644 --- a/source/librpc/gen_ndr/ndr_winbind_protocol.c +++ b/source/librpc/gen_ndr/ndr_winbind_protocol.c @@ -523,6 +523,7 @@ _PUBLIC_ void ndr_print_winbind_lookup_level(struct ndr_print *ndr, const char * case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: val = "WINBIND_LOOKUP_LEVEL_RIDS2NAMES"; break; case WINBIND_LOOKUP_LEVEL_SID2USERINFO: val = "WINBIND_LOOKUP_LEVEL_SID2USERINFO"; break; case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: val = "WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS"; break; + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: val = "WINBIND_LOOKUP_LEVEL_EXPANDALIASES"; break; } ndr_print_enum(ndr, name, "ENUM", val, r); } @@ -605,228 +606,6 @@ _PUBLIC_ void ndr_print_STRUCT_winbind_lookup_req_rids(struct ndr_print *ndr, co ndr->depth--; } -static enum ndr_err_code ndr_push_winbind_lookup_req(struct ndr_push *ndr, int ndr_flags, const union winbind_lookup_req *r) -{ - if (ndr_flags & NDR_SCALARS) { - int level = ndr_push_get_switch_value(ndr, r); - NDR_CHECK(ndr_push_winbind_lookup_level(ndr, NDR_SCALARS, level)); - switch (level) { - case WINBIND_LOOKUP_LEVEL_SID2NAME: { - NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid)); - break; } - - case WINBIND_LOOKUP_LEVEL_NAME2SID: { - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8))); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8))); - NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->name, ndr_charset_length(r->name, CH_UTF8), sizeof(uint8_t), CH_UTF8)); - break; } - - case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: { - NDR_CHECK(ndr_push_STRUCT_winbind_lookup_req_rids(ndr, NDR_SCALARS, &r->rids)); - break; } - - case WINBIND_LOOKUP_LEVEL_SID2USERINFO: { - NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid)); - break; } - - case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: { - NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid)); - break; } - - default: { - break; } - - } - } - if (ndr_flags & NDR_BUFFERS) { - int level = ndr_push_get_switch_value(ndr, r); - switch (level) { - case WINBIND_LOOKUP_LEVEL_SID2NAME: - if (r->sid) { - NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); - } - break; - - case WINBIND_LOOKUP_LEVEL_NAME2SID: - break; - - case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: - NDR_CHECK(ndr_push_STRUCT_winbind_lookup_req_rids(ndr, NDR_BUFFERS, &r->rids)); - break; - - case WINBIND_LOOKUP_LEVEL_SID2USERINFO: - if (r->sid) { - NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); - } - break; - - case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: - if (r->sid) { - NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); - } - break; - - default: - break; - - } - } - return NDR_ERR_SUCCESS; -} - -static enum ndr_err_code ndr_pull_winbind_lookup_req(struct ndr_pull *ndr, int ndr_flags, union winbind_lookup_req *r) -{ - int level; - uint32_t _level; - TALLOC_CTX *_mem_save_sid_0; - level = ndr_pull_get_switch_value(ndr, r); - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level)); - if (_level != level) { - return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r", _level); - } - switch (level) { - case WINBIND_LOOKUP_LEVEL_SID2NAME: { - uint32_t _ptr_sid; - NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sid)); - if (_ptr_sid) { - NDR_PULL_ALLOC(ndr, r->sid); - } else { - r->sid = NULL; - } - break; } - - case WINBIND_LOOKUP_LEVEL_NAME2SID: { - NDR_CHECK(ndr_pull_array_size(ndr, &r->name)); - NDR_CHECK(ndr_pull_array_length(ndr, &r->name)); - if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) { - return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name)); - } - NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t))); - NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t), CH_UTF8)); - break; } - - case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: { - NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_req_rids(ndr, NDR_SCALARS, &r->rids)); - break; } - - case WINBIND_LOOKUP_LEVEL_SID2USERINFO: { - uint32_t _ptr_sid; - NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sid)); - if (_ptr_sid) { - NDR_PULL_ALLOC(ndr, r->sid); - } else { - r->sid = NULL; - } - break; } - - case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: { - uint32_t _ptr_sid; - NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sid)); - if (_ptr_sid) { - NDR_PULL_ALLOC(ndr, r->sid); - } else { - r->sid = NULL; - } - break; } - - default: { - break; } - - } - } - if (ndr_flags & NDR_BUFFERS) { - switch (level) { - case WINBIND_LOOKUP_LEVEL_SID2NAME: - if (r->sid) { - _mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->sid, 0); - NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, 0); - } - break; - - case WINBIND_LOOKUP_LEVEL_NAME2SID: - break; - - case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: - NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_req_rids(ndr, NDR_BUFFERS, &r->rids)); - break; - - case WINBIND_LOOKUP_LEVEL_SID2USERINFO: - if (r->sid) { - _mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->sid, 0); - NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, 0); - } - break; - - case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: - if (r->sid) { - _mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->sid, 0); - NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, 0); - } - break; - - default: - break; - - } - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_winbind_lookup_req(struct ndr_print *ndr, const char *name, const union winbind_lookup_req *r) -{ - int level; - level = ndr_print_get_switch_value(ndr, r); - ndr_print_union(ndr, name, level, "winbind_lookup_req"); - switch (level) { - case WINBIND_LOOKUP_LEVEL_SID2NAME: - ndr_print_ptr(ndr, "sid", r->sid); - ndr->depth++; - if (r->sid) { - ndr_print_dom_sid(ndr, "sid", r->sid); - } - ndr->depth--; - break; - - case WINBIND_LOOKUP_LEVEL_NAME2SID: - ndr_print_string(ndr, "name", r->name); - break; - - case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: - ndr_print_STRUCT_winbind_lookup_req_rids(ndr, "rids", &r->rids); - break; - - case WINBIND_LOOKUP_LEVEL_SID2USERINFO: - ndr_print_ptr(ndr, "sid", r->sid); - ndr->depth++; - if (r->sid) { - ndr_print_dom_sid(ndr, "sid", r->sid); - } - ndr->depth--; - break; - - case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: - ndr_print_ptr(ndr, "sid", r->sid); - ndr->depth++; - if (r->sid) { - ndr_print_dom_sid(ndr, "sid", r->sid); - } - ndr->depth--; - break; - - default: - break; - - } -} - static enum ndr_err_code ndr_push_STRUCT_winbind_lookup_name_info(struct ndr_push *ndr, int ndr_flags, const struct winbind_lookup_name_info *r) { if (ndr_flags & NDR_SCALARS) { @@ -1133,6 +912,248 @@ _PUBLIC_ void ndr_print_STRUCT_winbind_lookup_sid_info_array(struct ndr_print *n ndr->depth--; } +static enum ndr_err_code ndr_push_winbind_lookup_req(struct ndr_push *ndr, int ndr_flags, const union winbind_lookup_req *r) +{ + if (ndr_flags & NDR_SCALARS) { + int level = ndr_push_get_switch_value(ndr, r); + NDR_CHECK(ndr_push_winbind_lookup_level(ndr, NDR_SCALARS, level)); + switch (level) { + case WINBIND_LOOKUP_LEVEL_SID2NAME: { + NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid)); + break; } + + case WINBIND_LOOKUP_LEVEL_NAME2SID: { + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8))); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8))); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->name, ndr_charset_length(r->name, CH_UTF8), sizeof(uint8_t), CH_UTF8)); + break; } + + case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: { + NDR_CHECK(ndr_push_STRUCT_winbind_lookup_req_rids(ndr, NDR_SCALARS, &r->rids)); + break; } + + case WINBIND_LOOKUP_LEVEL_SID2USERINFO: { + NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid)); + break; } + + case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: { + NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid)); + break; } + + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: { + NDR_CHECK(ndr_push_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_SCALARS, &r->sid_array)); + break; } + + default: { + break; } + + } + } + if (ndr_flags & NDR_BUFFERS) { + int level = ndr_push_get_switch_value(ndr, r); + switch (level) { + case WINBIND_LOOKUP_LEVEL_SID2NAME: + if (r->sid) { + NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); + } + break; + + case WINBIND_LOOKUP_LEVEL_NAME2SID: + break; + + case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: + NDR_CHECK(ndr_push_STRUCT_winbind_lookup_req_rids(ndr, NDR_BUFFERS, &r->rids)); + break; + + case WINBIND_LOOKUP_LEVEL_SID2USERINFO: + if (r->sid) { + NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); + } + break; + + case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: + if (r->sid) { + NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); + } + break; + + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: + NDR_CHECK(ndr_push_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_BUFFERS, &r->sid_array)); + break; + + default: + break; + + } + } + return NDR_ERR_SUCCESS; +} + +static enum ndr_err_code ndr_pull_winbind_lookup_req(struct ndr_pull *ndr, int ndr_flags, union winbind_lookup_req *r) +{ + int level; + uint32_t _level; + TALLOC_CTX *_mem_save_sid_0; + level = ndr_pull_get_switch_value(ndr, r); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &_level)); + if (_level != level) { + return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u for r", _level); + } + switch (level) { + case WINBIND_LOOKUP_LEVEL_SID2NAME: { + uint32_t _ptr_sid; + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sid)); + if (_ptr_sid) { + NDR_PULL_ALLOC(ndr, r->sid); + } else { + r->sid = NULL; + } + break; } + + case WINBIND_LOOKUP_LEVEL_NAME2SID: { + NDR_CHECK(ndr_pull_array_size(ndr, &r->name)); + NDR_CHECK(ndr_pull_array_length(ndr, &r->name)); + if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) { + return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name)); + } + NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t))); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t), CH_UTF8)); + break; } + + case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: { + NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_req_rids(ndr, NDR_SCALARS, &r->rids)); + break; } + + case WINBIND_LOOKUP_LEVEL_SID2USERINFO: { + uint32_t _ptr_sid; + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sid)); + if (_ptr_sid) { + NDR_PULL_ALLOC(ndr, r->sid); + } else { + r->sid = NULL; + } + break; } + + case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: { + uint32_t _ptr_sid; + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sid)); + if (_ptr_sid) { + NDR_PULL_ALLOC(ndr, r->sid); + } else { + r->sid = NULL; + } + break; } + + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: { + NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_SCALARS, &r->sid_array)); + break; } + + default: { + break; } + + } + } + if (ndr_flags & NDR_BUFFERS) { + switch (level) { + case WINBIND_LOOKUP_LEVEL_SID2NAME: + if (r->sid) { + _mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->sid, 0); + NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, 0); + } + break; + + case WINBIND_LOOKUP_LEVEL_NAME2SID: + break; + + case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: + NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_req_rids(ndr, NDR_BUFFERS, &r->rids)); + break; + + case WINBIND_LOOKUP_LEVEL_SID2USERINFO: + if (r->sid) { + _mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->sid, 0); + NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, 0); + } + break; + + case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: + if (r->sid) { + _mem_save_sid_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->sid, 0); + NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS, r->sid)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sid_0, 0); + } + break; + + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: + NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_BUFFERS, &r->sid_array)); + break; + + default: + break; + + } + } + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ void ndr_print_winbind_lookup_req(struct ndr_print *ndr, const char *name, const union winbind_lookup_req *r) +{ + int level; + level = ndr_print_get_switch_value(ndr, r); + ndr_print_union(ndr, name, level, "winbind_lookup_req"); + switch (level) { + case WINBIND_LOOKUP_LEVEL_SID2NAME: + ndr_print_ptr(ndr, "sid", r->sid); + ndr->depth++; + if (r->sid) { + ndr_print_dom_sid(ndr, "sid", r->sid); + } + ndr->depth--; + break; + + case WINBIND_LOOKUP_LEVEL_NAME2SID: + ndr_print_string(ndr, "name", r->name); + break; + + case WINBIND_LOOKUP_LEVEL_RIDS2NAMES: + ndr_print_STRUCT_winbind_lookup_req_rids(ndr, "rids", &r->rids); + break; + + case WINBIND_LOOKUP_LEVEL_SID2USERINFO: + ndr_print_ptr(ndr, "sid", r->sid); + ndr->depth++; + if (r->sid) { + ndr_print_dom_sid(ndr, "sid", r->sid); + } + ndr->depth--; + break; + + case WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS: + ndr_print_ptr(ndr, "sid", r->sid); + ndr->depth++; + if (r->sid) { + ndr_print_dom_sid(ndr, "sid", r->sid); + } + ndr->depth--; + break; + + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: + ndr_print_STRUCT_winbind_lookup_sid_info_array(ndr, "sid_array", &r->sid_array); + break; + + default: + break; + + } +} + static enum ndr_err_code ndr_push_winbind_lookup_rep(struct ndr_push *ndr, int ndr_flags, const union winbind_lookup_rep *r) { if (ndr_flags & NDR_SCALARS) { @@ -1159,6 +1180,10 @@ static enum ndr_err_code ndr_push_winbind_lookup_rep(struct ndr_push *ndr, int n NDR_CHECK(ndr_push_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_SCALARS, &r->sid_array)); break; } + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: { + NDR_CHECK(ndr_push_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_SCALARS, &r->sid_array)); + break; } + default: { break; } @@ -1184,6 +1209,10 @@ static enum ndr_err_code ndr_push_winbind_lookup_rep(struct ndr_push *ndr, int n NDR_CHECK(ndr_push_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_BUFFERS, &r->sid_array)); break; + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: + NDR_CHECK(ndr_push_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_BUFFERS, &r->sid_array)); + break; + default: break; @@ -1223,6 +1252,10 @@ static enum ndr_err_code ndr_pull_winbind_lookup_rep(struct ndr_pull *ndr, int n NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_SCALARS, &r->sid_array)); break; } + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: { + NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_SCALARS, &r->sid_array)); + break; } + default: { break; } @@ -1247,6 +1280,10 @@ static enum ndr_err_code ndr_pull_winbind_lookup_rep(struct ndr_pull *ndr, int n NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_BUFFERS, &r->sid_array)); break; + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: + NDR_CHECK(ndr_pull_STRUCT_winbind_lookup_sid_info_array(ndr, NDR_BUFFERS, &r->sid_array)); + break; + default: break; @@ -1281,6 +1318,10 @@ _PUBLIC_ void ndr_print_winbind_lookup_rep(struct ndr_print *ndr, const char *na ndr_print_STRUCT_winbind_lookup_sid_info_array(ndr, "sid_array", &r->sid_array); break; + case WINBIND_LOOKUP_LEVEL_EXPANDALIASES: + ndr_print_STRUCT_winbind_lookup_sid_info_array(ndr, "sid_array", &r->sid_array); + break; + default: break; diff --git a/source/librpc/gen_ndr/ndr_winbind_protocol.h b/source/librpc/gen_ndr/ndr_winbind_protocol.h index 92bc449d447..9bed34c5364 100644 --- a/source/librpc/gen_ndr/ndr_winbind_protocol.h +++ b/source/librpc/gen_ndr/ndr_winbind_protocol.h @@ -101,12 +101,12 @@ void ndr_print_winbind_trust_req(struct ndr_print *ndr, const char *name, const void ndr_print_winbind_trust_rep(struct ndr_print *ndr, const char *name, const union winbind_trust_rep *r); void ndr_print_winbind_lookup_level(struct ndr_print *ndr, const char *name, enum winbind_lookup_level r); void ndr_print_STRUCT_winbind_lookup_req_rids(struct ndr_print *ndr, const char *name, const struct winbind_lookup_req_rids *r); -void ndr_print_winbind_lookup_req(struct ndr_print *ndr, const char *name, const union winbind_lookup_req *r); void ndr_print_STRUCT_winbind_lookup_name_info(struct ndr_print *ndr, const char *name, const struct winbind_lookup_name_info *r); void ndr_print_STRUCT_winbind_lookup_sid_info(struct ndr_print *ndr, const char *name, const struct winbind_lookup_sid_info *r); void ndr_print_STRUCT_winbind_lookup_name_info_array(struct ndr_print *ndr, const char *name, const struct winbind_lookup_name_info_array *r); void ndr_print_STRUCT_winbind_lookup_user_info(struct ndr_print *ndr, const char *name, const struct winbind_lookup_user_info *r); void ndr_print_STRUCT_winbind_lookup_sid_info_array(struct ndr_print *ndr, const char *name, const struct winbind_lookup_sid_info_array *r); +void ndr_print_winbind_lookup_req(struct ndr_print *ndr, const char *name, const union winbind_lookup_req *r); void ndr_print_winbind_lookup_rep(struct ndr_print *ndr, const char *name, const union winbind_lookup_rep *r); void ndr_print_winbind_get_idmap_level(struct ndr_print *ndr, const char *name, enum winbind_get_idmap_level r); void ndr_print_winbind_get_idmap_req(struct ndr_print *ndr, const char *name, const union winbind_get_idmap_req *r); diff --git a/source/librpc/gen_ndr/winbind_protocol.h b/source/librpc/gen_ndr/winbind_protocol.h index 5227e9d3615..2a62954c001 100644 --- a/source/librpc/gen_ndr/winbind_protocol.h +++ b/source/librpc/gen_ndr/winbind_protocol.h @@ -98,7 +98,8 @@ enum winbind_lookup_level WINBIND_LOOKUP_LEVEL_NAME2SID=2, WINBIND_LOOKUP_LEVEL_RIDS2NAMES=3, WINBIND_LOOKUP_LEVEL_SID2USERINFO=4, - WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS=5 + WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS=5, + WINBIND_LOOKUP_LEVEL_EXPANDALIASES=6 } #else { __donnot_use_enum_winbind_lookup_level=0x7FFFFFFF} @@ -107,6 +108,7 @@ enum winbind_lookup_level #define WINBIND_LOOKUP_LEVEL_RIDS2NAMES ( 3 ) #define WINBIND_LOOKUP_LEVEL_SID2USERINFO ( 4 ) #define WINBIND_LOOKUP_LEVEL_SID2DOMGROUPS ( 5 ) +#define WINBIND_LOOKUP_LEVEL_EXPANDALIASES ( 6 ) #endif ; @@ -116,12 +118,6 @@ struct winbind_lookup_req_rids { uint32_t *rids; }; -union winbind_lookup_req { - struct dom_sid *sid;/* [unique,case(WINBIND_LOOKUP_LEVEL_SID2NAME)] */ - const char *name;/* [charset(UTF8),case(WINBIND_LOOKUP_LEVEL_NAME2SID)] */ - struct winbind_lookup_req_rids rids;/* [case(WINBIND_LOOKUP_LEVEL_RIDS2NAMES)] */ -}/* [switch_type(winbind_lookup_level)] */; - struct winbind_lookup_name_info { const char *domain_name;/* [charset(UTF8)] */ const char *account_name;/* [charset(UTF8)] */ @@ -156,6 +152,13 @@ struct winbind_lookup_sid_info_array { struct winbind_lookup_sid_info; +union winbind_lookup_req { + struct dom_sid *sid;/* [unique,case(WINBIND_LOOKUP_LEVEL_SID2NAME)] */ + const char *name;/* [charset(UTF8),case(WINBIND_LOOKUP_LEVEL_NAME2SID)] */ + struct winbind_lookup_req_rids rids;/* [case(WINBIND_LOOKUP_LEVEL_RIDS2NAMES)] */ + struct winbind_lookup_sid_info_array sid_array;/* [case(WINBIND_LOOKUP_LEVEL_EXPANDALIASES)] */ +}/* [switch_type(winbind_lookup_level)] */; + union winbind_lookup_rep { struct winbind_lookup_name_info name_info;/* [case(WINBIND_LOOKUP_LEVEL_SID2NAME)] */ struct winbind_lookup_sid_info sid_info;/* [case(WINBIND_LOOKUP_LEVEL_NAME2SID)] */ -- 2.34.1