s3: re-run make samba3-idl.
authorGünther Deschner <gd@samba.org>
Tue, 9 Feb 2010 15:47:32 +0000 (16:47 +0100)
committerKarolin Seeger <kseeger@samba.org>
Fri, 19 Feb 2010 11:30:25 +0000 (12:30 +0100)
Guenther

librpc/gen_ndr/ndr_security.c
librpc/gen_ndr/ndr_security.h
librpc/gen_ndr/ndr_spoolss.c
librpc/gen_ndr/ndr_spoolss.h
librpc/gen_ndr/spoolss.h

index 6b6b2622e726e441d9648dfa2428053ce36030db..3ae6ec31068d9da2050002844294f2433040b77f 100644 (file)
@@ -541,13 +541,13 @@ _PUBLIC_ void ndr_print_security_acl(struct ndr_print *ndr, const char *name, co
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_security_descriptor_revision(struct ndr_push *ndr, int ndr_flags, enum security_descriptor_revision r)
+_PUBLIC_ enum ndr_err_code ndr_push_security_descriptor_revision(struct ndr_push *ndr, int ndr_flags, enum security_descriptor_revision r)
 {
        NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_security_descriptor_revision(struct ndr_pull *ndr, int ndr_flags, enum security_descriptor_revision *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor_revision(struct ndr_pull *ndr, int ndr_flags, enum security_descriptor_revision *r)
 {
        uint8_t v;
        NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &v));
@@ -565,13 +565,13 @@ _PUBLIC_ void ndr_print_security_descriptor_revision(struct ndr_print *ndr, cons
        ndr_print_enum(ndr, name, "ENUM", val, r);
 }
 
-static enum ndr_err_code ndr_push_security_descriptor_type(struct ndr_push *ndr, int ndr_flags, uint16_t r)
+_PUBLIC_ enum ndr_err_code ndr_push_security_descriptor_type(struct ndr_push *ndr, int ndr_flags, uint16_t r)
 {
        NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_security_descriptor_type(struct ndr_pull *ndr, int ndr_flags, uint16_t *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor_type(struct ndr_pull *ndr, int ndr_flags, uint16_t *r)
 {
        uint16_t v;
        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
index eddd3c3507772843f35ee52f9aed10b00792e673..6613cce512c95a71aeede9d64c1e7c15be5796a3 100644 (file)
@@ -33,7 +33,11 @@ enum ndr_err_code ndr_push_security_acl(struct ndr_push *ndr, int ndr_flags, con
 enum ndr_err_code ndr_pull_security_acl(struct ndr_pull *ndr, int ndr_flags, struct security_acl *r);
 void ndr_print_security_acl(struct ndr_print *ndr, const char *name, const struct security_acl *r);
 size_t ndr_size_security_acl(const struct security_acl *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_security_descriptor_revision(struct ndr_push *ndr, int ndr_flags, enum security_descriptor_revision r);
+enum ndr_err_code ndr_pull_security_descriptor_revision(struct ndr_pull *ndr, int ndr_flags, enum security_descriptor_revision *r);
 void ndr_print_security_descriptor_revision(struct ndr_print *ndr, const char *name, enum security_descriptor_revision r);
+enum ndr_err_code ndr_push_security_descriptor_type(struct ndr_push *ndr, int ndr_flags, uint16_t r);
+enum ndr_err_code ndr_pull_security_descriptor_type(struct ndr_pull *ndr, int ndr_flags, uint16_t *r);
 void ndr_print_security_descriptor_type(struct ndr_print *ndr, const char *name, uint16_t r);
 enum ndr_err_code ndr_push_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r);
 enum ndr_err_code ndr_pull_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r);
index 5c2f28c5d004c424b51105fe84d2001a2438c684..59919cc1e31f2f2502cb8dd65e9ff5bce6a686f3 100644 (file)
@@ -224,13 +224,13 @@ _PUBLIC_ void ndr_print_spoolss_MinorVersion(struct ndr_print *ndr, const char *
        ndr_print_enum(ndr, name, "ENUM", val, r);
 }
 
-static enum ndr_err_code ndr_push_spoolss_PrinterStatus(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterStatus(struct ndr_push *ndr, int ndr_flags, uint32_t r)
 {
        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_spoolss_PrinterStatus(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterStatus(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
 {
        uint32_t v;
        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
@@ -953,13 +953,13 @@ _PUBLIC_ size_t ndr_size_spoolss_PrinterInfo1(const struct spoolss_PrinterInfo1
        return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo1, ic);
 }
 
-static enum ndr_err_code ndr_push_spoolss_PrinterAttributes(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterAttributes(struct ndr_push *ndr, int ndr_flags, uint32_t r)
 {
        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_spoolss_PrinterAttributes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterAttributes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
 {
        uint32_t v;
        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
@@ -1036,7 +1036,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i
                        NDR_CHECK(ndr_push_relative_ptr1(ndr, r->location));
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode));
+               {
+                       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);
@@ -1061,7 +1066,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i
                        NDR_CHECK(ndr_push_relative_ptr1(ndr, r->parameters));
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc));
+               {
+                       uint32_t _flags_save_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_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));
@@ -1142,15 +1152,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i
                        }
                        ndr->flags = _flags_save_string;
                }
-               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));
+               {
+                       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_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode));
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
                {
                        uint32_t _flags_save_string = ndr->flags;
@@ -1192,15 +1207,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i
                        }
                        ndr->flags = _flags_save_string;
                }
-               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_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                               NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+               {
+                       uint32_t _flags_save_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_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_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc));
+                       ndr->flags = _flags_save_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -1320,12 +1340,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i
                        }
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
-               if (_ptr_devmode) {
-                       NDR_PULL_ALLOC(ndr, r->devmode);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
-               } else {
-                       r->devmode = NULL;
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
+                       if (_ptr_devmode) {
+                               NDR_PULL_ALLOC(ndr, r->devmode);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
+                       } else {
+                               r->devmode = NULL;
+                       }
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
                {
                        uint32_t _flags_save_string = ndr->flags;
@@ -1375,12 +1400,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i
                        }
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
-               if (_ptr_secdesc) {
-                       NDR_PULL_ALLOC(ndr, r->secdesc);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
-               } else {
-                       r->secdesc = NULL;
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
+                       if (_ptr_secdesc) {
+                               NDR_PULL_ALLOC(ndr, r->secdesc);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
+                       } else {
+                               r->secdesc = NULL;
+                       }
+                       ndr->flags = _flags_save_security_descriptor;
                }
                NDR_CHECK(ndr_pull_spoolss_PrinterAttributes(ndr, NDR_SCALARS, &r->attributes));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority));
