s3: re-run make samba3-idl.

Guenther
(cherry picked from commit baeee974495d1be18c61f74ce49a93cd02eac538)

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 2085fa34771d9a9be923b8f32dd99a57d359f54e..d4195e4ae4e24d7570ddd62d19d27d334e99ee6a 100644 (file)
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -8372,6 +8372,28 @@ _PUBLIC_ void ndr_print_spoolss_AddDriverInfo4(struct ndr_print *ndr, const char
        ndr->depth--;
 }
 
+static enum ndr_err_code ndr_push_spoolss_DriverAttributes(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_DriverAttributes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+       uint32_t v;
+       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       *r = v;
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DriverAttributes(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+       ndr_print_uint32(ndr, name, r);
+       ndr->depth++;
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "PRINTER_DRIVER_PACKAGE_AWARE", PRINTER_DRIVER_PACKAGE_AWARE, r);
+       ndr->depth--;
+}
+
 static enum ndr_err_code ndr_push_spoolss_AddDriverInfo6(struct ndr_push *ndr, int ndr_flags, const struct spoolss_AddDriverInfo6 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
@@ -11255,7 +11277,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in
                        NDR_CHECK(ndr_push_relative_ptr1(ndr, r->config_file));
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->driver_attributes));
+               NDR_CHECK(ndr_push_spoolss_DriverAttributes(ndr, NDR_SCALARS, r->driver_attributes));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->config_version));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->driver_version));
        }
@@ -11384,7 +11406,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in
                        }
                        ndr->flags = _flags_save_string;
                }
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->driver_attributes));
+               NDR_CHECK(ndr_pull_spoolss_DriverAttributes(ndr, NDR_SCALARS, &r->driver_attributes));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->config_version));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->driver_version));
        }
@@ -11503,7 +11525,7 @@ _PUBLIC_ void ndr_print_spoolss_DriverInfo5(struct ndr_print *ndr, const char *n
                ndr_print_string(ndr, "config_file", r->config_file);
        }
        ndr->depth--;
-       ndr_print_uint32(ndr, "driver_attributes", r->driver_attributes);
+       ndr_print_spoolss_DriverAttributes(ndr, "driver_attributes", r->driver_attributes);
        ndr_print_uint32(ndr, "config_version", r->config_version);
        ndr_print_uint32(ndr, "driver_version", r->driver_version);
        ndr->depth--;

diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index 0feb4a2c5e3420a796931346584bff9ac968be28..204aad85a529d9d37b520dd08d71e6005b5a0800 100644 (file)
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -310,6 +310,7 @@ void ndr_print_spoolss_DriverOSVersion(struct ndr_print *ndr, const char *name,
 void ndr_print_spoolss_AddDriverInfo2(struct ndr_print *ndr, const char *name, const struct spoolss_AddDriverInfo2 *r);
 void ndr_print_spoolss_AddDriverInfo3(struct ndr_print *ndr, const char *name, const struct spoolss_AddDriverInfo3 *r);
 void ndr_print_spoolss_AddDriverInfo4(struct ndr_print *ndr, const char *name, const struct spoolss_AddDriverInfo4 *r);
+void ndr_print_spoolss_DriverAttributes(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_spoolss_AddDriverInfo6(struct ndr_print *ndr, const char *name, const struct spoolss_AddDriverInfo6 *r);
 void ndr_print_spoolss_AddDriverInfo8(struct ndr_print *ndr, const char *name, const struct spoolss_AddDriverInfo8 *r);
 void ndr_print_spoolss_AddDriverInfo(struct ndr_print *ndr, const char *name, const union spoolss_AddDriverInfo *r);

diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index f9f34cbdbbe8c784ed327e3b4aabbb38ae39cadc..abd8300d0e52ac1cd9860b80986e766f697327ba 100644 (file)
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -775,6 +775,9 @@ struct spoolss_AddDriverInfo4 {
        struct spoolss_StringArray *previous_names;/* [unique] */
 };
 
+/* bitmap spoolss_DriverAttributes */
+#define PRINTER_DRIVER_PACKAGE_AWARE ( 0x00000002 )
+
 struct spoolss_AddDriverInfo5 {
        enum spoolss_DriverOSVersion version;
        const char *driver_name;/* [unique,charset(UTF16)] */