rerun

diff --git a/source/librpc/gen_ndr/ndr_winbind_protocol.c b/source/librpc/gen_ndr/ndr_winbind_protocol.c
index 733451f1482e028d84a3ed4a79d9dd3a6372b724..11c8b90e43037791b2bdcc3561756d7a738d9f00 100644 (file)
--- a/source/librpc/gen_ndr/ndr_winbind_protocol.c
+++ b/source/librpc/gen_ndr/ndr_winbind_protocol.c
@@ -150,6 +150,7 @@ _PUBLIC_ void ndr_print_winbind_auth_level(struct ndr_print *ndr, const char *na
                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;
+               case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH: val = "WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH"; break;
        }
        ndr_print_enum(ndr, name, "ENUM", val, r);
 }
@@ -1055,6 +1056,87 @@ _PUBLIC_ void ndr_print_STRUCT_winbind_auth_change_password_crypt_req(struct ndr
        ndr->depth--;
 }
 
+static enum ndr_err_code ndr_push_STRUCT_winbind_auth_ccache_ntlm_auth_req(struct ndr_push *ndr, int ndr_flags, const struct winbind_auth_ccache_ntlm_auth_req *r)
+{
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_push_align(ndr, 8));
+               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_hyper(ndr, NDR_SCALARS, r->uid));
+               NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->initial_blob));
+               NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->challenge_blob));
+       }
+       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));
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_STRUCT_winbind_auth_ccache_ntlm_auth_req(struct ndr_pull *ndr, int ndr_flags, struct winbind_auth_ccache_ntlm_auth_req *r)
+{
+       uint32_t _ptr_domain_name;
+       TALLOC_CTX *_mem_save_domain_name_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_pull_align(ndr, 8));
+               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_hyper(ndr, NDR_SCALARS, &r->uid));
+               NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->initial_blob));
+               NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->challenge_blob));
+       }
+       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);
+               }
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_STRUCT_winbind_auth_ccache_ntlm_auth_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_ccache_ntlm_auth_req *r)
+{
+       ndr_print_struct(ndr, name, "winbind_auth_ccache_ntlm_auth_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_hyper(ndr, "uid", r->uid);
+       ndr_print_DATA_BLOB(ndr, "initial_blob", r->initial_blob);
+       ndr_print_DATA_BLOB(ndr, "challenge_blob", r->challenge_blob);
+       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) {
@@ -1081,6 +1163,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_crypt_req(ndr, NDR_SCALARS, &r->change_password_crypt));
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH: {
+                               NDR_CHECK(ndr_push_STRUCT_winbind_auth_ccache_ntlm_auth_req(ndr, NDR_SCALARS, &r->ccache_ntlm_auth));
+                       break; }
+
                        default: {
                        break; }
 
@@ -1109,6 +1195,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_crypt_req(ndr, NDR_BUFFERS, &r->change_password_crypt));
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH:
+                               NDR_CHECK(ndr_push_STRUCT_winbind_auth_ccache_ntlm_auth_req(ndr, NDR_BUFFERS, &r->ccache_ntlm_auth));
+                       break;
+
                        default:
                        break;
 
@@ -1148,6 +1238,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_crypt_req(ndr, NDR_SCALARS, &r->change_password_crypt));
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH: {
+                               NDR_CHECK(ndr_pull_STRUCT_winbind_auth_ccache_ntlm_auth_req(ndr, NDR_SCALARS, &r->ccache_ntlm_auth));
+                       break; }
+
                        default: {
                        break; }
 
@@ -1175,6 +1269,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_crypt_req(ndr, NDR_BUFFERS, &r->change_password_crypt));
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH:
+                               NDR_CHECK(ndr_pull_STRUCT_winbind_auth_ccache_ntlm_auth_req(ndr, NDR_BUFFERS, &r->ccache_ntlm_auth));
+                       break;
+
                        default:
                        break;
 