@@ -1500,20 +1530,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->devmode) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
-                       _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
-                       {
-                               struct ndr_pull *_ndr_devmode;
-                               NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1));
-                               NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
-                               NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1));
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->devmode) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
+                               _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
+                               {
+                                       struct ndr_pull *_ndr_devmode;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1));
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
+                               ndr->offset = _relative_save_offset;
                        }
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
-                       ndr->offset = _relative_save_offset;
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
                {
                        uint32_t _flags_save_string = ndr->flags;
@@ -1575,20 +1610,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->secdesc) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
-                       _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
-                       {
-                               struct ndr_pull *_ndr_secdesc;
-                               NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
-                               NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                               NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->secdesc) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
+                               _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
+                               {
+                                       struct ndr_pull *_ndr_secdesc;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
+                                       NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
+                               ndr->offset = _relative_save_offset;
                        }
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
-                       ndr->offset = _relative_save_offset;
+                       ndr->flags = _flags_save_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -1696,18 +1736,28 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, i
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc));
+               {
+                       uint32_t _flags_save_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_security_descriptor;
+               }
        }
        if (ndr_flags & NDR_BUFFERS) {
-               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_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                               NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+               {
+                       uint32_t _flags_save_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_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_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc));
+                       ndr->flags = _flags_save_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -1719,29 +1769,39 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i
        TALLOC_CTX *_mem_save_secdesc_0;
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
-               if (_ptr_secdesc) {
-                       NDR_PULL_ALLOC(ndr, r->secdesc);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
-               } else {
-                       r->secdesc = NULL;
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
+                       if (_ptr_secdesc) {
+                               NDR_PULL_ALLOC(ndr, r->secdesc);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
+                       } else {
+                               r->secdesc = NULL;
+                       }
+                       ndr->flags = _flags_save_security_descriptor;
                }
        }
        if (ndr_flags & NDR_BUFFERS) {
-               if (r->secdesc) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
-                       _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
-                       {
-                               struct ndr_pull *_ndr_secdesc;
-                               NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
-                               NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                               NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->secdesc) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
+                               _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
+                               {
+                                       struct ndr_pull *_ndr_secdesc;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
+                                       NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
+                               ndr->offset = _relative_save_offset;
                        }
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
-                       ndr->offset = _relative_save_offset;
+                       ndr->flags = _flags_save_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -2196,18 +2256,28 @@ static enum ndr_err_code ndr_push_spoolss_DeviceModeInfo(struct ndr_push *ndr, i
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode));
+               {
+                       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;
+               }
        }
        if (ndr_flags & NDR_BUFFERS) {
-               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));
+               {
+                       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_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode));
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -2219,29 +2289,39 @@ static enum ndr_err_code ndr_pull_spoolss_DeviceModeInfo(struct ndr_pull *ndr, i
        TALLOC_CTX *_mem_save_devmode_0;
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
-               if (_ptr_devmode) {
-                       NDR_PULL_ALLOC(ndr, r->devmode);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
-               } else {
-                       r->devmode = NULL;
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
+                       if (_ptr_devmode) {
+                               NDR_PULL_ALLOC(ndr, r->devmode);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
+                       } else {
+                               r->devmode = NULL;
+                       }
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
        }
        if (ndr_flags & NDR_BUFFERS) {
-               if (r->devmode) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
-                       _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
-                       {
-                               struct ndr_pull *_ndr_devmode;
-                               NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1));
-                               NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
-                               NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1));
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->devmode) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
+                               _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
+                               {
+                                       struct ndr_pull *_ndr_devmode;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1));
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
+                               ndr->offset = _relative_save_offset;
                        }
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
-                       ndr->offset = _relative_save_offset;
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -2263,121 +2343,126 @@ _PUBLIC_ void ndr_print_spoolss_DeviceModeInfo(struct ndr_print *ndr, const char
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrinterInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 0: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0));
-                       break; }
-
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
-
-                       case 2: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
-
-                       case 3: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
-
-                       case 4: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4));
-                       break; }
-
-                       case 5: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5));
-                       break; }
-
-                       case 6: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6));
-                       break; }
-
-                       case 7: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7));
-                       break; }
-
-                       case 8: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8));
-                       break; }
-
-                       case 9: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9));
-                       break; }
-
-                       default: {
-                       break; }
-
-               }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 0:
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0));
-                       break;
-
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
-
-                       case 2:
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
-
-                       case 3:
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3));
-                       break;
-
-                       case 4:
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4));
-                       break;
-
-                       case 5:
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5));
-                       break;
-
-                       case 6:
-                       break;
-
-                       case 7:
-                               NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7));
-                       break;
-
-                       case 8:
-                               NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8));
-                       break;
-
-                       case 9:
-                               NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9));
-                       break;
-
-                       default:
-                       break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 0: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0));
+                               break; }
+
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
+
+                               case 2: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
+
+                               case 3: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
+
+                               case 4: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4));
+                               break; }
+
+                               case 5: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5));
+                               break; }
+
+                               case 6: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6));
+                               break; }
+
+                               case 7: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7));
+                               break; }
+
+                               case 8: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8));
+                               break; }
+
+                               case 9: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9));
+                               break; }
+
+                               default: {
+                               break; }
+
+                       }
+               }
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 0:
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0));
+                               break;
+
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
+
+                               case 2:
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
+
+                               case 3:
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               break;
+
+                               case 4:
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               break;
+
+                               case 5:
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5));
+                               break;
+
+                               case 6:
+                               break;
+
+                               case 7:
+                                       NDR_CHECK(ndr_push_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7));
+                               break;
+
+                               case 8:
+                                       NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8));
+                               break;
+
+                               case 9:
+                                       NDR_CHECK(ndr_push_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9));
+                               break;
+
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -2387,179 +2472,190 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo(struct ndr_pull *ndr, in
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 0: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0));
-                       break; }
-
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
-
-                       case 2: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
-
-                       case 3: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
-
-                       case 4: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4));
-                       break; }
-
-                       case 5: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5));
-                       break; }
-
-                       case 6: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6));
-                       break; }
-
-                       case 7: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7));
-                       break; }
-
-                       case 8: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8));
-                       break; }
-
-                       case 9: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9));
-                       break; }
-
-                       default: {
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 0: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_SCALARS, &r->info0));
+                               break; }
+
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
+
+                               case 2: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
+
+                               case 3: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
+
+                               case 4: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_SCALARS, &r->info4));
+                               break; }
+
+                               case 5: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_SCALARS, &r->info5));
+                               break; }
+
+                               case 6: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo6(ndr, NDR_SCALARS, &r->info6));
+                               break; }
+
+                               case 7: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_SCALARS, &r->info7));
+                               break; }
+
+                               case 8: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info8));
+                               break; }
+
+                               case 9: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_SCALARS, &r->info9));
+                               break; }
+
+                               default: {
+                               break; }
+
+                       }
+               }
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 0:
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0));
+                               break;
+
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
+
+                               case 2:
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
+
+                               case 3:
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               break;
+
+                               case 4:
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               break;
+
+                               case 5:
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5));
+                               break;
+
+                               case 6:
+                               break;
+
+                               case 7:
+                                       NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7));
+                               break;
+
+                               case 8:
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8));
+                               break;
+
+                               case 9:
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9));
+                               break;
+
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+       ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_PrinterInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrinterInfo *r)
+{
+       int level;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_PrinterInfo");
                switch (level) {
                        case 0:
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo0(ndr, NDR_BUFFERS, &r->info0));
+                               ndr_print_spoolss_PrinterInfo0(ndr, "info0", &r->info0);
                        break;
 
                        case 1:
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               ndr_print_spoolss_PrinterInfo1(ndr, "info1", &r->info1);
                        break;
 
                        case 2:
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               ndr_print_spoolss_PrinterInfo2(ndr, "info2", &r->info2);
                        break;
 
                        case 3:
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               ndr_print_spoolss_PrinterInfo3(ndr, "info3", &r->info3);
                        break;
 
                        case 4:
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               ndr_print_spoolss_PrinterInfo4(ndr, "info4", &r->info4);
                        break;
 
                        case 5:
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo5(ndr, NDR_BUFFERS, &r->info5));
+                               ndr_print_spoolss_PrinterInfo5(ndr, "info5", &r->info5);
                        break;
 
                        case 6:
