rerun

diff --git a/source/librpc/gen_ndr/ndr_winbind_protocol.c b/source/librpc/gen_ndr/ndr_winbind_protocol.c
index d2b34476a6da1e49e50a9a2343eca9f028509a7e..733451f1482e028d84a3ed4a79d9dd3a6372b724 100644 (file)
--- a/source/librpc/gen_ndr/ndr_winbind_protocol.c
+++ b/source/librpc/gen_ndr/ndr_winbind_protocol.c
@@ -149,6 +149,7 @@ _PUBLIC_ void ndr_print_winbind_auth_level(struct ndr_print *ndr, const char *na
                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;
                case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN: val = "WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN"; break;
+               case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT: val = "WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT"; break;
        }
        ndr_print_enum(ndr, name, "ENUM", val, r);
 }
@@ -928,6 +929,132 @@ _PUBLIC_ void ndr_print_STRUCT_winbind_auth_change_password_plain_req(struct ndr
        ndr->depth--;
 }
 
+static enum ndr_err_code ndr_push_STRUCT_winbind_auth_change_password_crypt_req(struct ndr_push *ndr, int ndr_flags, const struct winbind_auth_change_password_crypt_req *r)
+{
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_push_align(ndr, 4));
+               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_samr_CryptPassword(ndr, NDR_SCALARS, &r->nt_password));
+               NDR_CHECK(ndr_push_samr_Password(ndr, NDR_SCALARS, &r->nt_verifier));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->lm_password));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->lm_verifier));
+       }
+       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->lm_password) {
+                       NDR_CHECK(ndr_push_samr_CryptPassword(ndr, NDR_SCALARS, r->lm_password));
+               }
+               if (r->lm_verifier) {
+                       NDR_CHECK(ndr_push_samr_Password(ndr, NDR_SCALARS, r->lm_verifier));
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_STRUCT_winbind_auth_change_password_crypt_req(struct ndr_pull *ndr, int ndr_flags, struct winbind_auth_change_password_crypt_req *r)
+{
+       uint32_t _ptr_domain_name;
+       TALLOC_CTX *_mem_save_domain_name_0;
+       uint32_t _ptr_lm_password;
+       TALLOC_CTX *_mem_save_lm_password_0;
+       uint32_t _ptr_lm_verifier;
+       TALLOC_CTX *_mem_save_lm_verifier_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_pull_align(ndr, 4));
+               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_samr_CryptPassword(ndr, NDR_SCALARS, &r->nt_password));
+               NDR_CHECK(ndr_pull_samr_Password(ndr, NDR_SCALARS, &r->nt_verifier));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_lm_password));
+               if (_ptr_lm_password) {
+                       NDR_PULL_ALLOC(ndr, r->lm_password);
+               } else {
+                       r->lm_password = NULL;
+               }
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_lm_verifier));
+               if (_ptr_lm_verifier) {
+                       NDR_PULL_ALLOC(ndr, r->lm_verifier);
+               } else {
+                       r->lm_verifier = 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->lm_password) {
+                       _mem_save_lm_password_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->lm_password, 0);
+                       NDR_CHECK(ndr_pull_samr_CryptPassword(ndr, NDR_SCALARS, r->lm_password));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_lm_password_0, 0);
+               }
+               if (r->lm_verifier) {
+                       _mem_save_lm_verifier_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->lm_verifier, 0);
+                       NDR_CHECK(ndr_pull_samr_Password(ndr, NDR_SCALARS, r->lm_verifier));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_lm_verifier_0, 0);
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_STRUCT_winbind_auth_change_password_crypt_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_change_password_crypt_req *r)
+{
+       ndr_print_struct(ndr, name, "winbind_auth_change_password_crypt_req");
+       ndr->depth++;
+       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_samr_CryptPassword(ndr, "nt_password", &r->nt_password);
+       ndr_print_samr_Password(ndr, "nt_verifier", &r->nt_verifier);
+       ndr_print_ptr(ndr, "lm_password", r->lm_password);
+       ndr->depth++;
+       if (r->lm_password) {
+               ndr_print_samr_CryptPassword(ndr, "lm_password", r->lm_password);
+       }
+       ndr->depth--;
+       ndr_print_ptr(ndr, "lm_verifier", r->lm_verifier);
+       ndr->depth++;
+       if (r->lm_verifier) {
+               ndr_print_samr_Password(ndr, "lm_verifier", r->lm_verifier);
+       }
+       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) {
@@ -950,6 +1077,10 @@ static enum ndr_err_code ndr_push_winbind_auth_req(struct ndr_push *ndr, int ndr
                                NDR_CHECK(ndr_push_STRUCT_winbind_auth_change_password_plain_req(ndr, NDR_SCALARS, &r->change_password_plain));
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT: {
+                               NDR_CHECK(ndr_push_STRUCT_winbind_auth_change_password_crypt_req(ndr, NDR_SCALARS, &r->change_password_crypt));
+                       break; }
+
                        default: {
                        break; }
 
@@ -974,6 +1105,10 @@ static enum ndr_err_code ndr_push_winbind_auth_req(struct ndr_push *ndr, int ndr
                                NDR_CHECK(ndr_push_STRUCT_winbind_auth_change_password_plain_req(ndr, NDR_BUFFERS, &r->change_password_plain));
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
+                               NDR_CHECK(ndr_push_STRUCT_winbind_auth_change_password_crypt_req(ndr, NDR_BUFFERS, &r->change_password_crypt));
+                       break;
+
                        default:
                        break;
 
@@ -1009,6 +1144,10 @@ static enum ndr_err_code ndr_pull_winbind_auth_req(struct ndr_pull *ndr, int ndr
                                NDR_CHECK(ndr_pull_STRUCT_winbind_auth_change_password_plain_req(ndr, NDR_SCALARS, &r->change_password_plain));
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT: {
+                               NDR_CHECK(ndr_pull_STRUCT_winbind_auth_change_password_crypt_req(ndr, NDR_SCALARS, &r->change_password_crypt));
+                       break; }
+
                        default: {
                        break; }
 
@@ -1032,6 +1171,10 @@ static enum ndr_err_code ndr_pull_winbind_auth_req(struct ndr_pull *ndr, int ndr
                                NDR_CHECK(ndr_pull_STRUCT_winbind_auth_change_password_plain_req(ndr, NDR_BUFFERS, &r->change_password_plain));
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
+                               NDR_CHECK(ndr_pull_STRUCT_winbind_auth_change_password_crypt_req(ndr, NDR_BUFFERS, &r->change_password_crypt));
+                       break;
+
                        default:
                        break;
 
@@ -1062,6 +1205,10 @@ _PUBLIC_ void ndr_print_winbind_auth_req(struct ndr_print *ndr, const char *name
                        ndr_print_STRUCT_winbind_auth_change_password_plain_req(ndr, "change_password_plain", &r->change_password_plain);
                break;
 
+               case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
+                       ndr_print_STRUCT_winbind_auth_change_password_crypt_req(ndr, "change_password_crypt", &r->change_password_crypt);
+               break;
+
                default:
                break;
 
@@ -1088,6 +1235,9 @@ static enum ndr_err_code ndr_push_winbind_auth_rep(struct ndr_push *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN: {
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT: {
+                       break; }
+
                        default: {
                        break; }
 
@@ -1110,6 +1260,9 @@ static enum ndr_err_code ndr_push_winbind_auth_rep(struct ndr_push *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN:
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
+                       break;
+
                        default:
                        break;
 
@@ -1143,6 +1296,9 @@ static enum ndr_err_code ndr_pull_winbind_auth_rep(struct ndr_pull *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN: {
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT: {
+                       break; }
+
                        default: {
                        break; }
 
@@ -1164,6 +1320,9 @@ static enum ndr_err_code ndr_pull_winbind_auth_rep(struct ndr_pull *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN:
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
+                       break;
+
                        default:
                        break;
 
@@ -1192,6 +1351,9 @@ _PUBLIC_ void ndr_print_winbind_auth_rep(struct ndr_print *ndr, const char *name
                case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN:
                break;
 
+               case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
+               break;
+
                default:
                break;
 
@@ -4038,47 +4200,6 @@ _PUBLIC_ void ndr_print_winbind_auth(struct ndr_print *ndr, const char *name, in
        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) {
-       }
-       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_chng_paswd_auth_crap(struct ndr_pull *ndr, int flags, struct winbind_pam_chng_paswd_auth_crap *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_chng_paswd_auth_crap(struct ndr_print *ndr, const char *name, int flags, const struct winbind_pam_chng_paswd_auth_crap *r)
-{
-       ndr_print_struct(ndr, name, "winbind_pam_chng_paswd_auth_crap");
-       ndr->depth++;
-       if (flags & NDR_SET_VALUES) {
-               ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-       }
-       if (flags & NDR_IN) {
-               ndr_print_struct(ndr, "in", "winbind_pam_chng_paswd_auth_crap");
-               ndr->depth++;
-               ndr->depth--;
-       }
-       if (flags & NDR_OUT) {
-               ndr_print_struct(ndr, "out", "winbind_pam_chng_paswd_auth_crap");
-               ndr->depth++;
-               ndr_print_winbind_status(ndr, "result", r->out.result);
-               ndr->depth--;
-       }
-       ndr->depth--;
-}
-
 static enum ndr_err_code ndr_push_winbind_list_users(struct ndr_push *ndr, int flags, const struct winbind_list_users *r)
 {
        if (flags & NDR_IN) {
@@ -5360,14 +5481,6 @@ static const struct ndr_interface_call winbind_protocol_calls[] = {
                (ndr_print_function_t) ndr_print_winbind_auth,
                false,
        },
-       {
-               "winbind_pam_chng_paswd_auth_crap",
-               sizeof(struct winbind_pam_chng_paswd_auth_crap),
-               (ndr_push_flags_fn_t) ndr_push_winbind_pam_chng_paswd_auth_crap,
-               (ndr_pull_flags_fn_t) ndr_pull_winbind_pam_chng_paswd_auth_crap,
-               (ndr_print_function_t) ndr_print_winbind_pam_chng_paswd_auth_crap,
-               false,
-       },
        {
                "winbind_list_users",
                sizeof(struct winbind_list_users),
@@ -5549,7 +5662,7 @@ const struct ndr_interface_table ndr_table_winbind_protocol = {
                NDR_WINBIND_PROTOCOL_VERSION
        },
        .helpstring     = NDR_WINBIND_PROTOCOL_HELPSTRING,
-       .num_calls      = 34,
+       .num_calls      = 33,
        .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 1069acf91e32e15b74154c61c51f65abb0510fea..6ae2f5563fccd596f11473dafa954db81fe92a7e 100644 (file)
--- a/source/librpc/gen_ndr/ndr_winbind_protocol.h
+++ b/source/librpc/gen_ndr/ndr_winbind_protocol.h
@@ -39,47 +39,45 @@ extern const struct ndr_interface_table ndr_table_winbind_protocol;
 
 #define NDR_WINBIND_AUTH (0x0d)
 
-#define NDR_WINBIND_PAM_CHNG_PASWD_AUTH_CRAP (0x0e)
+#define NDR_WINBIND_LIST_USERS (0x0e)
 
-#define NDR_WINBIND_LIST_USERS (0x0f)
+#define NDR_WINBIND_LIST_GROUPS (0x0f)
 
-#define NDR_WINBIND_LIST_GROUPS (0x10)
+#define NDR_WINBIND_TRUST (0x10)
 
-#define NDR_WINBIND_TRUST (0x11)
+#define NDR_WINBIND_LOOKUP (0x11)
 
-#define NDR_WINBIND_LOOKUP (0x12)
+#define NDR_WINBIND_GET_IDMAP (0x12)
 
-#define NDR_WINBIND_GET_IDMAP (0x13)
+#define NDR_WINBIND_SET_IDMAP (0x13)
 
-#define NDR_WINBIND_SET_IDMAP (0x14)
+#define NDR_WINBIND_INFO_FIXNAME (0x14)
 
-#define NDR_WINBIND_INFO_FIXNAME (0x15)
+#define NDR_WINBIND_DOMAIN_NAME (0x15)
 
-#define NDR_WINBIND_DOMAIN_NAME (0x16)
+#define NDR_WINBIND_GET_DOMAIN_INFO (0x16)
 
-#define NDR_WINBIND_GET_DOMAIN_INFO (0x17)
+#define NDR_WINBIND_GET_DC_INFO (0x17)
 
-#define NDR_WINBIND_GET_DC_INFO (0x18)
+#define NDR_WINBIND_WINS_BYIP (0x18)
 
-#define NDR_WINBIND_WINS_BYIP (0x19)
+#define NDR_WINBIND_WINS_BYNAME (0x19)
 
-#define NDR_WINBIND_WINS_BYNAME (0x1a)
+#define NDR_WINBIND_GETGRLIST (0x1a)
 
-#define NDR_WINBIND_GETGRLIST (0x1b)
+#define NDR_WINBIND_NETBIOS_NAME (0x1b)
 
-#define NDR_WINBIND_NETBIOS_NAME (0x1c)
+#define NDR_WINBIND_GETUSERSIDS (0x1c)
 
-#define NDR_WINBIND_GETUSERSIDS (0x1d)
+#define NDR_WINBIND_GETUSERDOMGROUPS (0x1d)
 
-#define NDR_WINBIND_GETUSERDOMGROUPS (0x1e)
+#define NDR_WINBIND_DUAL_USERINFO (0x1e)
 
-#define NDR_WINBIND_DUAL_USERINFO (0x1f)
+#define NDR_WINBIND_DUAL_GETSIDALIASES (0x1f)
 
-#define NDR_WINBIND_DUAL_GETSIDALIASES (0x20)
+#define NDR_WINBIND_CCACHE_NTLMAUTH (0x20)
 
-#define NDR_WINBIND_CCACHE_NTLMAUTH (0x21)
-
-#define NDR_WINBIND_PROTOCOL_CALL_COUNT (34)
+#define NDR_WINBIND_PROTOCOL_CALL_COUNT (33)
 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);
@@ -94,6 +92,7 @@ void ndr_print_STRUCT_winbind_auth_compat_auth_rep(struct ndr_print *ndr, const
 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_STRUCT_winbind_auth_change_password_plain_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_change_password_plain_req *r);
+void ndr_print_STRUCT_winbind_auth_change_password_crypt_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_change_password_crypt_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);
@@ -135,7 +134,6 @@ void ndr_print_winbind_setgrent(struct ndr_print *ndr, const char *name, int fla
 void ndr_print_winbind_endgrent(struct ndr_print *ndr, const char *name, int flags, const struct winbind_endgrent *r);
 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_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);
 void ndr_print_winbind_trust(struct ndr_print *ndr, const char *name, int flags, const struct winbind_trust *r);

diff --git a/source/librpc/gen_ndr/winbind_protocol.h b/source/librpc/gen_ndr/winbind_protocol.h
index 721e03a556874c3a19672526643452b729118078..aa348f1d240a6d5620e55958bc5a112b0f03356b 100644 (file)
--- a/source/librpc/gen_ndr/winbind_protocol.h
+++ b/source/librpc/gen_ndr/winbind_protocol.h
@@ -67,7 +67,8 @@ enum winbind_auth_level
        WINBIND_AUTH_LEVEL_COMPAT_AUTH_PLAIN=1,
        WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE=2,
        WINBIND_AUTH_LEVEL_COMPAT_LOGOFF=3,
-       WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN=4
+       WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN=4,
+       WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT=5
 }
 #else
  { __donnot_use_enum_winbind_auth_level=0x7FFFFFFF}
@@ -75,6 +76,7 @@ enum winbind_auth_level
 #define WINBIND_AUTH_LEVEL_COMPAT_AUTH_RESPONSE ( 2 )
 #define WINBIND_AUTH_LEVEL_COMPAT_LOGOFF ( 3 )
 #define WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN ( 4 )
+#define WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT ( 5 )
 #endif
 ;
 
@@ -125,11 +127,21 @@ struct winbind_auth_change_password_plain_req {
        const char *new_password;/* [charset(UTF8)] */
 };
 
+struct winbind_auth_change_password_crypt_req {
+       const char *account_name;/* [charset(UTF8)] */
+       const char *domain_name;/* [unique,charset(UTF8)] */
+       struct samr_CryptPassword nt_password;
+       struct samr_Password nt_verifier;
+       struct samr_CryptPassword *lm_password;/* [unique] */
+       struct samr_Password *lm_verifier;/* [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)] */
        struct winbind_auth_change_password_plain_req change_password_plain;/* [case(WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN)] */
+       struct winbind_auth_change_password_crypt_req change_password_crypt;/* [case(WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT)] */
 }/* [switch_type(winbind_auth_level)] */;
 
 union winbind_auth_rep {
@@ -462,14 +474,6 @@ struct winbind_auth {
 };
 
 
-struct winbind_pam_chng_paswd_auth_crap {
-       struct {
-               enum winbind_status result;
-       } out;
-
-};
-
-
 struct winbind_list_users {
        struct {
                enum winbind_status result;