@@ -1209,6 +1307,10 @@ _PUBLIC_ void ndr_print_winbind_auth_req(struct ndr_print *ndr, const char *name
                        ndr_print_STRUCT_winbind_auth_change_password_crypt_req(ndr, "change_password_crypt", &r->change_password_crypt);
                break;
 
+               case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH:
+                       ndr_print_STRUCT_winbind_auth_ccache_ntlm_auth_req(ndr, "ccache_ntlm_auth", &r->ccache_ntlm_auth);
+               break;
+
                default:
                break;
 
@@ -1238,6 +1340,10 @@ static enum ndr_err_code ndr_push_winbind_auth_rep(struct ndr_push *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT: {
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH: {
+                               NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->ccache_ntlm_auth));
+                       break; }
+
                        default: {
                        break; }
 
@@ -1263,6 +1369,9 @@ static enum ndr_err_code ndr_push_winbind_auth_rep(struct ndr_push *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH:
+                       break;
+
                        default:
                        break;
 
@@ -1299,6 +1408,10 @@ static enum ndr_err_code ndr_pull_winbind_auth_rep(struct ndr_pull *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT: {
                        break; }
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH: {
+                               NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->ccache_ntlm_auth));
+                       break; }
+
                        default: {
                        break; }
 
@@ -1323,6 +1436,9 @@ static enum ndr_err_code ndr_pull_winbind_auth_rep(struct ndr_pull *ndr, int ndr
                        case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
                        break;
 
+                       case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH:
+                       break;
+
                        default:
                        break;
 
@@ -1354,6 +1470,10 @@ _PUBLIC_ void ndr_print_winbind_auth_rep(struct ndr_print *ndr, const char *name
                case WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT:
                break;
 
+               case WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH:
+                       ndr_print_DATA_BLOB(ndr, "ccache_ntlm_auth", r->ccache_ntlm_auth);
+               break;
+
                default:
                break;
 
@@ -5245,129 +5365,6 @@ _PUBLIC_ void ndr_print_winbind_getuserdomgroups(struct ndr_print *ndr, const ch
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winbind_dual_userinfo(struct ndr_push *ndr, int flags, const struct winbind_dual_userinfo *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_dual_userinfo(struct ndr_pull *ndr, int flags, struct winbind_dual_userinfo *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_dual_userinfo(struct ndr_print *ndr, const char *name, int flags, const struct winbind_dual_userinfo *r)
-{
-       ndr_print_struct(ndr, name, "winbind_dual_userinfo");
-       ndr->depth++;
-       if (flags & NDR_SET_VALUES) {
-               ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-       }
-       if (flags & NDR_IN) {
-               ndr_print_struct(ndr, "in", "winbind_dual_userinfo");
-               ndr->depth++;
-               ndr->depth--;
-       }
-       if (flags & NDR_OUT) {
-               ndr_print_struct(ndr, "out", "winbind_dual_userinfo");
-               ndr->depth++;
-               ndr_print_winbind_status(ndr, "result", r->out.result);
-               ndr->depth--;
-       }
-       ndr->depth--;
-}
-
-static enum ndr_err_code ndr_push_winbind_dual_getsidaliases(struct ndr_push *ndr, int flags, const struct winbind_dual_getsidaliases *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_dual_getsidaliases(struct ndr_pull *ndr, int flags, struct winbind_dual_getsidaliases *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_dual_getsidaliases(struct ndr_print *ndr, const char *name, int flags, const struct winbind_dual_getsidaliases *r)
-{
-       ndr_print_struct(ndr, name, "winbind_dual_getsidaliases");
-       ndr->depth++;
-       if (flags & NDR_SET_VALUES) {
-               ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-       }
-       if (flags & NDR_IN) {
-               ndr_print_struct(ndr, "in", "winbind_dual_getsidaliases");
-               ndr->depth++;
-               ndr->depth--;
-       }
-       if (flags & NDR_OUT) {
-               ndr_print_struct(ndr, "out", "winbind_dual_getsidaliases");
-               ndr->depth++;
-               ndr_print_winbind_status(ndr, "result", r->out.result);
-               ndr->depth--;
-       }
-       ndr->depth--;
-}
-
-static enum ndr_err_code ndr_push_winbind_ccache_ntlmauth(struct ndr_push *ndr, int flags, const struct winbind_ccache_ntlmauth *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_ccache_ntlmauth(struct ndr_pull *ndr, int flags, struct winbind_ccache_ntlmauth *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_ccache_ntlmauth(struct ndr_print *ndr, const char *name, int flags, const struct winbind_ccache_ntlmauth *r)
-{
-       ndr_print_struct(ndr, name, "winbind_ccache_ntlmauth");
-       ndr->depth++;
-       if (flags & NDR_SET_VALUES) {
-               ndr->flags |= LIBNDR_PRINT_SET_VALUES;
-       }
-       if (flags & NDR_IN) {
-               ndr_print_struct(ndr, "in", "winbind_ccache_ntlmauth");
-               ndr->depth++;
-               ndr->depth--;
-       }
-       if (flags & NDR_OUT) {
-               ndr_print_struct(ndr, "out", "winbind_ccache_ntlmauth");
-               ndr->depth++;
-               ndr_print_winbind_status(ndr, "result", r->out.result);
-               ndr->depth--;
-       }
-       ndr->depth--;
-}
-
 static const struct ndr_interface_call winbind_protocol_calls[] = {
        {
                "winbind_ping",
@@ -5609,30 +5606,6 @@ static const struct ndr_interface_call winbind_protocol_calls[] = {
                (ndr_print_function_t) ndr_print_winbind_getuserdomgroups,
                false,
        },
-       {
-               "winbind_dual_userinfo",
-               sizeof(struct winbind_dual_userinfo),
-               (ndr_push_flags_fn_t) ndr_push_winbind_dual_userinfo,
-               (ndr_pull_flags_fn_t) ndr_pull_winbind_dual_userinfo,
-               (ndr_print_function_t) ndr_print_winbind_dual_userinfo,
-               false,
-       },
-       {
-               "winbind_dual_getsidaliases",
-               sizeof(struct winbind_dual_getsidaliases),
-               (ndr_push_flags_fn_t) ndr_push_winbind_dual_getsidaliases,
-               (ndr_pull_flags_fn_t) ndr_pull_winbind_dual_getsidaliases,
-               (ndr_print_function_t) ndr_print_winbind_dual_getsidaliases,
-               false,
-       },
-       {
-               "winbind_ccache_ntlmauth",
-               sizeof(struct winbind_ccache_ntlmauth),
-               (ndr_push_flags_fn_t) ndr_push_winbind_ccache_ntlmauth,
-               (ndr_pull_flags_fn_t) ndr_pull_winbind_ccache_ntlmauth,
-               (ndr_print_function_t) ndr_print_winbind_ccache_ntlmauth,
-               false,
-       },
        { NULL, 0, NULL, NULL, NULL, false }
 };
 
@@ -5662,7 +5635,7 @@ const struct ndr_interface_table ndr_table_winbind_protocol = {
                NDR_WINBIND_PROTOCOL_VERSION
        },
        .helpstring     = NDR_WINBIND_PROTOCOL_HELPSTRING,
-       .num_calls      = 33,
+       .num_calls      = 30,
        .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 6ae2f5563fccd596f11473dafa954db81fe92a7e..bd7db8cc849b3d768dc94ee1d927ca2925fa6162 100644 (file)
--- a/source/librpc/gen_ndr/ndr_winbind_protocol.h
+++ b/source/librpc/gen_ndr/ndr_winbind_protocol.h
@@ -71,13 +71,7 @@ extern const struct ndr_interface_table ndr_table_winbind_protocol;
 
 #define NDR_WINBIND_GETUSERDOMGROUPS (0x1d)
 
-#define NDR_WINBIND_DUAL_USERINFO (0x1e)
-
-#define NDR_WINBIND_DUAL_GETSIDALIASES (0x1f)
-
-#define NDR_WINBIND_CCACHE_NTLMAUTH (0x20)
-
-#define NDR_WINBIND_PROTOCOL_CALL_COUNT (33)
+#define NDR_WINBIND_PROTOCOL_CALL_COUNT (30)
 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);
@@ -93,6 +87,7 @@ void ndr_print_STRUCT_winbind_auth_compat_auth_response_req(struct ndr_print *nd
 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_STRUCT_winbind_auth_ccache_ntlm_auth_req(struct ndr_print *ndr, const char *name, const struct winbind_auth_ccache_ntlm_auth_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);
@@ -150,7 +145,4 @@ void ndr_print_winbind_getgrlist(struct ndr_print *ndr, const char *name, int fl
 void ndr_print_winbind_netbios_name(struct ndr_print *ndr, const char *name, int flags, const struct winbind_netbios_name *r);
 void ndr_print_winbind_getusersids(struct ndr_print *ndr, const char *name, int flags, const struct winbind_getusersids *r);
 void ndr_print_winbind_getuserdomgroups(struct ndr_print *ndr, const char *name, int flags, const struct winbind_getuserdomgroups *r);
-void ndr_print_winbind_dual_userinfo(struct ndr_print *ndr, const char *name, int flags, const struct winbind_dual_userinfo *r);
-void ndr_print_winbind_dual_getsidaliases(struct ndr_print *ndr, const char *name, int flags, const struct winbind_dual_getsidaliases *r);
-void ndr_print_winbind_ccache_ntlmauth(struct ndr_print *ndr, const char *name, int flags, const struct winbind_ccache_ntlmauth *r);
 #endif /* _HEADER_NDR_winbind_protocol */

diff --git a/source/librpc/gen_ndr/winbind_protocol.h b/source/librpc/gen_ndr/winbind_protocol.h
index aa348f1d240a6d5620e55958bc5a112b0f03356b..613f6967bf296300cf32692217c7d97fe12f68e5 100644 (file)
--- a/source/librpc/gen_ndr/winbind_protocol.h
+++ b/source/librpc/gen_ndr/winbind_protocol.h
@@ -68,7 +68,8 @@ enum winbind_auth_level
        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_CRYPT=5
+       WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT=5,
+       WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH=6
 }
 #else
  { __donnot_use_enum_winbind_auth_level=0x7FFFFFFF}
@@ -77,6 +78,7 @@ enum winbind_auth_level
 #define WINBIND_AUTH_LEVEL_COMPAT_LOGOFF ( 3 )
 #define WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_PLAIN ( 4 )
 #define WINBIND_AUTH_LEVEL_CHANGE_PASSWORD_CRYPT ( 5 )
+#define WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH ( 6 )
 #endif
 ;
 
@@ -136,16 +138,26 @@ struct winbind_auth_change_password_crypt_req {
        struct samr_Password *lm_verifier;/* [unique] */
 };
 
+struct winbind_auth_ccache_ntlm_auth_req {
+       const char *account_name;/* [charset(UTF8)] */
+       const char *domain_name;/* [unique,charset(UTF8)] */
+       uint64_t uid;
+       DATA_BLOB initial_blob;
+       DATA_BLOB challenge_blob;
+};
+
 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)] */
+       struct winbind_auth_ccache_ntlm_auth_req ccache_ntlm_auth;/* [case(WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH)] */
 }/* [switch_type(winbind_auth_level)] */;
 
 union winbind_auth_rep {
        struct winbind_auth_compat_auth_rep compat_auth;/* [case(WINBIND_AUTH_LEVEL_COMPAT_AUTH_PLAIN)] */
+       DATA_BLOB ccache_ntlm_auth;/* [case(WINBIND_AUTH_LEVEL_CCACHE_NTLM_AUTH)] */
 }/* [switch_type(winbind_auth_level)] */;
 
 enum winbind_trust_level
@@ -643,28 +655,4 @@ struct winbind_getuserdomgroups {
 
 };
 
-
-struct winbind_dual_userinfo {
-       struct {
-               enum winbind_status result;
-       } out;
-
-};
-
-
-struct winbind_dual_getsidaliases {
-       struct {
-               enum winbind_status result;
-       } out;
-
-};
-
-
-struct winbind_ccache_ntlmauth {
-       struct {
-               enum winbind_status result;
-       } out;
-
-};
-
 #endif /* _HEADER_winbind_protocol */