+                               ndr_print_spoolss_PrinterInfo6(ndr, "info6", &r->info6);
                        break;
 
                        case 7:
-                               NDR_CHECK(ndr_pull_spoolss_PrinterInfo7(ndr, NDR_BUFFERS, &r->info7));
+                               ndr_print_spoolss_PrinterInfo7(ndr, "info7", &r->info7);
                        break;
 
                        case 8:
-                               NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info8));
+                               ndr_print_spoolss_DeviceModeInfo(ndr, "info8", &r->info8);
                        break;
 
                        case 9:
-                               NDR_CHECK(ndr_pull_spoolss_DeviceModeInfo(ndr, NDR_BUFFERS, &r->info9));
+                               ndr_print_spoolss_DeviceModeInfo(ndr, "info9", &r->info9);
                        break;
 
                        default:
                        break;
 
                }
-       }
-       ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
-       return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_spoolss_PrinterInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrinterInfo *r)
-{
-       int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_PrinterInfo");
-       switch (level) {
-               case 0:
-                       ndr_print_spoolss_PrinterInfo0(ndr, "info0", &r->info0);
-               break;
-
-               case 1:
-                       ndr_print_spoolss_PrinterInfo1(ndr, "info1", &r->info1);
-               break;
-
-               case 2:
-                       ndr_print_spoolss_PrinterInfo2(ndr, "info2", &r->info2);
-               break;
-
-               case 3:
-                       ndr_print_spoolss_PrinterInfo3(ndr, "info3", &r->info3);
-               break;
-
-               case 4:
-                       ndr_print_spoolss_PrinterInfo4(ndr, "info4", &r->info4);
-               break;
-
-               case 5:
-                       ndr_print_spoolss_PrinterInfo5(ndr, "info5", &r->info5);
-               break;
-
-               case 6:
-                       ndr_print_spoolss_PrinterInfo6(ndr, "info6", &r->info6);
-               break;
-
-               case 7:
-                       ndr_print_spoolss_PrinterInfo7(ndr, "info7", &r->info7);
-               break;
-
-               case 8:
-                       ndr_print_spoolss_DeviceModeInfo(ndr, "info8", &r->info8);
-               break;
-
-               case 9:
-                       ndr_print_spoolss_DeviceModeInfo(ndr, "info9", &r->info9);
-               break;
-
-               default:
-               break;
-
+               ndr->flags = _flags_save_UNION;
        }
 }
 
 _PUBLIC_ size_t ndr_size_spoolss_PrinterInfo(const union spoolss_PrinterInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
 {
+       flags |= LIBNDR_FLAG_RELATIVE_REVERSE;
        return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo, ic);
 }
 
@@ -3048,14 +3144,24 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n
                        NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name));
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode));
+               {
+                       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->text_status));
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc));
+               {
+                       uint32_t _flags_save_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_security_descriptor;
+               }
                NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->position));
@@ -3158,10 +3264,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->devmode) {
-                       NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode));
-                       NDR_CHECK(ndr_push_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode));
-                       NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode));
+               {
+                       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_string = ndr->flags;
@@ -3173,10 +3289,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->secdesc) {
-                       NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc));
-                       NDR_CHECK(ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                       NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc));
+               {
+                       uint32_t _flags_save_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_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_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -3319,12 +3445,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
-               if (_ptr_devmode) {
-                       NDR_PULL_ALLOC(ndr, r->devmode);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
-               } else {
-                       r->devmode = NULL;
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
+                       if (_ptr_devmode) {
+                               NDR_PULL_ALLOC(ndr, r->devmode);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
+                       } else {
+                               r->devmode = NULL;
+                       }
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
                {
                        uint32_t _flags_save_string = ndr->flags;
@@ -3338,12 +3469,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
-               if (_ptr_secdesc) {
-                       NDR_PULL_ALLOC(ndr, r->secdesc);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
-               } else {
-                       r->secdesc = NULL;
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
+                       if (_ptr_secdesc) {
+                               NDR_PULL_ALLOC(ndr, r->secdesc);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
+                       } else {
+                               r->secdesc = NULL;
+                       }
+                       ndr->flags = _flags_save_security_descriptor;
                }
                NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority));
@@ -3495,15 +3631,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->devmode) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
-                       _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
-                       NDR_CHECK(ndr_pull_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
-                       ndr->offset = _relative_save_offset;
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->devmode) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
+                               _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
+                               {
+                                       struct ndr_pull *_ndr_devmode;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1));
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
+                               ndr->offset = _relative_save_offset;
+                       }
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
                {
                        uint32_t _flags_save_string = ndr->flags;
@@ -3520,15 +3666,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->secdesc) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
-                       _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
-                       NDR_CHECK(ndr_pull_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
-                       ndr->offset = _relative_save_offset;
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->secdesc) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
+                               _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
+                               {
+                                       struct ndr_pull *_ndr_secdesc;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
+                                       NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
+                               ndr->offset = _relative_save_offset;
+                       }
+                       ndr->flags = _flags_save_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -3729,14 +3885,24 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n
                        NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name));
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->devmode));
+               {
+                       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->text_status));
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc));
+               {
+                       uint32_t _flags_save_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_security_descriptor;
+               }
                NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->position));
