summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2000-07-06 07:00:24 +0000
committerTim Potter <tpot@samba.org>2000-07-06 07:00:24 +0000
commit34abda02dd2bcc1cd271edc369e9f172b566efaf (patch)
treede7cfcb91fc4f0321a7c664b847d8e75722c5c9e
parentf1ccd14b424e4edca000850800905d9e7d3a83b7 (diff)
downloadsamba-34abda02dd2bcc1cd271edc369e9f172b566efaf.tar.gz
samba-34abda02dd2bcc1cd271edc369e9f172b566efaf.tar.bz2
samba-34abda02dd2bcc1cd271edc369e9f172b566efaf.zip
Moved printer ACE mask values from nt_printing.h to rpc_spoolss.h
(This used to be commit 9245af1ea18babae09a92af634428a63ec55438e)
-rw-r--r--source3/include/nt_printing.h7
-rwxr-xr-xsource3/include/rpc_spoolss.h8
2 files changed, 6 insertions, 9 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index fbeab7873c..9282367885 100644
--- 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 c44aad8347..5cd2058045 100755
--- 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