s3-build: re-run make samba3-idl.

Guenther

diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.c b/source3/librpc/gen_ndr/cli_ntsvcs.c
index f8ef7a99ad18240ba1f871db4cb9bea3a33d6c44..ada700f6fae62946835a69a5a6d56f0ad736d851 100644 (file)
--- a/source3/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.c
@@ -564,7 +564,7 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx,
                                     const char *devicepath /* [in] [ref,charset(UTF16)] */,
                                     uint32_t property /* [in]  */,
-                                    uint32_t *reg_data_type /* [in,out] [ref] */,
+                                    enum winreg_Type *reg_data_type /* [in,out] [ref] */,
                                     uint8_t *buffer /* [out] [ref,length_is(*buffer_size),size_is(*buffer_size)] */,
                                     uint32_t *buffer_size /* [in,out] [ref] */,
                                     uint32_t *needed /* [in,out] [ref] */,

diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.h b/source3/librpc/gen_ndr/cli_ntsvcs.h
index 4ed8a401ec78b970365a89ff5642d20a72b30e76..7de018c03c42807ccc83cbd232170324c13fbe40 100644 (file)
--- a/source3/librpc/gen_ndr/cli_ntsvcs.h
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.h
@@ -54,7 +54,7 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx,
                                     const char *devicepath /* [in] [ref,charset(UTF16)] */,
                                     uint32_t property /* [in]  */,
-                                    uint32_t *reg_data_type /* [in,out] [ref] */,
+                                    enum winreg_Type *reg_data_type /* [in,out] [ref] */,
                                     uint8_t *buffer /* [out] [ref,length_is(*buffer_size),size_is(*buffer_size)] */,
                                     uint32_t *buffer_size /* [in,out] [ref] */,
                                     uint32_t *needed /* [in,out] [ref] */,

diff --git a/source3/librpc/gen_ndr/ndr_ntsvcs.c b/source3/librpc/gen_ndr/ndr_ntsvcs.c
index 35d02a0dcbb3b58740b609155208b626c6f66185..e1ed43e040eceee7d88333475d27a8770d3e5da9 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/source3/librpc/gen_ndr/ndr_ntsvcs.c
@@ -3,6 +3,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_ntsvcs.h"
 
+#include "librpc/gen_ndr/ndr_winreg.h"
 static enum ndr_err_code ndr_push_PNP_HwProfInfo(struct ndr_push *ndr, int ndr_flags, const struct PNP_HwProfInfo *r)
 {
        uint32_t cntr_unknown2_0;
@@ -818,7 +819,7 @@ static enum ndr_err_code ndr_push_PNP_GetDeviceRegProp(struct ndr_push *ndr, int
                if (r->in.reg_data_type == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.reg_data_type));
+               NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, *r->in.reg_data_type));
                if (r->in.buffer_size == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -833,7 +834,7 @@ static enum ndr_err_code ndr_push_PNP_GetDeviceRegProp(struct ndr_push *ndr, int
                if (r->out.reg_data_type == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.reg_data_type));
+               NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, *r->out.reg_data_type));
                if (r->out.buffer == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -875,7 +876,7 @@ static enum ndr_err_code ndr_pull_PNP_GetDeviceRegProp(struct ndr_pull *ndr, int
                }
                _mem_save_reg_data_type_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->in.reg_data_type, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.reg_data_type));
+               NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, r->in.reg_data_type));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_reg_data_type_0, LIBNDR_FLAG_REF_ALLOC);
                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                        NDR_PULL_ALLOC(ndr, r->in.buffer_size);
@@ -907,7 +908,7 @@ static enum ndr_err_code ndr_pull_PNP_GetDeviceRegProp(struct ndr_pull *ndr, int
                }
                _mem_save_reg_data_type_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.reg_data_type, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.reg_data_type));
+               NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, r->out.reg_data_type));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_reg_data_type_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_array_size(ndr, &r->out.buffer));
                NDR_CHECK(ndr_pull_array_length(ndr, &r->out.buffer));
@@ -960,7 +961,7 @@ _PUBLIC_ void ndr_print_PNP_GetDeviceRegProp(struct ndr_print *ndr, const char *
                ndr_print_uint32(ndr, "property", r->in.property);
                ndr_print_ptr(ndr, "reg_data_type", r->in.reg_data_type);
                ndr->depth++;
-               ndr_print_uint32(ndr, "reg_data_type", *r->in.reg_data_type);
+               ndr_print_winreg_Type(ndr, "reg_data_type", *r->in.reg_data_type);
                ndr->depth--;
                ndr_print_ptr(ndr, "buffer_size", r->in.buffer_size);
                ndr->depth++;
@@ -978,7 +979,7 @@ _PUBLIC_ void ndr_print_PNP_GetDeviceRegProp(struct ndr_print *ndr, const char *
                ndr->depth++;
                ndr_print_ptr(ndr, "reg_data_type", r->out.reg_data_type);
                ndr->depth++;
-               ndr_print_uint32(ndr, "reg_data_type", *r->out.reg_data_type);
+               ndr_print_winreg_Type(ndr, "reg_data_type", *r->out.reg_data_type);
                ndr->depth--;
                ndr_print_ptr(ndr, "buffer", r->out.buffer);
                ndr->depth++;

diff --git a/source3/librpc/gen_ndr/ntsvcs.h b/source3/librpc/gen_ndr/ntsvcs.h
index b56b552ae28089d861bacf35a9b7f2cfd39e390c..bfe503e5d38bd1a9a52f31ee00143a1340a59617 100644 (file)
--- a/source3/librpc/gen_ndr/ntsvcs.h
+++ b/source3/librpc/gen_ndr/ntsvcs.h
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 
+#include "librpc/gen_ndr/winreg.h"
 #ifndef _HEADER_ntsvcs
 #define _HEADER_ntsvcs
 
@@ -142,14 +143,14 @@ struct PNP_GetDeviceRegProp {
                const char *devicepath;/* [ref,charset(UTF16)] */
                uint32_t property;
                uint32_t flags;
-               uint32_t *reg_data_type;/* [ref] */
+               enum winreg_Type *reg_data_type;/* [ref] */
                uint32_t *buffer_size;/* [ref] */
                uint32_t *needed;/* [ref] */
        } in;
 
        struct {
                uint8_t *buffer;/* [ref,length_is(*buffer_size),size_is(*buffer_size)] */
-               uint32_t *reg_data_type;/* [ref] */
+               enum winreg_Type *reg_data_type;/* [ref] */
                uint32_t *buffer_size;/* [ref] */
                uint32_t *needed;/* [ref] */
                WERROR result;