@@ -3840,10 +4006,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->devmode) {
-                       NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->devmode));
-                       NDR_CHECK(ndr_push_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode));
-                       NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->devmode));
+               {
+                       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_string = ndr->flags;
@@ -3855,10 +4031,20 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->secdesc) {
-                       NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc));
-                       NDR_CHECK(ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                       NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc));
+               {
+                       uint32_t _flags_save_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_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_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -4001,12 +4187,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
-               if (_ptr_devmode) {
-                       NDR_PULL_ALLOC(ndr, r->devmode);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
-               } else {
-                       r->devmode = NULL;
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_devmode));
+                       if (_ptr_devmode) {
+                               NDR_PULL_ALLOC(ndr, r->devmode);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->devmode, _ptr_devmode));
+                       } else {
+                               r->devmode = NULL;
+                       }
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
                {
                        uint32_t _flags_save_string = ndr->flags;
@@ -4020,12 +4211,17 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
-               if (_ptr_secdesc) {
-                       NDR_PULL_ALLOC(ndr, r->secdesc);
-                       NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
-               } else {
-                       r->secdesc = NULL;
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc));
+                       if (_ptr_secdesc) {
+                               NDR_PULL_ALLOC(ndr, r->secdesc);
+                               NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->secdesc, _ptr_secdesc));
+                       } else {
+                               r->secdesc = NULL;
+                       }
+                       ndr->flags = _flags_save_security_descriptor;
                }
                NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority));
@@ -4178,15 +4374,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->devmode) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
-                       _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
-                       NDR_CHECK(ndr_pull_spoolss_DeviceMode(ndr, NDR_SCALARS, r->devmode));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
-                       ndr->offset = _relative_save_offset;
+               {
+                       uint32_t _flags_save_spoolss_DeviceMode = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->devmode) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->devmode));
+                               _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
+                               {
+                                       struct ndr_pull *_ndr_devmode;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_devmode, 0, -1));
+                                       NDR_CHECK(ndr_pull_spoolss_DeviceMode(_ndr_devmode, NDR_SCALARS, r->devmode));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_devmode, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
+                               ndr->offset = _relative_save_offset;
+                       }
+                       ndr->flags = _flags_save_spoolss_DeviceMode;
                }
                {
                        uint32_t _flags_save_string = ndr->flags;
@@ -4203,15 +4409,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n
                        }
                        ndr->flags = _flags_save_string;
                }
-               if (r->secdesc) {
-                       uint32_t _relative_save_offset;
-                       _relative_save_offset = ndr->offset;
-                       NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
-                       _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
-                       NDR_CHECK(ndr_pull_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
-                       ndr->offset = _relative_save_offset;
+               {
+                       uint32_t _flags_save_security_descriptor = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
+                       if (r->secdesc) {
+                               uint32_t _relative_save_offset;
+                               _relative_save_offset = ndr->offset;
+                               NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->secdesc));
+                               _mem_save_secdesc_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, r->secdesc, 0);
+                               {
+                                       struct ndr_pull *_ndr_secdesc;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1));
+                                       NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1));
+                               }
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0);
+                               ndr->offset = _relative_save_offset;
+                       }
+                       ndr->flags = _flags_save_security_descriptor;
                }
        }
        return NDR_ERR_SUCCESS;
@@ -4316,61 +4532,66 @@ _PUBLIC_ size_t ndr_size_spoolss_JobInfo4(const struct spoolss_JobInfo4 *r, stru
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_JobInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       case 2: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
-                       case 3: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
+                               case 3: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
 
-                       case 4: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4));
-                       break; }
+                               case 4: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_push_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       case 3:
-                       break;
+                               case 3:
+                               break;
 
-                       case 4:
-                               NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4));
-                       break;
+                               case 4:
+                                       NDR_CHECK(ndr_push_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -4380,60 +4601,65 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo(struct ndr_pull *ndr, int nd
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       case 2: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
-                       case 3: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
+                               case 3: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_JobInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
 
-                       case 4: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4));
-                       break; }
+                               case 4: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_SCALARS, &r->info4));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_JobInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_pull_spoolss_JobInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       case 3:
-                       break;
+                               case 3:
+                               break;
 
-                       case 4:
-                               NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4));
-                       break;
+                               case 4:
+                                       NDR_CHECK(ndr_pull_spoolss_JobInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -4442,33 +4668,39 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo(struct ndr_pull *ndr, int nd
 _PUBLIC_ void ndr_print_spoolss_JobInfo(struct ndr_print *ndr, const char *name, const union spoolss_JobInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_JobInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_JobInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_JobInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_JobInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               case 2:
-                       ndr_print_spoolss_JobInfo2(ndr, "info2", &r->info2);
-               break;
+                       case 2:
+                               ndr_print_spoolss_JobInfo2(ndr, "info2", &r->info2);
+                       break;
 
-               case 3:
-                       ndr_print_spoolss_JobInfo3(ndr, "info3", &r->info3);
-               break;
+                       case 3:
+                               ndr_print_spoolss_JobInfo3(ndr, "info3", &r->info3);
+                       break;
 
-               case 4:
-                       ndr_print_spoolss_JobInfo4(ndr, "info4", &r->info4);
-               break;
+                       case 4:
+                               ndr_print_spoolss_JobInfo4(ndr, "info4", &r->info4);
+                       break;
 
-               default:
-               break;
+                       default:
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
 _PUBLIC_ size_t ndr_size_spoolss_JobInfo(const union spoolss_JobInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
 {
+       flags |= LIBNDR_FLAG_RELATIVE_REVERSE;
        return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_JobInfo, ic);
 }
 
@@ -13578,120 +13810,125 @@ _PUBLIC_ void ndr_print_spoolss_DriverInfo101(struct ndr_print *ndr, const char
        if (r->hardware_id) {
                ndr_print_string(ndr, "hardware_id", r->hardware_id);
        }
-       ndr->depth--;
-       ndr_print_ptr(ndr, "provider", r->provider);
-       ndr->depth++;
-       if (r->provider) {
-               ndr_print_string(ndr, "provider", r->provider);
-       }
-       ndr->depth--;
-       ndr->depth--;
-}
-
-_PUBLIC_ size_t ndr_size_spoolss_DriverInfo101(const struct spoolss_DriverInfo101 *r, struct smb_iconv_convenience *ic, int flags)
-{
-       return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_DriverInfo101, ic);
-}
-
-_PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_DriverInfo *r)
-{
-       uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
-
-                       case 2: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
-
-                       case 3: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
-
-                       case 4: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4));
-                       break; }
-
-                       case 5: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5));
-                       break; }
-
-                       case 6: {
-                               NDR_CHECK(ndr_push_align(ndr, 8));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6));
-                       break; }
-
-                       case 8: {
-                               NDR_CHECK(ndr_push_align(ndr, 8));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8));
-                       break; }
-
-                       case 101: {
-                               NDR_CHECK(ndr_push_align(ndr, 8));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101));
-                       break; }
-
-                       default: {
-                       break; }
-
-               }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
-
-                       case 2:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
-
-                       case 3:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3));
-                       break;
-
-                       case 4:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4));
-                       break;
-
-                       case 5:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5));
-                       break;
-
-                       case 6:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6));
-                       break;
-
-                       case 8:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8));
-                       break;
-
-                       case 101:
-                               NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101));
-                       break;
+       ndr->depth--;
+       ndr_print_ptr(ndr, "provider", r->provider);
+       ndr->depth++;
+       if (r->provider) {
+               ndr_print_string(ndr, "provider", r->provider);
+       }
+       ndr->depth--;
+       ndr->depth--;
+}
 
