From: Stefan Metzmacher Date: Fri, 14 Mar 2008 15:58:34 +0000 (+0100) Subject: rerun X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwb-ndr.git;a=commitdiff_plain;h=d3f26c1ae335210c35882a114b0cd19c1799b006 rerun --- diff --git a/source/librpc/gen_ndr/ndr_winbind_protocol.c b/source/librpc/gen_ndr/ndr_winbind_protocol.c index 36b6eccc54a..1a142ba4dba 100644 --- a/source/librpc/gen_ndr/ndr_winbind_protocol.c +++ b/source/librpc/gen_ndr/ndr_winbind_protocol.c @@ -147,6 +147,7 @@ _PUBLIC_ void ndr_print_winbind_auth_level(struct ndr_print *ndr, const char *na switch (r) { case WINBIND_AUTH_LEVEL_COMPAT_AUTH_PLAIN: val = "WINBIND_AUTH_LEVEL_COMPAT_AUTH_PLAIN"; break; case WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE: val = "WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE"; break; + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: val = "WINBIND_AUTH_LEVEL_COMPAT_LOGOFF"; break; } ndr_print_enum(ndr, name, "ENUM", val, r); } @@ -698,6 +699,138 @@ _PUBLIC_ void ndr_print_STRUCT_winbind_auth_compat_auth_response_req(struct ndr_ ndr->depth--; } +static enum ndr_err_code ndr_push_STRUCT_winbind_auth_compat_logoff_req(struct ndr_push *ndr, int ndr_flags, const struct winbind_auth_compat_logoff_req *r) +{ + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->flags)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->account_name, CH_UTF8))); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->account_name, CH_UTF8))); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->account_name, ndr_charset_length(r->account_name, CH_UTF8), sizeof(uint8_t), CH_UTF8)); + NDR_CHECK(ndr_push_unique_ptr(ndr, r->domain_name)); + NDR_CHECK(ndr_push_unique_ptr(ndr, r->krb5_cc_name)); + NDR_CHECK(ndr_push_unique_ptr(ndr, r->uid)); + } + if (ndr_flags & NDR_BUFFERS) { + if (r->domain_name) { + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->domain_name, CH_UTF8))); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->domain_name, CH_UTF8))); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->domain_name, ndr_charset_length(r->domain_name, CH_UTF8), sizeof(uint8_t), CH_UTF8)); + } + if (r->krb5_cc_name) { + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->krb5_cc_name, CH_UTF8))); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->krb5_cc_name, CH_UTF8))); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->krb5_cc_name, ndr_charset_length(r->krb5_cc_name, CH_UTF8), sizeof(uint8_t), CH_UTF8)); + } + if (r->uid) { + NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, *r->uid)); + } + } + return NDR_ERR_SUCCESS; +} + +static enum ndr_err_code ndr_pull_STRUCT_winbind_auth_compat_logoff_req(struct ndr_pull *ndr, int ndr_flags, struct winbind_auth_compat_logoff_req *r) +{ + uint32_t _ptr_domain_name; + TALLOC_CTX *_mem_save_domain_name_0; + uint32_t _ptr_krb5_cc_name; + TALLOC_CTX *_mem_save_krb5_cc_name_0; + uint32_t _ptr_uid; + TALLOC_CTX *_mem_save_uid_0; + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_align(ndr, 4)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->flags)); + NDR_CHECK(ndr_pull_array_size(ndr, &r->account_name)); + NDR_CHECK(ndr_pull_array_length(ndr, &r->account_name)); + if (ndr_get_array_length(ndr, &r->account_name) > ndr_get_array_size(ndr, &r->account_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->account_name), ndr_get_array_length(ndr, &r->account_name)); + } + NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->account_name), sizeof(uint8_t))); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->account_name, ndr_get_array_length(ndr, &r->account_name), sizeof(uint8_t), CH_UTF8)); + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_domain_name)); + if (_ptr_domain_name) { + NDR_PULL_ALLOC(ndr, r->domain_name); + } else { + r->domain_name = NULL; + } + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_krb5_cc_name)); + if (_ptr_krb5_cc_name) { + NDR_PULL_ALLOC(ndr, r->krb5_cc_name); + } else { + r->krb5_cc_name = NULL; + } + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_uid)); + if (_ptr_uid) { + NDR_PULL_ALLOC(ndr, r->uid); + } else { + r->uid = NULL; + } + } + if (ndr_flags & NDR_BUFFERS) { + if (r->domain_name) { + _mem_save_domain_name_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->domain_name, 0); + NDR_CHECK(ndr_pull_array_size(ndr, &r->domain_name)); + NDR_CHECK(ndr_pull_array_length(ndr, &r->domain_name)); + if (ndr_get_array_length(ndr, &r->domain_name) > ndr_get_array_size(ndr, &r->domain_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->domain_name), ndr_get_array_length(ndr, &r->domain_name)); + } + NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->domain_name), sizeof(uint8_t))); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->domain_name, ndr_get_array_length(ndr, &r->domain_name), sizeof(uint8_t), CH_UTF8)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_name_0, 0); + } + if (r->krb5_cc_name) { + _mem_save_krb5_cc_name_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->krb5_cc_name, 0); + NDR_CHECK(ndr_pull_array_size(ndr, &r->krb5_cc_name)); + NDR_CHECK(ndr_pull_array_length(ndr, &r->krb5_cc_name)); + if (ndr_get_array_length(ndr, &r->krb5_cc_name) > ndr_get_array_size(ndr, &r->krb5_cc_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->krb5_cc_name), ndr_get_array_length(ndr, &r->krb5_cc_name)); + } + NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->krb5_cc_name), sizeof(uint8_t))); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->krb5_cc_name, ndr_get_array_length(ndr, &r->krb5_cc_name), sizeof(uint8_t), CH_UTF8)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_krb5_cc_name_0, 0); + } + if (r->uid) { + _mem_save_uid_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->uid, 0); + NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, r->uid)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_uid_0, 0); + } + } + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ void ndr_print_STRUCT_winbind_auth_compat_logoff_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_compat_logoff_req *r) +{ + ndr_print_struct(ndr, name, "winbind_auth_compat_logoff_req"); + ndr->depth++; + ndr_print_uint32(ndr, "flags", r->flags); + ndr_print_string(ndr, "account_name", r->account_name); + ndr_print_ptr(ndr, "domain_name", r->domain_name); + ndr->depth++; + if (r->domain_name) { + ndr_print_string(ndr, "domain_name", r->domain_name); + } + ndr->depth--; + ndr_print_ptr(ndr, "krb5_cc_name", r->krb5_cc_name); + ndr->depth++; + if (r->krb5_cc_name) { + ndr_print_string(ndr, "krb5_cc_name", r->krb5_cc_name); + } + ndr->depth--; + ndr_print_ptr(ndr, "uid", r->uid); + ndr->depth++; + if (r->uid) { + ndr_print_hyper(ndr, "uid", *r->uid); + } + ndr->depth--; + ndr->depth--; +} + static enum ndr_err_code ndr_push_winbind_auth_req(struct ndr_push *ndr, int ndr_flags, const union winbind_auth_req *r) { if (ndr_flags & NDR_SCALARS) { @@ -712,6 +845,10 @@ static enum ndr_err_code ndr_push_winbind_auth_req(struct ndr_push *ndr, int ndr NDR_CHECK(ndr_push_STRUCT_winbind_auth_compat_auth_response_req(ndr, NDR_SCALARS, &r->compat_auth_response)); break; } + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: { + NDR_CHECK(ndr_push_STRUCT_winbind_auth_compat_logoff_req(ndr, NDR_SCALARS, &r->compat_logoff)); + break; } + default: { break; } @@ -728,6 +865,10 @@ static enum ndr_err_code ndr_push_winbind_auth_req(struct ndr_push *ndr, int ndr NDR_CHECK(ndr_push_STRUCT_winbind_auth_compat_auth_response_req(ndr, NDR_BUFFERS, &r->compat_auth_response)); break; + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: + NDR_CHECK(ndr_push_STRUCT_winbind_auth_compat_logoff_req(ndr, NDR_BUFFERS, &r->compat_logoff)); + break; + default: break; @@ -755,6 +896,10 @@ static enum ndr_err_code ndr_pull_winbind_auth_req(struct ndr_pull *ndr, int ndr NDR_CHECK(ndr_pull_STRUCT_winbind_auth_compat_auth_response_req(ndr, NDR_SCALARS, &r->compat_auth_response)); break; } + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: { + NDR_CHECK(ndr_pull_STRUCT_winbind_auth_compat_logoff_req(ndr, NDR_SCALARS, &r->compat_logoff)); + break; } + default: { break; } @@ -770,6 +915,10 @@ static enum ndr_err_code ndr_pull_winbind_auth_req(struct ndr_pull *ndr, int ndr NDR_CHECK(ndr_pull_STRUCT_winbind_auth_compat_auth_response_req(ndr, NDR_BUFFERS, &r->compat_auth_response)); break; + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: + NDR_CHECK(ndr_pull_STRUCT_winbind_auth_compat_logoff_req(ndr, NDR_BUFFERS, &r->compat_logoff)); + break; + default: break; @@ -792,6 +941,10 @@ _PUBLIC_ void ndr_print_winbind_auth_req(struct ndr_print *ndr, const char *name ndr_print_STRUCT_winbind_auth_compat_auth_response_req(ndr, "compat_auth_response", &r->compat_auth_response); break; + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: + ndr_print_STRUCT_winbind_auth_compat_logoff_req(ndr, "compat_logoff", &r->compat_logoff); + break; + default: break; @@ -812,6 +965,9 @@ static enum ndr_err_code ndr_push_winbind_auth_rep(struct ndr_push *ndr, int ndr NDR_CHECK(ndr_push_STRUCT_winbind_auth_compat_auth_rep(ndr, NDR_SCALARS, &r->compat_auth)); break; } + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: { + break; } + default: { break; } @@ -828,6 +984,9 @@ static enum ndr_err_code ndr_push_winbind_auth_rep(struct ndr_push *ndr, int ndr NDR_CHECK(ndr_push_STRUCT_winbind_auth_compat_auth_rep(ndr, NDR_BUFFERS, &r->compat_auth)); break; + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: + break; + default: break; @@ -855,6 +1014,9 @@ static enum ndr_err_code ndr_pull_winbind_auth_rep(struct ndr_pull *ndr, int ndr NDR_CHECK(ndr_pull_STRUCT_winbind_auth_compat_auth_rep(ndr, NDR_SCALARS, &r->compat_auth)); break; } + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: { + break; } + default: { break; } @@ -870,6 +1032,9 @@ static enum ndr_err_code ndr_pull_winbind_auth_rep(struct ndr_pull *ndr, int ndr NDR_CHECK(ndr_pull_STRUCT_winbind_auth_compat_auth_rep(ndr, NDR_BUFFERS, &r->compat_auth)); break; + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: + break; + default: break; @@ -892,6 +1057,9 @@ _PUBLIC_ void ndr_print_winbind_auth_rep(struct ndr_print *ndr, const char *name ndr_print_STRUCT_winbind_auth_compat_auth_rep(ndr, "compat_auth", &r->compat_auth); break; + case WINBIND_AUTH_LEVEL_COMPAT_LOGOFF: + break; + default: break; @@ -3779,47 +3947,6 @@ _PUBLIC_ void ndr_print_winbind_pam_chauthtok(struct ndr_print *ndr, const char ndr->depth--; } -static enum ndr_err_code ndr_push_winbind_pam_logoff(struct ndr_push *ndr, int flags, const struct winbind_pam_logoff *r) -{ - if (flags & NDR_IN) { - } - if (flags & NDR_OUT) { - NDR_CHECK(ndr_push_winbind_status(ndr, NDR_SCALARS, r->out.result)); - } - return NDR_ERR_SUCCESS; -} - -static enum ndr_err_code ndr_pull_winbind_pam_logoff(struct ndr_pull *ndr, int flags, struct winbind_pam_logoff *r) -{ - if (flags & NDR_IN) { - } - if (flags & NDR_OUT) { - NDR_CHECK(ndr_pull_winbind_status(ndr, NDR_SCALARS, &r->out.result)); - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_winbind_pam_logoff(struct ndr_print *ndr, const char *name, int flags, const struct winbind_pam_logoff *r) -{ - ndr_print_struct(ndr, name, "winbind_pam_logoff"); - ndr->depth++; - if (flags & NDR_SET_VALUES) { - ndr->flags |= LIBNDR_PRINT_SET_VALUES; - } - if (flags & NDR_IN) { - ndr_print_struct(ndr, "in", "winbind_pam_logoff"); - ndr->depth++; - ndr->depth--; - } - if (flags & NDR_OUT) { - ndr_print_struct(ndr, "out", "winbind_pam_logoff"); - ndr->depth++; - ndr_print_winbind_status(ndr, "result", r->out.result); - ndr->depth--; - } - ndr->depth--; -} - static enum ndr_err_code ndr_push_winbind_pam_chng_paswd_auth_crap(struct ndr_push *ndr, int flags, const struct winbind_pam_chng_paswd_auth_crap *r) { if (flags & NDR_IN) { @@ -5150,14 +5277,6 @@ static const struct ndr_interface_call winbind_protocol_calls[] = { (ndr_print_function_t) ndr_print_winbind_pam_chauthtok, false, }, - { - "winbind_pam_logoff", - sizeof(struct winbind_pam_logoff), - (ndr_push_flags_fn_t) ndr_push_winbind_pam_logoff, - (ndr_pull_flags_fn_t) ndr_pull_winbind_pam_logoff, - (ndr_print_function_t) ndr_print_winbind_pam_logoff, - false, - }, { "winbind_pam_chng_paswd_auth_crap", sizeof(struct winbind_pam_chng_paswd_auth_crap), @@ -5347,7 +5466,7 @@ const struct ndr_interface_table ndr_table_winbind_protocol = { NDR_WINBIND_PROTOCOL_VERSION }, .helpstring = NDR_WINBIND_PROTOCOL_HELPSTRING, - .num_calls = 36, + .num_calls = 35, .calls = winbind_protocol_calls, .endpoints = &winbind_protocol_endpoints, .authservices = &winbind_protocol_authservices diff --git a/source/librpc/gen_ndr/ndr_winbind_protocol.h b/source/librpc/gen_ndr/ndr_winbind_protocol.h index d10ee54b9e6..5f4b71868a3 100644 --- a/source/librpc/gen_ndr/ndr_winbind_protocol.h +++ b/source/librpc/gen_ndr/ndr_winbind_protocol.h @@ -41,49 +41,47 @@ extern const struct ndr_interface_table ndr_table_winbind_protocol; #define NDR_WINBIND_PAM_CHAUTHTOK (0x0e) -#define NDR_WINBIND_PAM_LOGOFF (0x0f) +#define NDR_WINBIND_PAM_CHNG_PASWD_AUTH_CRAP (0x0f) -#define NDR_WINBIND_PAM_CHNG_PASWD_AUTH_CRAP (0x10) +#define NDR_WINBIND_LIST_USERS (0x10) -#define NDR_WINBIND_LIST_USERS (0x11) +#define NDR_WINBIND_LIST_GROUPS (0x11) -#define NDR_WINBIND_LIST_GROUPS (0x12) +#define NDR_WINBIND_TRUST (0x12) -#define NDR_WINBIND_TRUST (0x13) +#define NDR_WINBIND_LOOKUP (0x13) -#define NDR_WINBIND_LOOKUP (0x14) +#define NDR_WINBIND_GET_IDMAP (0x14) -#define NDR_WINBIND_GET_IDMAP (0x15) +#define NDR_WINBIND_SET_IDMAP (0x15) -#define NDR_WINBIND_SET_IDMAP (0x16) +#define NDR_WINBIND_INFO_FIXNAME (0x16) -#define NDR_WINBIND_INFO_FIXNAME (0x17) +#define NDR_WINBIND_DOMAIN_NAME (0x17) -#define NDR_WINBIND_DOMAIN_NAME (0x18) +#define NDR_WINBIND_GET_DOMAIN_INFO (0x18) -#define NDR_WINBIND_GET_DOMAIN_INFO (0x19) +#define NDR_WINBIND_GET_DC_INFO (0x19) -#define NDR_WINBIND_GET_DC_INFO (0x1a) +#define NDR_WINBIND_WINS_BYIP (0x1a) -#define NDR_WINBIND_WINS_BYIP (0x1b) +#define NDR_WINBIND_WINS_BYNAME (0x1b) -#define NDR_WINBIND_WINS_BYNAME (0x1c) +#define NDR_WINBIND_GETGRLIST (0x1c) -#define NDR_WINBIND_GETGRLIST (0x1d) +#define NDR_WINBIND_NETBIOS_NAME (0x1d) -#define NDR_WINBIND_NETBIOS_NAME (0x1e) +#define NDR_WINBIND_GETUSERSIDS (0x1e) -#define NDR_WINBIND_GETUSERSIDS (0x1f) +#define NDR_WINBIND_GETUSERDOMGROUPS (0x1f) -#define NDR_WINBIND_GETUSERDOMGROUPS (0x20) +#define NDR_WINBIND_DUAL_USERINFO (0x20) -#define NDR_WINBIND_DUAL_USERINFO (0x21) +#define NDR_WINBIND_DUAL_GETSIDALIASES (0x21) -#define NDR_WINBIND_DUAL_GETSIDALIASES (0x22) +#define NDR_WINBIND_CCACHE_NTLMAUTH (0x22) -#define NDR_WINBIND_CCACHE_NTLMAUTH (0x23) - -#define NDR_WINBIND_PROTOCOL_CALL_COUNT (36) +#define NDR_WINBIND_PROTOCOL_CALL_COUNT (35) enum ndr_err_code ndr_push_winbind_status(struct ndr_push *ndr, int ndr_flags, enum winbind_status r); enum ndr_err_code ndr_pull_winbind_status(struct ndr_pull *ndr, int ndr_flags, enum winbind_status *r); void ndr_print_winbind_status(struct ndr_print *ndr, const char *name, enum winbind_status r); @@ -96,6 +94,7 @@ void ndr_print_winbind_auth_level(struct ndr_print *ndr, const char *name, enum void ndr_print_STRUCT_winbind_auth_compat_auth_plain_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_compat_auth_plain_req *r); void ndr_print_STRUCT_winbind_auth_compat_auth_rep(struct ndr_print *ndr, const char *name, const struct winbind_auth_compat_auth_rep *r); void ndr_print_STRUCT_winbind_auth_compat_auth_response_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_compat_auth_response_req *r); +void ndr_print_STRUCT_winbind_auth_compat_logoff_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_compat_logoff_req *r); void ndr_print_winbind_auth_req(struct ndr_print *ndr, const char *name, const union winbind_auth_req *r); void ndr_print_winbind_auth_rep(struct ndr_print *ndr, const char *name, const union winbind_auth_rep *r); void ndr_print_winbind_trust_level(struct ndr_print *ndr, const char *name, enum winbind_trust_level r); @@ -138,7 +137,6 @@ void ndr_print_winbind_endgrent(struct ndr_print *ndr, const char *name, int fla void ndr_print_winbind_getgrent(struct ndr_print *ndr, const char *name, int flags, const struct winbind_getgrent *r); void ndr_print_winbind_auth(struct ndr_print *ndr, const char *name, int flags, const struct winbind_auth *r); void ndr_print_winbind_pam_chauthtok(struct ndr_print *ndr, const char *name, int flags, const struct winbind_pam_chauthtok *r); -void ndr_print_winbind_pam_logoff(struct ndr_print *ndr, const char *name, int flags, const struct winbind_pam_logoff *r); void ndr_print_winbind_pam_chng_paswd_auth_crap(struct ndr_print *ndr, const char *name, int flags, const struct winbind_pam_chng_paswd_auth_crap *r); void ndr_print_winbind_list_users(struct ndr_print *ndr, const char *name, int flags, const struct winbind_list_users *r); void ndr_print_winbind_list_groups(struct ndr_print *ndr, const char *name, int flags, const struct winbind_list_groups *r); diff --git a/source/librpc/gen_ndr/winbind_protocol.h b/source/librpc/gen_ndr/winbind_protocol.h index 4e155f4b39b..05f7137bd61 100644 --- a/source/librpc/gen_ndr/winbind_protocol.h +++ b/source/librpc/gen_ndr/winbind_protocol.h @@ -65,12 +65,14 @@ enum winbind_auth_level #ifndef USE_UINT_ENUMS { WINBIND_AUTH_LEVEL_COMPAT_AUTH_PLAIN=1, - WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE=2 + WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE=2, + WINBIND_AUTH_LEVEL_COMPAT_LOGOFF=3 } #else { __donnot_use_enum_winbind_auth_level=0x7FFFFFFF} #define WINBIND_AUTH_LEVEL_COMPAT_AUTH_PLAIN ( 1 ) #define WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE ( 2 ) +#define WINBIND_AUTH_LEVEL_COMPAT_LOGOFF ( 3 ) #endif ; @@ -106,9 +108,18 @@ struct winbind_auth_compat_auth_response_req { DATA_BLOB nt_response; }; +struct winbind_auth_compat_logoff_req { + uint32_t flags; + const char *account_name;/* [charset(UTF8)] */ + const char *domain_name;/* [unique,charset(UTF8)] */ + const char *krb5_cc_name;/* [unique,charset(UTF8)] */ + uint64_t *uid;/* [unique] */ +}; + union winbind_auth_req { struct winbind_auth_compat_auth_plain_req compat_auth_plain;/* [case(WINBIND_AUTH_LEVEL_COMPAT_AUTH_PLAIN)] */ struct winbind_auth_compat_auth_response_req compat_auth_response;/* [case(WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE)] */ + struct winbind_auth_compat_logoff_req compat_logoff;/* [case(WINBIND_AUTH_LEVEL_COMPAT_LOGOFF)] */ }/* [switch_type(winbind_auth_level)] */; union winbind_auth_rep { @@ -449,14 +460,6 @@ struct winbind_pam_chauthtok { }; -struct winbind_pam_logoff { - struct { - enum winbind_status result; - } out; - -}; - - struct winbind_pam_chng_paswd_auth_crap { struct { enum winbind_status result;