s3: remove POLICY_HND.

[samba.git] / source3 / include / nt_printing.h

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 479404d6fd3aa40dfa21165a479be5f8f5545302..7dc60a8f03b645d1eb0872faa77ca4360080788a 100644 (file)
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -347,28 +347,6 @@ typedef struct
 #define SAMBA_PRINTER_PORT_NAME "Samba Printer Port"
 #endif
 
-
-/*
- * Structures for the XcvDataPort() calls
- */
-
-#define PORT_PROTOCOL_DIRECT   1
-#define PORT_PROTOCOL_LPR      2
-
-typedef struct {
-       fstring name;
-       uint32 version;
-       uint32 protocol;
-       fstring hostaddr;
-       fstring snmpcommunity;
-       fstring queue;
-       uint32 dblspool;
-       fstring ipaddr;
-       uint32 port;
-       bool enable_snmp;
-       uint32 snmp_index;
-} NT_PORT_DATA_1;
-
 /* DOS header format */
 #define DOS_HEADER_SIZE                 64
 #define DOS_HEADER_MAGIC_OFFSET         0
@@ -452,7 +430,6 @@ typedef struct _Printer{
        bool page_started;
        uint32 jobid; /* jobid in printing backend */
        int printer_type;
-       TALLOC_CTX *ctx;
        fstring servername;
        fstring sharename;
        uint32 type;
@@ -462,8 +439,8 @@ typedef struct _Printer{
                uint32 options;
                fstring localmachine;
                uint32 printerlocal;
-               SPOOL_NOTIFY_OPTION *option;
-               POLICY_HND client_hnd;
+               struct spoolss_NotifyOption *option;
+               struct policy_handle client_hnd;
                bool client_connected;
                uint32 change;
                /* are we in a FindNextPrinterChangeNotify() call? */
@@ -482,4 +459,20 @@ typedef struct _Printer{
        
 } Printer_entry;
 
+/*
+ * The printer attributes.
+ * I #defined all of them (grabbed form MSDN)
+ * I'm only using:
+ * ( SHARED | NETWORK | RAW_ONLY )
+ * RAW_ONLY _MUST_ be present otherwise NT will send an EMF file
+ */
+
+#define PRINTER_ATTRIBUTE_SAMBA                        (PRINTER_ATTRIBUTE_RAW_ONLY|\
+                                                PRINTER_ATTRIBUTE_SHARED|\
+                                                PRINTER_ATTRIBUTE_LOCAL)
+#define PRINTER_ATTRIBUTE_NOT_SAMBA            (PRINTER_ATTRIBUTE_NETWORK)
+
+#define DRIVER_ANY_VERSION             0xffffffff
+#define DRIVER_MAX_VERSION             4
+
 #endif /* NT_PRINTING_H_ */