-                       default:
-                       break;
+_PUBLIC_ size_t ndr_size_spoolss_DriverInfo101(const struct spoolss_DriverInfo101 *r, struct smb_iconv_convenience *ic, int flags)
+{
+       return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_DriverInfo101, ic);
+}
 
-               }
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_DriverInfo *r)
+{
+       uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
+
+                               case 2: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
+
+                               case 3: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
+
+                               case 4: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4));
+                               break; }
+
+                               case 5: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5));
+                               break; }
+
+                               case 6: {
+                                       NDR_CHECK(ndr_push_align(ndr, 8));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6));
+                               break; }
+
+                               case 8: {
+                                       NDR_CHECK(ndr_push_align(ndr, 8));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8));
+                               break; }
+
+                               case 101: {
+                                       NDR_CHECK(ndr_push_align(ndr, 8));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101));
+                               break; }
+
+                               default: {
+                               break; }
+
+                       }
+               }
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
+
+                               case 2:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
+
+                               case 3:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               break;
+
+                               case 4:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               break;
+
+                               case 5:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5));
+                               break;
+
+                               case 6:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6));
+                               break;
+
+                               case 8:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8));
+                               break;
+
+                               case 101:
+                                       NDR_CHECK(ndr_push_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101));
+                               break;
+
+                               default:
+                               break;
+
+                       }
+               }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -13701,152 +13938,163 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo(struct ndr_pull *ndr, int
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
-
-                       case 2: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
-
-                       case 3: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
-
-                       case 4: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4));
-                       break; }
-
-                       case 5: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5));
-                       break; }
-
-                       case 6: {
-                               NDR_CHECK(ndr_pull_align(ndr, 8));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6));
-                       break; }
-
-                       case 8: {
-                               NDR_CHECK(ndr_pull_align(ndr, 8));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8));
-                       break; }
-
-                       case 101: {
-                               NDR_CHECK(ndr_pull_align(ndr, 8));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101));
-                       break; }
-
-                       default: {
-                       break; }
-
-               }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
+
+                               case 2: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
+
+                               case 3: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
+
+                               case 4: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_SCALARS, &r->info4));
+                               break; }
+
+                               case 5: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_SCALARS, &r->info5));
+                               break; }
+
+                               case 6: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 8));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_SCALARS, &r->info6));
+                               break; }
+
+                               case 8: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 8));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_SCALARS, &r->info8));
+                               break; }
+
+                               case 101: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 8));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_SCALARS, &r->info101));
+                               break; }
+
+                               default: {
+                               break; }
+
+                       }
+               }
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
+
+                               case 2:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
+
+                               case 3:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               break;
+
+                               case 4:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               break;
+
+                               case 5:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5));
+                               break;
+
+                               case 6:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6));
+                               break;
+
+                               case 8:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8));
+                               break;
+
+                               case 101:
+                                       NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101));
+                               break;
+
+                               default:
+                               break;
+
+                       }
+               }
+               ndr->flags = _flags_save_UNION;
        }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+       ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DriverInfo(struct ndr_print *ndr, const char *name, const union spoolss_DriverInfo *r)
+{
+       int level;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_DriverInfo");
                switch (level) {
                        case 1:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               ndr_print_spoolss_DriverInfo1(ndr, "info1", &r->info1);
                        break;
 
                        case 2:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               ndr_print_spoolss_DriverInfo2(ndr, "info2", &r->info2);
                        break;
 
                        case 3:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               ndr_print_spoolss_DriverInfo3(ndr, "info3", &r->info3);
                        break;
 
                        case 4:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               ndr_print_spoolss_DriverInfo4(ndr, "info4", &r->info4);
                        break;
 
                        case 5:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo5(ndr, NDR_BUFFERS, &r->info5));
+                               ndr_print_spoolss_DriverInfo5(ndr, "info5", &r->info5);
                        break;
 
                        case 6:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo6(ndr, NDR_BUFFERS, &r->info6));
+                               ndr_print_spoolss_DriverInfo6(ndr, "info6", &r->info6);
                        break;
 
                        case 8:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo8(ndr, NDR_BUFFERS, &r->info8));
+                               ndr_print_spoolss_DriverInfo8(ndr, "info8", &r->info8);
                        break;
 
                        case 101:
-                               NDR_CHECK(ndr_pull_spoolss_DriverInfo101(ndr, NDR_BUFFERS, &r->info101));
+                               ndr_print_spoolss_DriverInfo101(ndr, "info101", &r->info101);
                        break;
 
                        default:
                        break;
 
                }
