]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Re-run make idl.
authorGünther Deschner <gd@samba.org>
Fri, 7 Mar 2008 22:55:52 +0000 (23:55 +0100)
committerGünther Deschner <gd@samba.org>
Fri, 7 Mar 2008 22:55:52 +0000 (23:55 +0100)
Guenther

source/librpc/gen_ndr/cli_srvsvc.c
source/librpc/gen_ndr/cli_srvsvc.h
source/librpc/gen_ndr/ndr_srvsvc.c
source/librpc/gen_ndr/srvsvc.h

index a9d3399a738f201717fbb0f81d1f4b024c9fec15..02c11aba37af9f1b4514fa2e0f12dc57e2e5d1de 100644 (file)
@@ -760,7 +760,7 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
                                   const char *server_unc,
                                   uint32_t level,
-                                  union srvsvc_NetShareInfo info,
+                                  union srvsvc_NetShareInfo *info,
                                   uint32_t *parm_error,
                                   WERROR *werror)
 {
index b8bdac23ce204428be56a2140645410c152c55a4..d4acc925550a598c5856c99786c41270fed46d26 100644 (file)
@@ -114,7 +114,7 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
                                   const char *server_unc,
                                   uint32_t level,
-                                  union srvsvc_NetShareInfo info,
+                                  union srvsvc_NetShareInfo *info,
                                   uint32_t *parm_error,
                                   WERROR *werror);
 NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
index 2244a3ecf90e5f8a3488d3425f2acdc2bd1981f2..568d380385258fc02d27831b69dc1059a61893fb 100644 (file)
@@ -15232,8 +15232,11 @@ static enum ndr_err_code ndr_push_srvsvc_NetShareAdd(struct ndr_push *ndr, int f
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.server_unc, ndr_charset_length(r->in.server_unc, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
-               NDR_CHECK(ndr_push_set_switch_value(ndr, &r->in.info, r->in.level));
-               NDR_CHECK(ndr_push_srvsvc_NetShareInfo(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.info));
+               if (r->in.info == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.info, r->in.level));
+               NDR_CHECK(ndr_push_srvsvc_NetShareInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.parm_error));
                if (r->in.parm_error) {
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.parm_error));
@@ -15254,6 +15257,7 @@ static enum ndr_err_code ndr_pull_srvsvc_NetShareAdd(struct ndr_pull *ndr, int f
        uint32_t _ptr_server_unc;
        uint32_t _ptr_parm_error;
        TALLOC_CTX *_mem_save_server_unc_0;
+       TALLOC_CTX *_mem_save_info_0;
        TALLOC_CTX *_mem_save_parm_error_0;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
@@ -15277,8 +15281,14 @@ static enum ndr_err_code ndr_pull_srvsvc_NetShareAdd(struct ndr_pull *ndr, int f
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_server_unc_0, 0);
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
-               NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->in.info, r->in.level));
-               NDR_CHECK(ndr_pull_srvsvc_NetShareInfo(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.info));
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->in.info);
+               }
+               _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->in.info, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_set_switch_value(ndr, r->in.info, r->in.level));
+               NDR_CHECK(ndr_pull_srvsvc_NetShareInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_parm_error));
                if (_ptr_parm_error) {
                        NDR_PULL_ALLOC(ndr, r->in.parm_error);
@@ -15327,8 +15337,11 @@ _PUBLIC_ void ndr_print_srvsvc_NetShareAdd(struct ndr_print *ndr, const char *na
                }
                ndr->depth--;
                ndr_print_uint32(ndr, "level", r->in.level);
-               ndr_print_set_switch_value(ndr, &r->in.info, r->in.level);
-               ndr_print_srvsvc_NetShareInfo(ndr, "info", &r->in.info);
+               ndr_print_ptr(ndr, "info", r->in.info);
+               ndr->depth++;
+               ndr_print_set_switch_value(ndr, r->in.info, r->in.level);
+               ndr_print_srvsvc_NetShareInfo(ndr, "info", r->in.info);
+               ndr->depth--;
                ndr_print_ptr(ndr, "parm_error", r->in.parm_error);
                ndr->depth++;
                if (r->in.parm_error) {
index e05a6f06c3284a04d75e11a48d247080e98ddbe7..8b85736ee4c4cc3f4a52abe6eebbe3123bf2cfdc 100644 (file)
@@ -1252,7 +1252,7 @@ struct srvsvc_NetShareAdd {
        struct {
                const char *server_unc;/* [unique,charset(UTF16)] */
                uint32_t level;
-               union srvsvc_NetShareInfo info;/* [switch_is(level)] */
+               union srvsvc_NetShareInfo *info;/* [ref,switch_is(level)] */
                uint32_t *parm_error;/* [unique] */
        } in;