Revert "re-run make idl."
authorKarolin Seeger <kseeger@samba.org>
Wed, 27 Aug 2008 08:36:31 +0000 (10:36 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 27 Aug 2008 08:36:31 +0000 (10:36 +0200)
This reverts commit 94dd61a4e8e070e175339defce4da08eaf87429d.

source/librpc/gen_ndr/cli_netlogon.c
source/librpc/gen_ndr/cli_netlogon.h
source/librpc/gen_ndr/ndr_netlogon.c
source/librpc/gen_ndr/netlogon.h

index f5b47156090a837fe421e094f8b81bc02ff71316..61f4103d8022d8b0b0bed6a549ee58dbe64bc389 100644 (file)
@@ -1534,9 +1534,9 @@ NTSTATUS rpccli_netr_ServerPasswordSet2(struct rpc_pipe_client *cli,
                                        const char *account_name /* [in] [charset(UTF16)] */,
                                        enum netr_SchannelType secure_channel_type /* [in]  */,
                                        const char *computer_name /* [in] [charset(UTF16)] */,
-                                       struct netr_Authenticator *credential /* [in] [ref] */,
-                                       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
-                                       struct netr_CryptPassword *new_password /* [in] [ref] */)
+                                       struct netr_Authenticator credential /* [in]  */,
+                                       struct netr_CryptPassword new_password /* [in]  */,
+                                       struct netr_Authenticator *return_authenticator /* [out] [ref] */)
 {
        struct netr_ServerPasswordSet2 r;
        NTSTATUS status;
index 2033315a5d5fb9b824222fb6c71f1b92f0650f15..296873274e034f94f3bed74ef2ad02694b7f4630 100644 (file)
@@ -239,9 +239,9 @@ NTSTATUS rpccli_netr_ServerPasswordSet2(struct rpc_pipe_client *cli,
                                        const char *account_name /* [in] [charset(UTF16)] */,
                                        enum netr_SchannelType secure_channel_type /* [in]  */,
                                        const char *computer_name /* [in] [charset(UTF16)] */,
-                                       struct netr_Authenticator *credential /* [in] [ref] */,
-                                       struct netr_Authenticator *return_authenticator /* [out] [ref] */,
-                                       struct netr_CryptPassword *new_password /* [in] [ref] */);
+                                       struct netr_Authenticator credential /* [in]  */,
+                                       struct netr_CryptPassword new_password /* [in]  */,
+                                       struct netr_Authenticator *return_authenticator /* [out] [ref] */);
 NTSTATUS rpccli_netr_ServerPasswordGet(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx,
                                       const char *server_name /* [in] [unique,charset(UTF16)] */,
index eff816cead86cb2551d74a2982a4c05764ab00c4..ce61f8d0aac7b2d299fa1b4084bb03dac813f7e8 100644 (file)
@@ -12310,14 +12310,8 @@ static enum ndr_err_code ndr_push_netr_ServerPasswordSet2(struct ndr_push *ndr,
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.computer_name, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.computer_name, ndr_charset_length(r->in.computer_name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               if (r->in.credential == NULL) {
-                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-               }
-               NDR_CHECK(ndr_push_netr_Authenticator(ndr, NDR_SCALARS, r->in.credential));
-               if (r->in.new_password == NULL) {
-                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-               }
-               NDR_CHECK(ndr_push_netr_CryptPassword(ndr, NDR_SCALARS, r->in.new_password));
+               NDR_CHECK(ndr_push_netr_Authenticator(ndr, NDR_SCALARS, &r->in.credential));
+               NDR_CHECK(ndr_push_netr_CryptPassword(ndr, NDR_SCALARS, &r->in.new_password));
        }
        if (flags & NDR_OUT) {
                if (r->out.return_authenticator == NULL) {
@@ -12333,9 +12327,7 @@ static enum ndr_err_code ndr_pull_netr_ServerPasswordSet2(struct ndr_pull *ndr,
 {
        uint32_t _ptr_server_name;
        TALLOC_CTX *_mem_save_server_name_0;
-       TALLOC_CTX *_mem_save_credential_0;
        TALLOC_CTX *_mem_save_return_authenticator_0;
-       TALLOC_CTX *_mem_save_new_password_0;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -12372,20 +12364,8 @@ static enum ndr_err_code ndr_pull_netr_ServerPasswordSet2(struct ndr_pull *ndr,
                }
                NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.computer_name), sizeof(uint16_t)));
                NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.computer_name, ndr_get_array_length(ndr, &r->in.computer_name), sizeof(uint16_t), CH_UTF16));
-               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                       NDR_PULL_ALLOC(ndr, r->in.credential);
-               }
-               _mem_save_credential_0 = NDR_PULL_GET_MEM_CTX(ndr);
-               NDR_PULL_SET_MEM_CTX(ndr, r->in.credential, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_netr_Authenticator(ndr, NDR_SCALARS, r->in.credential));
-               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_credential_0, LIBNDR_FLAG_REF_ALLOC);
-               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                       NDR_PULL_ALLOC(ndr, r->in.new_password);
-               }
-               _mem_save_new_password_0 = NDR_PULL_GET_MEM_CTX(ndr);
-               NDR_PULL_SET_MEM_CTX(ndr, r->in.new_password, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_netr_CryptPassword(ndr, NDR_SCALARS, r->in.new_password));
-               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_new_password_0, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_netr_Authenticator(ndr, NDR_SCALARS, &r->in.credential));
+               NDR_CHECK(ndr_pull_netr_CryptPassword(ndr, NDR_SCALARS, &r->in.new_password));
                NDR_PULL_ALLOC(ndr, r->out.return_authenticator);
                ZERO_STRUCTP(r->out.return_authenticator);
        }
@@ -12421,14 +12401,8 @@ _PUBLIC_ void ndr_print_netr_ServerPasswordSet2(struct ndr_print *ndr, const cha
                ndr_print_string(ndr, "account_name", r->in.account_name);
                ndr_print_netr_SchannelType(ndr, "secure_channel_type", r->in.secure_channel_type);
                ndr_print_string(ndr, "computer_name", r->in.computer_name);
-               ndr_print_ptr(ndr, "credential", r->in.credential);
-               ndr->depth++;
-               ndr_print_netr_Authenticator(ndr, "credential", r->in.credential);
-               ndr->depth--;
-               ndr_print_ptr(ndr, "new_password", r->in.new_password);
-               ndr->depth++;
-               ndr_print_netr_CryptPassword(ndr, "new_password", r->in.new_password);
-               ndr->depth--;
+               ndr_print_netr_Authenticator(ndr, "credential", &r->in.credential);
+               ndr_print_netr_CryptPassword(ndr, "new_password", &r->in.new_password);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
index 1cea1f0f42f490525c4946be8505f3f12c4e552f..9e8605110f3effa60d22110468365f3cc453459f 100644 (file)
@@ -1355,8 +1355,8 @@ struct netr_ServerPasswordSet2 {
                const char *account_name;/* [charset(UTF16)] */
                enum netr_SchannelType secure_channel_type;
                const char *computer_name;/* [charset(UTF16)] */
-               struct netr_Authenticator *credential;/* [ref] */
-               struct netr_CryptPassword *new_password;/* [ref] */
+               struct netr_Authenticator credential;
+               struct netr_CryptPassword new_password;
        } in;
 
        struct {