-       }
-       ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
-       return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_spoolss_DriverInfo(struct ndr_print *ndr, const char *name, const union spoolss_DriverInfo *r)
-{
-       int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_DriverInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_DriverInfo1(ndr, "info1", &r->info1);
-               break;
-
-               case 2:
-                       ndr_print_spoolss_DriverInfo2(ndr, "info2", &r->info2);
-               break;
-
-               case 3:
-                       ndr_print_spoolss_DriverInfo3(ndr, "info3", &r->info3);
-               break;
-
-               case 4:
-                       ndr_print_spoolss_DriverInfo4(ndr, "info4", &r->info4);
-               break;
-
-               case 5:
-                       ndr_print_spoolss_DriverInfo5(ndr, "info5", &r->info5);
-               break;
-
-               case 6:
-                       ndr_print_spoolss_DriverInfo6(ndr, "info6", &r->info6);
-               break;
-
-               case 8:
-                       ndr_print_spoolss_DriverInfo8(ndr, "info8", &r->info8);
-               break;
-
-               case 101:
-                       ndr_print_spoolss_DriverInfo101(ndr, "info101", &r->info101);
-               break;
-
-               default:
-               break;
-
+               ndr->flags = _flags_save_UNION;
        }
 }
 
 _PUBLIC_ size_t ndr_size_spoolss_DriverInfo(const union spoolss_DriverInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
 {
+       flags |= LIBNDR_FLAG_RELATIVE_REVERSE;
        return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_DriverInfo, ic);
 }
 
@@ -13898,34 +14146,39 @@ _PUBLIC_ size_t ndr_size_spoolss_DriverDirectoryInfo1(const struct spoolss_Drive
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverDirectoryInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_DriverDirectoryInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+                               default: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -13935,33 +14188,38 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverDirectoryInfo(struct ndr_pull
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+                               default: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_DriverDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -13970,22 +14228,28 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverDirectoryInfo(struct ndr_pull
 _PUBLIC_ void ndr_print_spoolss_DriverDirectoryInfo(struct ndr_print *ndr, const char *name, const union spoolss_DriverDirectoryInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_DriverDirectoryInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_DriverDirectoryInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               default:
-                       ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1);
-               break;
+                       default:
+                               ndr_print_spoolss_DriverDirectoryInfo1(ndr, "info1", &r->info1);
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
 _PUBLIC_ size_t ndr_size_spoolss_DriverDirectoryInfo(const union spoolss_DriverDirectoryInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
 {
+       flags |= LIBNDR_FLAG_RELATIVE_REVERSE;
        return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_DriverDirectoryInfo, ic);
 }
 
@@ -14075,32 +14339,37 @@ _PUBLIC_ size_t ndr_size_spoolss_PrintProcessorInfo1(const struct spoolss_PrintP
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrintProcessorInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -14110,31 +14379,36 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorInfo(struct ndr_pull *
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_PrintProcessorInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -14143,16 +14417,21 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorInfo(struct ndr_pull *
 _PUBLIC_ void ndr_print_spoolss_PrintProcessorInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrintProcessorInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_PrintProcessorInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_PrintProcessorInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_PrintProcessorInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_PrintProcessorInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               default:
-               break;
+                       default:
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
@@ -14204,34 +14483,39 @@ _PUBLIC_ size_t ndr_size_spoolss_PrintProcessorDirectoryInfo1(const struct spool
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorDirectoryInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrintProcessorDirectoryInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+                               default: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -14241,33 +14525,38 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorDirectoryInfo(struct n
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+                               default: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -14276,22 +14565,28 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorDirectoryInfo(struct n
 _PUBLIC_ void ndr_print_spoolss_PrintProcessorDirectoryInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrintProcessorDirectoryInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_PrintProcessorDirectoryInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_PrintProcessorDirectoryInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               default:
-                       ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1);
-               break;
+                       default:
+                               ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1);
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
 _PUBLIC_ size_t ndr_size_spoolss_PrintProcessorDirectoryInfo(const union spoolss_PrintProcessorDirectoryInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
 {
+       flags |= LIBNDR_FLAG_RELATIVE_REVERSE;
        return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrintProcessorDirectoryInfo, ic);
 }
 
@@ -15353,45 +15648,50 @@ _PUBLIC_ size_t ndr_size_spoolss_FormInfo2(const struct spoolss_FormInfo2 *r, st
        return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_FormInfo2, ic);
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_FormInfo *r)
-{
-       uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
-
-                       case 2: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_FormInfo *r)
+{
+       uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
+                               default: {
+                               break; }
+
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_push_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -15401,41 +15701,46 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo(struct ndr_pull *ndr, int n
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       case 2: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_FormInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_pull_spoolss_FormInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -15444,25 +15749,31 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo(struct ndr_pull *ndr, int n
 _PUBLIC_ void ndr_print_spoolss_FormInfo(struct ndr_print *ndr, const char *name, const union spoolss_FormInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_FormInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_FormInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_FormInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_FormInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               case 2:
-                       ndr_print_spoolss_FormInfo2(ndr, "info2", &r->info2);
-               break;
+                       case 2:
+                               ndr_print_spoolss_FormInfo2(ndr, "info2", &r->info2);
+                       break;
 
-               default:
-               break;
+                       default:
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
 _PUBLIC_ size_t ndr_size_spoolss_FormInfo(const union spoolss_FormInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
 {
+       flags |= LIBNDR_FLAG_RELATIVE_REVERSE;
        return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_FormInfo, ic);
 }
 
@@ -16384,62 +16695,67 @@ _PUBLIC_ size_t ndr_size_spoolss_PortInfoFF(const struct spoolss_PortInfoFF *r,
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PortInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       case 2: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
-                       case 3: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
+                               case 3: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
 
-                       case 0xff: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF));
-                       break; }
+                               case 0xff: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_push_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       case 3:
-                               NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3));
-                       break;
+                               case 3:
+                                       NDR_CHECK(ndr_push_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               break;
 
-                       case 0xff:
-                               NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF));
-                       break;
+                               case 0xff:
+                                       NDR_CHECK(ndr_push_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -16449,61 +16765,66 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo(struct ndr_pull *ndr, int n
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       case 2: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
-                       case 3: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3));
-                       break; }
+                               case 3: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_SCALARS, &r->info3));
+                               break; }
 
-                       case 0xff: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF));
-                       break; }
+                               case 0xff: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_SCALARS, &r->infoFF));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       case 3:
-                               NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3));
-                       break;
+                               case 3:
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfo3(ndr, NDR_BUFFERS, &r->info3));
+                               break;
 
