security descs in spoolss. needs parse_sec.c nttrans.c broken.

(This used to be commit f9f2a04fdb7b2af1cfe5bf26ec6f0d955ea948b9)

1 files changed, 19 insertions, 9 deletions

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 504bc11ff0..67005b9d1b 100755
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -151,6 +151,8 @@
 #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
@@ -779,7 +781,7 @@ typedef struct printer_info_2
 	UNISTR printprocessor;
 	UNISTR datatype;
 	UNISTR parameters;
-	/*SECURITY_DESCRIPTOR securitydescriptor; */
+	SEC_DESC *secdesc;
 	uint32 attributes;
 	uint32 priority;
 	uint32 defaultpriority;
@@ -791,6 +793,13 @@ typedef struct printer_info_2
 }
 PRINTER_INFO_2;
 
+typedef struct printer_info_3
+{
+	uint32 flags;
+	SEC_DESC sec;
+}
+PRINTER_INFO_3;
+
 typedef struct spool_q_enumprinters
 {
 	uint32 flags;
@@ -807,6 +816,7 @@ typedef struct printer_info_ctr_info
 	PRINTER_INFO_0 *printers_0;
 	PRINTER_INFO_1 *printers_1;
 	PRINTER_INFO_2 *printers_2;
+	PRINTER_INFO_3 *printers_3;
 }
 PRINTER_INFO_CTR;
 
@@ -1237,12 +1247,19 @@ typedef struct spool_printer_info_level_2
 }
 SPOOL_PRINTER_INFO_LEVEL_2;
 
+typedef struct spool_printer_info_level_3
+{
+	uint32 secdesc_ptr;
+}
+SPOOL_PRINTER_INFO_LEVEL_3;
+
 typedef struct spool_printer_info_level
 {
 	uint32 level;
 	uint32 info_ptr;
 	SPOOL_PRINTER_INFO_LEVEL_1 *info_1;
 	SPOOL_PRINTER_INFO_LEVEL_2 *info_2;
+	SPOOL_PRINTER_INFO_LEVEL_3 *info_3;
 }
 SPOOL_PRINTER_INFO_LEVEL;
 
@@ -1350,16 +1367,9 @@ typedef struct spool_q_setprinter
 	POLICY_HND handle;
 	uint32 level;
 	SPOOL_PRINTER_INFO_LEVEL info;
+	SEC_DESC_BUF secdesc_ctr;
 	DEVMODE_CTR devmode_ctr;
 
-	/* lkclXXXX jean-francois, see SEC_DESC_BUF code */
-	struct
-	{
-		uint32 size_of_buffer;
-		uint32 data;
-	}
-	security;
-
 	uint32 command;
 
 }