use nstring and [relative] to support levels 1 and 2 of EnumPrinters

fully
(This used to be commit 69c6017c945bdd7d1945f22fcad49112ba6a2d2d)

1 files changed, 61 insertions, 0 deletions

diff --git a/source4/librpc/ndr/ndr_spoolss.h b/source4/librpc/ndr/ndr_spoolss.h
index c05f3d7494..53e504bf17 100644
--- a/source4/librpc/ndr/ndr_spoolss.h
+++ b/source4/librpc/ndr/ndr_spoolss.h
@@ -1,5 +1,42 @@
 /* header auto-generated by pidl */
 
+struct spoolss_DeviceMode {
+	const char * devicename;
+	uint16 specversion;
+	uint16 driverversion;
+	uint16 size;
+	uint16 driverextra;
+	uint32 fields;
+	uint16 orientation;
+	uint16 papersize;
+	uint16 paperlength;
+	uint16 paperwidth;
+	uint16 scale;
+	uint16 copies;
+	uint16 defaultsource;
+	uint16 printquality;
+	uint16 color;
+	uint16 duplex;
+	uint16 yresolution;
+	uint16 ttoption;
+	uint16 collate;
+	const char * formname;
+	uint16 logpixels;
+	uint32 bitsperpel;
+	uint32 pelswidth;
+	uint32 pelsheight;
+	uint32 displayflags;
+	uint32 displayfrequency;
+	uint32 icmmethod;
+	uint32 icmintent;
+	uint32 mediatype;
+	uint32 dithertype;
+	uint32 reserved1;
+	uint32 reserved2;
+	uint32 panningwidth;
+	uint32 panningheight;
+};
+
 struct spoolss_PrinterEnum1 {
 	uint32 flags;
 	const char * name;
@@ -7,6 +44,30 @@ struct spoolss_PrinterEnum1 {
 	const char * comment;
 };
 
+struct spoolss_PrinterEnum2 {
+	const char * servername;
+	const char * printername;
+	const char * sharename;
+	const char * portname;
+	const char * drivername;
+	const char * comment;
+	const char * location;
+	struct spoolss_DeviceMode *devmode;
+	const char * sepfile;
+	const char * printprocessor;
+	const char * datatype;
+	const char * parameters;
+	struct security_descriptor *secdesc;
+	uint32 attributes;
+	uint32 priority;
+	uint32 defaultpriority;
+	uint32 starttime;
+	uint32 untiltime;
+	uint32 status;
+	uint32 cjobs;
+	uint32 averageppm;
+};
+
 struct spoolss_EnumPrinters {
 	struct {
 		uint32 flags;