-                       case 0xff:
-                               NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF));
-                       break;
+                               case 0xff:
+                                       NDR_CHECK(ndr_pull_spoolss_PortInfoFF(ndr, NDR_BUFFERS, &r->infoFF));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -16512,28 +16833,33 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo(struct ndr_pull *ndr, int n
 _PUBLIC_ void ndr_print_spoolss_PortInfo(struct ndr_print *ndr, const char *name, const union spoolss_PortInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_PortInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_PortInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_PortInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_PortInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               case 2:
-                       ndr_print_spoolss_PortInfo2(ndr, "info2", &r->info2);
-               break;
+                       case 2:
+                               ndr_print_spoolss_PortInfo2(ndr, "info2", &r->info2);
+                       break;
 
-               case 3:
-                       ndr_print_spoolss_PortInfo3(ndr, "info3", &r->info3);
-               break;
+                       case 3:
+                               ndr_print_spoolss_PortInfo3(ndr, "info3", &r->info3);
+                       break;
 
-               case 0xff:
-                       ndr_print_spoolss_PortInfoFF(ndr, "infoFF", &r->infoFF);
-               break;
+                       case 0xff:
+                               ndr_print_spoolss_PortInfoFF(ndr, "infoFF", &r->infoFF);
+                       break;
 
-               default:
-               break;
+                       default:
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
@@ -16808,42 +17134,47 @@ _PUBLIC_ size_t ndr_size_spoolss_MonitorInfo2(const struct spoolss_MonitorInfo2
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_MonitorInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       case 2: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_push_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -16853,41 +17184,46 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo(struct ndr_pull *ndr, in
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       case 2: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2));
-                       break; }
+                               case 2: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_SCALARS, &r->info2));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_MonitorInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       case 2:
-                               NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2));
-                       break;
+                               case 2:
+                                       NDR_CHECK(ndr_pull_spoolss_MonitorInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -16896,20 +17232,25 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo(struct ndr_pull *ndr, in
 _PUBLIC_ void ndr_print_spoolss_MonitorInfo(struct ndr_print *ndr, const char *name, const union spoolss_MonitorInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_MonitorInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_MonitorInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_MonitorInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_MonitorInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               case 2:
-                       ndr_print_spoolss_MonitorInfo2(ndr, "info2", &r->info2);
-               break;
+                       case 2:
+                               ndr_print_spoolss_MonitorInfo2(ndr, "info2", &r->info2);
+                       break;
 
-               default:
-               break;
+                       default:
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
@@ -16999,32 +17340,37 @@ _PUBLIC_ size_t ndr_size_spoolss_PrintProcDataTypesInfo1(const struct spoolss_Pr
 _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcDataTypesInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrintProcDataTypesInfo *r)
 {
        uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
-       if (ndr_flags & NDR_SCALARS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_push_align(ndr, 4));
-                               NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               if (ndr_flags & NDR_SCALARS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_push_align(ndr, 4));
+                                       NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               int level = ndr_push_get_switch_value(ndr, r);
-               NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       int level = ndr_push_get_switch_value(ndr, r);
+                       NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_push_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_push_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -17034,31 +17380,36 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcDataTypesInfo(struct ndr_pu
 {
        uint32_t _save_relative_base_offset = ndr_pull_get_relative_base_offset(ndr);
        int level;
-       level = ndr_pull_get_switch_value(ndr, r);
-       if (ndr_flags & NDR_SCALARS) {
-               switch (level) {
-                       case 1: {
-                               NDR_CHECK(ndr_pull_align(ndr, 4));
-                               NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
-                               NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1));
-                       break; }
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_pull_get_switch_value(ndr, r);
+               if (ndr_flags & NDR_SCALARS) {
+                       switch (level) {
+                               case 1: {
+                                       NDR_CHECK(ndr_pull_align(ndr, 4));
+                                       NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset));
+                                       NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_SCALARS, &r->info1));
+                               break; }
 
-                       default: {
-                       break; }
+                               default: {
+                               break; }
 
+                       }
                }
-       }
-       if (ndr_flags & NDR_BUFFERS) {
-               NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
-               switch (level) {
-                       case 1:
-                               NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1));
-                       break;
+               if (ndr_flags & NDR_BUFFERS) {
+                       NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r));
+                       switch (level) {
+                               case 1:
+                                       NDR_CHECK(ndr_pull_spoolss_PrintProcDataTypesInfo1(ndr, NDR_BUFFERS, &r->info1));
+                               break;
 
-                       default:
-                       break;
+                               default:
+                               break;
 
+                       }
                }
+               ndr->flags = _flags_save_UNION;
        }
        ndr_pull_restore_relative_base_offset(ndr, _save_relative_base_offset);
        return NDR_ERR_SUCCESS;
@@ -17067,16 +17418,21 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcDataTypesInfo(struct ndr_pu
 _PUBLIC_ void ndr_print_spoolss_PrintProcDataTypesInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrintProcDataTypesInfo *r)
 {
        int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "spoolss_PrintProcDataTypesInfo");
-       switch (level) {
-               case 1:
-                       ndr_print_spoolss_PrintProcDataTypesInfo1(ndr, "info1", &r->info1);
-               break;
+       {
+               uint32_t _flags_save_UNION = ndr->flags;
+               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_RELATIVE_REVERSE);
+               level = ndr_print_get_switch_value(ndr, r);
+               ndr_print_union(ndr, name, level, "spoolss_PrintProcDataTypesInfo");
+               switch (level) {
+                       case 1:
+                               ndr_print_spoolss_PrintProcDataTypesInfo1(ndr, "info1", &r->info1);
+                       break;
 
-               default:
-               break;
+                       default:
+                       break;
 
+               }
+               ndr->flags = _flags_save_UNION;
        }
 }
 
index 1b94124033abd1e593c02f2a3bd603a6adc94b22..00f89b667e27404e062efefdcf86844839ff3b4d 100644 (file)
@@ -211,6 +211,8 @@ void ndr_print_spoolss_ProcessorArchitecture(struct ndr_print *ndr, const char *
 void ndr_print_spoolss_ProcessorType(struct ndr_print *ndr, const char *name, enum spoolss_ProcessorType r);
 void ndr_print_spoolss_MajorVersion(struct ndr_print *ndr, const char *name, enum spoolss_MajorVersion r);
 void ndr_print_spoolss_MinorVersion(struct ndr_print *ndr, const char *name, enum spoolss_MinorVersion r);
+enum ndr_err_code ndr_push_spoolss_PrinterStatus(struct ndr_push *ndr, int ndr_flags, uint32_t r);
+enum ndr_err_code ndr_pull_spoolss_PrinterStatus(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
 void ndr_print_spoolss_PrinterStatus(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_spoolss_JobStatus(struct ndr_print *ndr, const char *name, uint32_t r);
 enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo0 *r);
@@ -229,6 +231,8 @@ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, int ndr_fl
 enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo1 *r);
 void ndr_print_spoolss_PrinterInfo1(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo1 *r);
 size_t ndr_size_spoolss_PrinterInfo1(const struct spoolss_PrinterInfo1 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_PrinterAttributes(struct ndr_push *ndr, int ndr_flags, uint32_t r);
+enum ndr_err_code ndr_pull_spoolss_PrinterAttributes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
 void ndr_print_spoolss_PrinterAttributes(struct ndr_print *ndr, const char *name, uint32_t r);
 enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo2 *r);
 enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo2 *r);
