s3-spoolss: move PRINTER_ENUM_ICONMASK to IDL.

Guenther

diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index cfb802f7fb3cc2281801da30294194b848f42f4b..ddf514a08a349179fe359862b5e214598d1a4839 100644 (file)
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -8,6 +8,7 @@
 #ifndef _HEADER_spoolss
 #define _HEADER_spoolss
 
+#define PRINTER_ENUM_ICONMASK  ( (PRINTER_ENUM_ICON1|PRINTER_ENUM_ICON2|PRINTER_ENUM_ICON3|PRINTER_ENUM_ICON4|PRINTER_ENUM_ICON5|PRINTER_ENUM_ICON6|PRINTER_ENUM_ICON7|PRINTER_ENUM_ICON8) )
 #define SPOOLSS_ARCHITECTURE_NT_X86    ( "Windows NT x86" )
 #define SERVER_ALL_ACCESS      ( SEC_STD_REQUIRED|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE )
 #define SERVER_READ    ( SEC_STD_READ_CONTROL|SERVER_ACCESS_ENUMERATE )

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index e9705c60613287328048487992e5501601487ce4..09646c9d67e0823cec92ccd3e2baf11fe97ec665 100644 (file)
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -117,6 +117,15 @@ import "misc.idl", "security.idl", "winreg.idl";
                PRINTER_ENUM_HIDE        = 0x01000000
        } spoolss_EnumPrinterFlags;
 
+       const int PRINTER_ENUM_ICONMASK = (PRINTER_ENUM_ICON1 |
+                                          PRINTER_ENUM_ICON2 |
+                                          PRINTER_ENUM_ICON3 |
+                                          PRINTER_ENUM_ICON4 |
+                                          PRINTER_ENUM_ICON5 |
+                                          PRINTER_ENUM_ICON6 |
+                                          PRINTER_ENUM_ICON7 |
+                                          PRINTER_ENUM_ICON8); /* 0x00ff0000 */
+
        typedef struct {
                spoolss_EnumPrinterFlags flags;
                [relative] nstring *name;

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 4aa51b26746e3692be234696e4d3b9401a82524e..feabd3fff7ad85fe34ec30a85b84490ad44b1dac 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -266,7 +266,6 @@ PRINTER_MESSAGE_INFO;
 #define DEF_PRIORITY    1
 
 /* the flags of each printers */
-#define PRINTER_ENUM_ICONMASK          0x00ff0000
 
 #define DRIVER_ANY_VERSION             0xffffffff
 #define DRIVER_MAX_VERSION             4