build: a more portable way of finding waf in makefiles
[sfrench/samba-autobuild/.git] / librpc / ndr / ndr_spoolss_buf.c
index e41f9436b1ec4297606df91385248a910971622a..2fd9d95d2b99293326c3c2691098f84f1f31df21 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_spoolss.h"
+#include "librpc/gen_ndr/ndr_security.h"
 #if (_SAMBA_BUILD_ >= 4)
 #include "param/param.h"
 #endif
@@ -59,7 +60,7 @@
        }\
        if (r->in.buffer) {\
                DATA_BLOB _data_blob_info;\
-               _ndr_info = ndr_push_init_ctx(ndr, ndr->iconv_convenience);\
+               _ndr_info = ndr_push_init_ctx(ndr);\
                NDR_ERR_HAVE_NO_MEMORY(_ndr_info);\
                _ndr_info->flags= ndr->flags;\
                if (r->out.info) {\
        if (_r.out.info) {\
                struct ndr_pull *_ndr_info;\
                NDR_PULL_ALLOC(ndr, *r->out.info);\
-               _ndr_info = ndr_pull_init_blob(_r.out.info, *r->out.info, ndr->iconv_convenience);\
+               _ndr_info = ndr_pull_init_blob(_r.out.info, *r->out.info);\
                NDR_ERR_HAVE_NO_MEMORY(_ndr_info);\
                _ndr_info->flags= ndr->flags;\
                if (r->in.offered != _ndr_info->data_size) {\
 #define NDR_SPOOLSS_SIZE_ENUM_LEVEL(fn) do { \
        struct __##fn __r;\
        DATA_BLOB _data_blob_info;\
-       struct ndr_push *_ndr_info = ndr_push_init_ctx(mem_ctx, iconv_convenience);\
+       struct ndr_push *_ndr_info = ndr_push_init_ctx(mem_ctx);\
        if (!_ndr_info) return 0;\
-       _ndr_info->flags|=0;\
+       _ndr_info->flags|=LIBNDR_FLAG_NO_NDR_SIZE;\
        __r.in.level    = level;\
        __r.in.count    = count;\
        __r.out.info    = info;\
 #define NDR_SPOOLSS_SIZE_ENUM(fn) do { \
        struct __##fn __r;\
        DATA_BLOB _data_blob_info;\
-       struct ndr_push *_ndr_info = ndr_push_init_ctx(mem_ctx, iconv_convenience);\
+       struct ndr_push *_ndr_info = ndr_push_init_ctx(mem_ctx);\
        if (!_ndr_info) return 0;\
-       _ndr_info->flags|=0;\
+       _ndr_info->flags|=LIBNDR_FLAG_NO_NDR_SIZE;\
        __r.in.count    = count;\
        __r.out.info    = info;\
        _NDR_CHECK_UINT32(ndr_push___##fn(_ndr_info, NDR_OUT, &__r)); \
@@ -233,7 +234,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumPrinters(struct ndr_pull *ndr, int flags,
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumPrinters_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, uint32_t level, uint32_t count, union spoolss_PrinterInfo *info)
+uint32_t ndr_size_spoolss_EnumPrinters_info(TALLOC_CTX *mem_ctx, uint32_t level, uint32_t count, union spoolss_PrinterInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumPrinters);
 }
@@ -269,7 +270,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumJobs(struct ndr_pull *ndr, int flags, str
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumJobs_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, uint32_t level, uint32_t count, union spoolss_JobInfo *info)
+uint32_t ndr_size_spoolss_EnumJobs_info(TALLOC_CTX *mem_ctx, uint32_t level, uint32_t count, union spoolss_JobInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumJobs);
 }
@@ -301,7 +302,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumPrinterDrivers(struct ndr_pull *ndr, int
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumPrinterDrivers_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, uint32_t level, uint32_t count, union spoolss_DriverInfo *info)
+uint32_t ndr_size_spoolss_EnumPrinterDrivers_info(TALLOC_CTX *mem_ctx, uint32_t level, uint32_t count, union spoolss_DriverInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumPrinterDrivers);
 }
@@ -329,7 +330,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumForms(struct ndr_pull *ndr, int flags, st
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumForms_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, uint32_t level, uint32_t count, union spoolss_FormInfo *info)
+uint32_t ndr_size_spoolss_EnumForms_info(TALLOC_CTX *mem_ctx, uint32_t level, uint32_t count, union spoolss_FormInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumForms);
 }
@@ -357,7 +358,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumPorts(struct ndr_pull *ndr, int flags, st
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumPorts_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, uint32_t level, uint32_t count, union spoolss_PortInfo *info)
+uint32_t ndr_size_spoolss_EnumPorts_info(TALLOC_CTX *mem_ctx, uint32_t level, uint32_t count, union spoolss_PortInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumPorts);
 }