index bd63485c78b2a614ef09edab50e67640721f9cb2..f3466979a32e39ef01c209c90239f95bc77d4de9 100644 (file)
@@ -329,12 +329,12 @@ struct spoolss_PrinterInfo2 {
        const char * drivername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * location;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0)] */
+       struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
        const char * sepfile;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       struct security_descriptor *secdesc;/* [relative,subcontext(0)] */
+       struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
        uint32_t attributes;
        uint32_t priority;/* [range(0,99)] */
        uint32_t defaultpriority;
@@ -346,7 +346,7 @@ struct spoolss_PrinterInfo2 {
 }/* [gensize,public] */;
 
 struct spoolss_PrinterInfo3 {
-       struct security_descriptor *secdesc;/* [relative,subcontext(0)] */
+       struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
 }/* [gensize,public] */;
 
 struct spoolss_PrinterInfo4 {
@@ -380,7 +380,7 @@ struct spoolss_PrinterInfo7 {
 }/* [gensize,public] */;
 
 struct spoolss_DeviceModeInfo {
-       struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0)] */
+       struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
 };
 
 union spoolss_PrinterInfo {
@@ -394,7 +394,7 @@ union spoolss_PrinterInfo {
        struct spoolss_PrinterInfo7 info7;/* [case(7)] */
        struct spoolss_DeviceModeInfo info8;/* [case(8)] */
        struct spoolss_DeviceModeInfo info9;/* [case(9)] */
-}/* [relative_base,gensize,public,nodiscriminant] */;
+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_DevmodeContainer {
        uint32_t _ndr_size;/* [value(_ndr_size_spoolss_DeviceMode(devmode,ndr->iconv_convenience,ndr->flags))] */
@@ -428,9 +428,9 @@ struct spoolss_JobInfo2 {
        const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       struct spoolss_DeviceMode *devmode;/* [relative] */
+       struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
        const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       struct security_descriptor *secdesc;/* [relative] */
+       struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
        uint32_t status;
        uint32_t priority;/* [range(0,99)] */
        uint32_t position;
@@ -460,9 +460,9 @@ struct spoolss_JobInfo4 {
        const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       struct spoolss_DeviceMode *devmode;/* [relative] */
+       struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
        const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       struct security_descriptor *secdesc;/* [relative] */
+       struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
        uint32_t status;
        uint32_t priority;/* [range(0,99)] */
        uint32_t position;
@@ -481,7 +481,7 @@ union spoolss_JobInfo {
        struct spoolss_JobInfo2 info2;/* [case(2)] */
        struct spoolss_JobInfo3 info3;/* [case(3)] */
        struct spoolss_JobInfo4 info4;/* [case(4)] */
-}/* [relative_base,gensize,public,nodiscriminant] */;
+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_SetJobInfo1 {
        uint32_t job_id;
@@ -1017,7 +1017,7 @@ union spoolss_DriverInfo {
        struct spoolss_DriverInfo6 info6;/* [case(6)] */
        struct spoolss_DriverInfo8 info8;/* [case(8)] */
        struct spoolss_DriverInfo101 info101;/* [case(101)] */
-}/* [relative_base,gensize,public,nodiscriminant] */;
+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_DriverDirectoryInfo1 {
        const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -1025,7 +1025,7 @@ struct spoolss_DriverDirectoryInfo1 {
 
 union spoolss_DriverDirectoryInfo {
        struct spoolss_DriverDirectoryInfo1 info1;/* [case] */
-}/* [gensize,relative_base,nodiscriminant,public] */;
+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_PrintProcessorInfo1 {
        const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -1033,7 +1033,7 @@ struct spoolss_PrintProcessorInfo1 {
 
 union spoolss_PrintProcessorInfo {
        struct spoolss_PrintProcessorInfo1 info1;/* [case] */
-}/* [relative_base,nodiscriminant,public] */;
+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_PrintProcessorDirectoryInfo1 {
        const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -1041,7 +1041,7 @@ struct spoolss_PrintProcessorDirectoryInfo1 {
 
 union spoolss_PrintProcessorDirectoryInfo {
        struct spoolss_PrintProcessorDirectoryInfo1 info1;/* [case] */
-}/* [gensize,relative_base,nodiscriminant,public] */;
+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_DocumentInfo1 {
        const char *document_name;/* [unique,charset(UTF16)] */
@@ -1136,7 +1136,7 @@ struct spoolss_FormInfo2 {
 union spoolss_FormInfo {
        struct spoolss_FormInfo1 info1;/* [case] */
        struct spoolss_FormInfo2 info2;/* [case(2)] */
-}/* [relative_base,gensize,public,nodiscriminant] */;
+}/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_AddFormInfo1 {
        enum spoolss_FormFlags flags;
@@ -1247,7 +1247,7 @@ union spoolss_PortInfo {
        struct spoolss_PortInfo2 info2;/* [case(2)] */
        struct spoolss_PortInfo3 info3;/* [case(3)] */
        struct spoolss_PortInfoFF infoFF;/* [case(0xff)] */
-}/* [relative_base,nodiscriminant,public] */;
+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_MonitorInfo1 {
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -1262,7 +1262,7 @@ struct spoolss_MonitorInfo2 {
 union spoolss_MonitorInfo {
        struct spoolss_MonitorInfo1 info1;/* [case] */
        struct spoolss_MonitorInfo2 info2;/* [case(2)] */
-}/* [relative_base,nodiscriminant,public] */;
+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 struct spoolss_PrintProcDataTypesInfo1 {
        const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -1270,7 +1270,7 @@ struct spoolss_PrintProcDataTypesInfo1 {
 
 union spoolss_PrintProcDataTypesInfo {
        struct spoolss_PrintProcDataTypesInfo1 info1;/* [case] */
-}/* [relative_base,nodiscriminant,public] */;
+}/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */;
 
 /* bitmap spoolss_PrinterChangeFlags */
 #define PRINTER_CHANGE_ADD_PRINTER ( 0x00000001 )