Moved printer ACE mask values from nt_printing.h to rpc_spoolss.h

(This used to be commit 9245af1ea18babae09a92af634428a63ec55438e)

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index fbeab7873ca6cbf758efea09d9410b14e64c4fdf..9282367885bb3cc4b3f0512f1c50de672d8e4074 100644 (file)
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -133,13 +133,6 @@
 #define COLLATE_FALSE  0
 #define COLLATE_TRUE   1
 
-/* Printer permissions ACE settings */
-
-#define PRINTER_ACE_FULL_CONTROL      GENERIC_ALL_ACCESS
-#define PRINTER_ACE_MANAGE_DOCUMENTS  READ_CONTROL_ACCESS
-#define PRINTER_ACE_PRINT             \
-    (GENERIC_READ_ACCESS | GENERIC_WRITE_ACCESS | GENERIC_EXECUTE_ACCESS)
-
 typedef struct nt_printer_driver_info_level_3
 {
        uint32 cversion;

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index c44aad834729f7de59b638637f2ac381e15d032f..5cd205804572921a72ca92c9dac2414b3af5964e 100755 (executable)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -144,6 +144,12 @@
 
 #define PRINTER_STATUS_POWER_SAVE      0x01000000
 
+/* Printer permissions ACE settings */
+
+#define PRINTER_ACE_FULL_CONTROL      GENERIC_ALL_ACCESS
+#define PRINTER_ACE_MANAGE_DOCUMENTS  READ_CONTROL_ACCESS
+#define PRINTER_ACE_PRINT             \
+    (GENERIC_READ_ACCESS | GENERIC_WRITE_ACCESS | GENERIC_EXECUTE_ACCESS)
 
 #define SERVER_ACCESS_ADMINISTER       0x00000001
 #define SERVER_ACCESS_ENUMERATE                0x00000002
@@ -151,8 +157,6 @@
 #define PRINTER_ACCESS_USE             0x00000008
 #define JOB_ACCESS_ADMINISTER          0x00000010
 
-#define PRINTER_MANAGE_DOCUMENTS       0x10000000 /* i think dis right ... */
-
 #define STANDARD_RIGHTS_READ           0x00020000
 #define STANDARD_RIGHTS_WRITE          STANDARD_RIGHTS_READ
 #define STANDARD_RIGHTS_EXECUTE                STANDARD_RIGHTS_READ