@@ -385,7 +386,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumMonitors(struct ndr_pull *ndr, int flags,
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumMonitors_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, uint32_t level, uint32_t count, union spoolss_MonitorInfo *info)
+uint32_t ndr_size_spoolss_EnumMonitors_info(TALLOC_CTX *mem_ctx, uint32_t level, uint32_t count, union spoolss_MonitorInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumMonitors);
 }
@@ -417,7 +418,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumPrintProcessors(struct ndr_pull *ndr, int
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumPrintProcessors_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience,
+uint32_t ndr_size_spoolss_EnumPrintProcessors_info(TALLOC_CTX *mem_ctx, 
                                                   uint32_t level, uint32_t count, union spoolss_PrintProcessorInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcessors);
@@ -450,7 +451,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumPrintProcDataTypes(struct ndr_pull *ndr,
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumPrintProcDataTypes_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience,
+uint32_t ndr_size_spoolss_EnumPrintProcDataTypes_info(TALLOC_CTX *mem_ctx, 
                                                      uint32_t level, uint32_t count, union spoolss_PrintProcDataTypesInfo *info)
 {
        NDR_SPOOLSS_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcDataTypes);
@@ -480,7 +481,7 @@ enum ndr_err_code ndr_push_spoolss_EnumPrinterDataEx(struct ndr_push *ndr, int f
                _r.out.info     = data_blob(NULL, 0);
                if (r->in.offered >= *r->out.needed) {
                        struct __spoolss_EnumPrinterDataEx __r;
-                       _ndr_info = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
+                       _ndr_info = ndr_push_init_ctx(ndr);
                        NDR_ERR_HAVE_NO_MEMORY(_ndr_info);
                        _ndr_info->flags= ndr->flags;
                        __r.in.count    = *r->out.count;
@@ -530,7 +531,7 @@ enum ndr_err_code ndr_pull_spoolss_EnumPrinterDataEx(struct ndr_pull *ndr, int f
                if (_r.out.info.length) {
                        struct ndr_pull *_ndr_info;
                        NDR_PULL_ALLOC(ndr, *r->out.info);
-                       _ndr_info = ndr_pull_init_blob(&_r.out.info, *r->out.info, ndr->iconv_convenience);
+                       _ndr_info = ndr_pull_init_blob(&_r.out.info, *r->out.info);
                        NDR_ERR_HAVE_NO_MEMORY(_ndr_info);
                        _ndr_info->flags= ndr->flags;
                        if (r->in.offered != _ndr_info->data_size) {
@@ -550,312 +551,25 @@ enum ndr_err_code ndr_pull_spoolss_EnumPrinterDataEx(struct ndr_pull *ndr, int f
        return NDR_ERR_SUCCESS;
 }
 
-uint32_t ndr_size_spoolss_EnumPrinterDataEx_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience,
+uint32_t ndr_size_spoolss_EnumPrinterDataEx_info(TALLOC_CTX *mem_ctx,
                                                 uint32_t count, struct spoolss_PrinterEnumValues *info)
 {
        NDR_SPOOLSS_SIZE_ENUM(spoolss_EnumPrinterDataEx);
 }
 
-/*
-  spoolss_GetPrinterData
-*/
-enum ndr_err_code ndr_push_spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterData *r)
-{
-       struct _spoolss_GetPrinterData _r;
-       if (flags & NDR_IN) {
-               _r.in.handle    = r->in.handle;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               NDR_CHECK(ndr_push__spoolss_GetPrinterData(ndr, flags, &_r));
-       }
-       if (flags & NDR_OUT) {
-               struct ndr_push *_ndr_info;
-               DATA_BLOB blob = data_blob(NULL, 0);
-               _r.in.handle    = r->in.handle;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               _r.out.type     = r->out.type;
-               _r.out.data     = &blob;
-               _r.out.needed   = r->out.needed;
-               _r.out.result   = r->out.result;
-               {
-                       struct __spoolss_GetPrinterData __r;
-                       DATA_BLOB _blob;
-                       _ndr_info = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-                       NDR_ERR_HAVE_NO_MEMORY(_ndr_info);
-                       _ndr_info->flags= ndr->flags;
-                       __r.in.type     = *r->out.type;
-                       __r.out.data    = r->out.data;
-                       NDR_CHECK(ndr_push___spoolss_GetPrinterData(_ndr_info, flags, &__r));
-                       if (r->in.offered > _ndr_info->offset) {
-                               uint32_t _padding_len = r->in.offered - _ndr_info->offset;
-                               NDR_CHECK(ndr_push_zero(_ndr_info, _padding_len));
-                       }
-                       _blob = ndr_push_blob(_ndr_info);
-                       _r.out.data = &_blob;
-               }
-               NDR_CHECK(ndr_push__spoolss_GetPrinterData(ndr, flags, &_r));
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterData *r)
-{
-       struct _spoolss_GetPrinterData _r;
-       if (flags & NDR_IN) {
-               DATA_BLOB blob = data_blob(NULL,0);
-               ZERO_STRUCT(r->out);
-
-               _r.in.handle    = r->in.handle;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               _r.out.type     = r->out.type;
-               _r.out.data     = &blob;
-               _r.out.needed   = r->out.needed;
-               NDR_CHECK(ndr_pull__spoolss_GetPrinterData(ndr, flags, &_r));
-               r->in.handle    = _r.in.handle;
-               r->in.value_name= _r.in.value_name;
-               r->in.offered   = _r.in.offered;
-               r->out.needed   = _r.out.needed;
-       }
-       if (flags & NDR_OUT) {
-               DATA_BLOB blob = data_blob_talloc(ndr,NULL,0);
-               _r.in.handle    = r->in.handle;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               _r.out.type     = r->out.type;
-               _r.out.data     = &blob;
-               _r.out.needed   = r->out.needed;
-               _r.out.result   = r->out.result;
-               NDR_CHECK(ndr_pull__spoolss_GetPrinterData(ndr, flags, &_r));
-               r->out.type     = _r.out.type;
-               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                       NDR_PULL_ALLOC(ndr, r->out.data);
-               }
-               ZERO_STRUCTP(r->out.data);
-               r->out.needed   = _r.out.needed;
-               r->out.result   = _r.out.result;
-               if (_r.out.data && _r.out.data->length != r->in.offered) {
-                       return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,
-                               "SPOOLSS Buffer: r->in.offered[%u] doesn't match length of out buffer[%u]",
-                               (unsigned)r->in.offered, (unsigned)_r.out.data->length);
-               }
-               if (_r.out.data && _r.out.data->length > 0 && *r->out.needed <= _r.out.data->length) {
-                       struct __spoolss_GetPrinterData __r;
-                       struct ndr_pull *_ndr_data = ndr_pull_init_blob(_r.out.data, ndr, ndr->iconv_convenience);
-                       NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-                       _ndr_data->flags= ndr->flags;
-                       __r.in.type     = *r->out.type;
-                       __r.out.data    = r->out.data;
-                       NDR_CHECK(ndr_pull___spoolss_GetPrinterData(_ndr_data, flags, &__r));
-                       r->out.data     = __r.out.data;
-               } else {
-                       *r->out.type    = REG_NONE;
-               }
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-/*
-  spoolss_SetPrinterData
-*/
-enum ndr_err_code ndr_push_spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterData *r)
-{
-       struct _spoolss_SetPrinterData _r;
-       if (flags & NDR_IN) {
-               struct ndr_push *_ndr_data;
-               struct __spoolss_SetPrinterData __r;
-               DATA_BLOB _data_blob_data;
-
-               _ndr_data = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-               NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-               _ndr_data->flags= ndr->flags;
-
-               __r.in.type     = r->in.type;
-               __r.out.data    = discard_const_p(union spoolss_PrinterData, &r->in.data);
-               NDR_CHECK(ndr_push___spoolss_SetPrinterData(_ndr_data, NDR_OUT, &__r));
-               _data_blob_data = ndr_push_blob(_ndr_data);
-
-               _r.in.handle    = r->in.handle;
-               _r.in.value_name= r->in.value_name;
-               _r.in.type      = r->in.type;
-               _r.in.data      = _data_blob_data;
-               _r.in._offered  = _data_blob_data.length;
-               _r.out.result   = r->out.result;
-               NDR_CHECK(ndr_push__spoolss_SetPrinterData(ndr, flags, &_r));
-       }
-       if (flags & NDR_OUT) {
-               _r.in.handle    = r->in.handle;
-               _r.in.value_name= r->in.value_name;
-               _r.in.type      = r->in.type;
-               _r.in.data      = data_blob(NULL,0),
-               _r.in._offered  = r->in._offered;
-               _r.out.result   = r->out.result;
-               NDR_CHECK(ndr_push__spoolss_SetPrinterData(ndr, flags, &_r));
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-/*
-  spoolss_GetPrinterDataEx
-*/
-enum ndr_err_code ndr_push_spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterDataEx *r)
-{
-       struct _spoolss_GetPrinterDataEx _r;
-       if (flags & NDR_IN) {
-               _r.in.handle    = r->in.handle;
-               _r.in.key_name  = r->in.key_name;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               NDR_CHECK(ndr_push__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-       }
-       if (flags & NDR_OUT) {
-               struct ndr_push *_ndr_info;
-               DATA_BLOB blob = data_blob(NULL, 0);
-               _r.in.handle    = r->in.handle;
-               _r.in.key_name  = r->in.key_name;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               _r.out.type     = r->out.type;
-               _r.out.data     = &blob;
-               _r.out.needed   = r->out.needed;
-               _r.out.result   = r->out.result;
-               {
-                       struct __spoolss_GetPrinterDataEx __r;
-                       DATA_BLOB _blob;
-                       _ndr_info = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-                       NDR_ERR_HAVE_NO_MEMORY(_ndr_info);
-                       _ndr_info->flags= ndr->flags;
-                       __r.in.type     = *r->out.type;
-                       __r.out.data    = r->out.data;
-                       NDR_CHECK(ndr_push___spoolss_GetPrinterDataEx(_ndr_info, flags, &__r));
-                       if (r->in.offered > _ndr_info->offset) {
-                               uint32_t _padding_len = r->in.offered - _ndr_info->offset;
-                               NDR_CHECK(ndr_push_zero(_ndr_info, _padding_len));
-                       }
-                       _blob = ndr_push_blob(_ndr_info);
-                       _r.out.data = &_blob;
-               }
-               NDR_CHECK(ndr_push__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-enum ndr_err_code ndr_pull_spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterDataEx *r)
-{
-       struct _spoolss_GetPrinterDataEx _r;
-       if (flags & NDR_IN) {
-               DATA_BLOB blob = data_blob(NULL,0);
-               ZERO_STRUCT(r->out);
-
-               _r.in.handle    = r->in.handle;
-               _r.in.key_name  = r->in.key_name;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               _r.out.type     = r->out.type;
-               _r.out.data     = &blob;
-               _r.out.needed   = r->out.needed;
-               NDR_CHECK(ndr_pull__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-               r->in.handle    = _r.in.handle;
-               r->in.key_name  = _r.in.key_name;
-               r->in.value_name= _r.in.value_name;
-               r->in.offered   = _r.in.offered;
-               r->out.needed   = _r.out.needed;
-       }
-       if (flags & NDR_OUT) {
-               DATA_BLOB blob = data_blob_talloc(ndr,NULL,0);
-               _r.in.handle    = r->in.handle;
-               _r.in.key_name  = r->in.key_name;
-               _r.in.value_name= r->in.value_name;
-               _r.in.offered   = r->in.offered;
-               _r.out.type     = r->out.type;
-               _r.out.data     = &blob;
-               _r.out.needed   = r->out.needed;
-               _r.out.result   = r->out.result;
-               NDR_CHECK(ndr_pull__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-               r->out.type     = _r.out.type;
-               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                       NDR_PULL_ALLOC(ndr, r->out.data);
-               }
-               ZERO_STRUCTP(r->out.data);
-               r->out.needed   = _r.out.needed;
-               r->out.result   = _r.out.result;
-               if (_r.out.data && _r.out.data->length != r->in.offered) {
-                       return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,
-                               "SPOOLSS Buffer: r->in.offered[%u] doesn't match length of out buffer[%u]",
-                               (unsigned)r->in.offered, (unsigned)_r.out.data->length);
-               }
-               if (_r.out.data && _r.out.data->length > 0 && *r->out.needed <= _r.out.data->length) {
-                       struct __spoolss_GetPrinterDataEx __r;
-                       struct ndr_pull *_ndr_data = ndr_pull_init_blob(_r.out.data, ndr, ndr->iconv_convenience);
-                       NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-                       _ndr_data->flags= ndr->flags;
-                       __r.in.type     = *r->out.type;
-                       __r.out.data    = r->out.data;
-                       NDR_CHECK(ndr_pull___spoolss_GetPrinterDataEx(_ndr_data, flags, &__r));
-                       r->out.data     = __r.out.data;
-               } else {
-                       *r->out.type    = REG_NONE;
-               }
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-/*
-  spoolss_SetPrinterDataEx
-*/
-enum ndr_err_code ndr_push_spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterDataEx *r)
-{
-       struct _spoolss_SetPrinterDataEx _r;
-       if (flags & NDR_IN) {
-               struct ndr_push *_ndr_data;
-               struct __spoolss_SetPrinterDataEx __r;
-               DATA_BLOB _data_blob_data;
-
-               _ndr_data = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-               NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-               _ndr_data->flags= ndr->flags;
-
-               __r.in.type     = r->in.type;
-               __r.out.data    = discard_const_p(union spoolss_PrinterData, &r->in.data);
-               NDR_CHECK(ndr_push___spoolss_SetPrinterDataEx(_ndr_data, NDR_OUT, &__r));
-               _data_blob_data = ndr_push_blob(_ndr_data);
-
-               _r.in.handle    = r->in.handle;
-               _r.in.key_name  = r->in.key_name;
-               _r.in.value_name= r->in.value_name;
-               _r.in.type      = r->in.type;
-               _r.in.data      = _data_blob_data;
-               _r.in._offered  = _data_blob_data.length;
-               _r.out.result   = r->out.result;
-               NDR_CHECK(ndr_push__spoolss_SetPrinterDataEx(ndr, flags, &_r));
-       }
-       if (flags & NDR_OUT) {
-               _r.in.handle    = r->in.handle;
-               _r.in.key_name  = r->in.key_name;
-               _r.in.value_name= r->in.value_name;
-               _r.in.type      = r->in.type;
-               _r.in.data      = data_blob(NULL,0),
-               _r.in._offered  = r->in._offered;
-               _r.out.result   = r->out.result;
-               NDR_CHECK(ndr_push__spoolss_SetPrinterDataEx(ndr, flags, &_r));
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-uint32_t _ndr_size_spoolss_DeviceMode(struct spoolss_DeviceMode *devmode, struct smb_iconv_convenience *ic, uint32_t flags)
+uint32_t _ndr_size_spoolss_DeviceMode(struct spoolss_DeviceMode *devmode, uint32_t flags)
 {
        if (!devmode) return 0;
-       return ndr_size_spoolss_DeviceMode(devmode,ic,flags);
+       return ndr_size_spoolss_DeviceMode(devmode, flags);
 }
 
-_PUBLIC_ size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray *r, struct smb_iconv_convenience *ic, int flags)
+_PUBLIC_ size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray *r, int flags)
 {
        if (!r) {
                return 4;
        }
 
-       return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_StringArray, ic);
+       return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_StringArray);
 }
 
 /* hand marshall as pidl cannot (yet) generate a relative pointer to a fixed array of
@@ -1400,11 +1114,330 @@ void ndr_print_spoolss_Field(struct ndr_print *ndr, const char *name, const unio
        }
 }
 
-_PUBLIC_ size_t ndr_size_spoolss_PrinterData(const union spoolss_PrinterData *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
+_PUBLIC_ size_t ndr_size_spoolss_PrinterData(const union spoolss_PrinterData *r, uint32_t level, int flags)
 {
        if (!r) {
                return 0;
        }
-       return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterData, ic);
+       return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterData);
+}
+
+void ndr_print_spoolss_security_descriptor(struct ndr_print *ndr, const char *name, const struct security_descriptor *r)
+{
+       ndr_print_security_descriptor(ndr, name, r);
+}
+
+enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r)
+{
+       uint32_t _flags_save_STRUCT = ndr->flags;
+       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NO_RELATIVE_REVERSE);
+       NDR_CHECK(ndr_pull_security_descriptor(ndr, ndr_flags, r));
+       ndr->flags = _flags_save_STRUCT;
+       return NDR_ERR_SUCCESS;
+}
+
+enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r)
+{
+       {
+               uint32_t _flags_save_STRUCT = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_LITTLE_ENDIAN|LIBNDR_FLAG_NO_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       NDR_CHECK(ndr_push_align(ndr, 5));
+                       NDR_CHECK(ndr_push_security_descriptor_revision(ndr, NDR_SCALARS, r->revision));
+                       NDR_CHECK(ndr_push_security_descriptor_type(ndr, NDR_SCALARS, r->type));
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->owner_sid));
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->group_sid));
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sacl));
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dacl));
+                       NDR_CHECK(ndr_push_trailer_align(ndr, 5));
+               }
+               if (ndr_flags & NDR_BUFFERS) {
+                       if (r->sacl) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sacl));
+                               NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->sacl));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sacl));
+                       }
+                       if (r->dacl) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dacl));
+                               NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->dacl));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dacl));
+                       }
+                       if (r->owner_sid) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->owner_sid));
+                               NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->owner_sid));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->owner_sid));
+                       }
+                       if (r->group_sid) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->group_sid));
+                               NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->group_sid));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->group_sid));
+                       }
+               }
+               ndr->flags = _flags_save_STRUCT;
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo2 *r)
+{
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_push_align(ndr, 5));
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->servername));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printername));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sharename));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->portname));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->drivername));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->comment));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->location));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode));
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sepfile));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printprocessor));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->datatype));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->parameters));
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_spoolss_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc));
+                       ndr->flags = _flags_save_spoolss_security_descriptor;
+               }
+               NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->attributes));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->defaultpriority));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->starttime));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->untiltime));
+               NDR_CHECK(ndr_push_spoolss_PrinterStatus(ndr, NDR_SCALARS, r->status));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->cjobs));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->averageppm));
+               NDR_CHECK(ndr_push_trailer_align(ndr, 5));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->servername) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->servername));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->printername) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printername));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->sharename) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sharename));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sharename));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sharename));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->portname) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->portname));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->portname));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->portname));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->drivername) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->drivername));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->drivername));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->drivername));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->comment) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->comment));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->comment));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->comment));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->location) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->location));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->location));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->location));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->sepfile) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sepfile));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sepfile));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sepfile));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->printprocessor) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printprocessor));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printprocessor));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->printprocessor));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->datatype) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->datatype));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->datatype));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->datatype));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       if (r->parameters) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters));
+                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->parameters));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->devmode) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode));
+                               {
+                                       struct ndr_push *_ndr_devmode;
+                                       NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_devmode, 0, -1));
+                                       NDR_CHECK(ndr_push_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
+                                       NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_devmode, 0, -1));
+                               }
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode));
+                       }
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
+               }
+               {
+                       uint32_t _flags_save_spoolss_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->secdesc) {
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc));
+                               {
+                                       struct ndr_push *_ndr_secdesc;
+                                       NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
+                                       NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
+                                       NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+                               }
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc));
+                       }
+                       ndr->flags = _flags_save_spoolss_security_descriptor;
+               }
+       }
+       return NDR_ERR_SUCCESS;
 }
 
+_PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, const struct spoolss_Time *r)
+{
+       struct tm tm;
+       time_t t;
+       char *str;
+
+       tm.tm_sec       = r->second;
+       tm.tm_min       = r->minute;
+       tm.tm_hour      = r->hour;
+       tm.tm_mday      = r->day;
+       tm.tm_mon       = r->month - 1;
+       tm.tm_year      = r->year - 1900;
+       tm.tm_wday      = r->day_of_week;
+       tm.tm_yday      = 0;
+       tm.tm_isdst     = -1;
+
+       t = mktime(&tm);
+
+       str = timestring(ndr, t);
+
+       ndr_print_struct(ndr, name, "spoolss_Time");
+       ndr->depth++;
+       ndr_print_string(ndr, "", str);
+       ndr->depth--;
+       talloc_free(str);
+}