r23779: Change from v2 or later to v3 or later.

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

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index fa53e1d2843e7bc805d7b278b095e92524b1ac4a..d8157141a2dac8ac95ee21b124321e01b20c8362 100644 (file)
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -245,7 +245,7 @@ typedef struct nt_printer_driver_info_level
 
 typedef struct {
        char            *name;
 
 typedef struct {
        char            *name;

-       REGVAL_CTR      values;
+       REGVAL_CTR      *values;

 } NT_PRINTER_KEY;
 
 /* container for all printer data */
 } NT_PRINTER_KEY;
 
 /* container for all printer data */


@@ -320,7 +320,7 @@ typedef struct nt_printer_info_level_2
        fstring printprocessor;
        fstring datatype;
        fstring parameters;
        fstring printprocessor;
        fstring datatype;
        fstring parameters;

-       NT_PRINTER_DATA data;
+       NT_PRINTER_DATA *data;

        SEC_DESC_BUF *secdesc_buf;
        uint32 changeid;
        uint32 c_setprinter;
        SEC_DESC_BUF *secdesc_buf;
        uint32 changeid;
        uint32 c_setprinter;


@@ -344,25 +344,32 @@ typedef struct
        uint32 bottom;
 } nt_forms_struct;
 
        uint32 bottom;
 } nt_forms_struct;
 

-/*
-typedef struct _form
-{
-       uint32 flags;
-       uint32 name_ptr;
-       uint32 size_x;
-       uint32 size_y;
-       uint32 left;
-       uint32 top;
-       uint32 right;
-       uint32 bottom;
-       UNISTR2 name;
-} FORM;
-*/
-

 #ifndef SAMBA_PRINTER_PORT_NAME
 #define SAMBA_PRINTER_PORT_NAME "Samba Printer Port"
 #endif
 
 #ifndef SAMBA_PRINTER_PORT_NAME
 #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
 /* DOS header format */
 #define DOS_HEADER_SIZE                 64
 #define DOS_HEADER_MAGIC_OFFSET         0


@@ -379,18 +386,13 @@ typedef struct _form
 #define NE_HEADER_MAJOR_VER_OFFSET      63
 
 /* Portable Executable format */
 #define NE_HEADER_MAJOR_VER_OFFSET      63
 
 /* Portable Executable format */

-#define PE_HEADER_SIZE                  248
+#define PE_HEADER_SIZE                  24

 #define PE_HEADER_SIGNATURE_OFFSET      0
 #define PE_HEADER_SIGNATURE             0x00004550
 #define PE_HEADER_MACHINE_OFFSET        4
 #define PE_HEADER_MACHINE_I386          0x14c
 #define PE_HEADER_NUMBER_OF_SECTIONS    6
 #define PE_HEADER_SIGNATURE_OFFSET      0
 #define PE_HEADER_SIGNATURE             0x00004550
 #define PE_HEADER_MACHINE_OFFSET        4
 #define PE_HEADER_MACHINE_I386          0x14c
 #define PE_HEADER_NUMBER_OF_SECTIONS    6

-#define PE_HEADER_MAJOR_OS_VER_OFFSET   64
-#define PE_HEADER_MINOR_OS_VER_OFFSET   66
-#define PE_HEADER_MAJOR_IMG_VER_OFFSET  68
-#define PE_HEADER_MINOR_IMG_VER_OFFSET  70
-#define PE_HEADER_MAJOR_SS_VER_OFFSET   72
-#define PE_HEADER_MINOR_SS_VER_OFFSET   74
+#define PE_HEADER_OPTIONAL_HEADER_SIZE  20

 #define PE_HEADER_SECT_HEADER_SIZE      40
 #define PE_HEADER_SECT_NAME_OFFSET      0
 #define PE_HEADER_SECT_SIZE_DATA_OFFSET 16
 #define PE_HEADER_SECT_HEADER_SIZE      40
 #define PE_HEADER_SECT_NAME_OFFSET      0
 #define PE_HEADER_SECT_SIZE_DATA_OFFSET 16


@@ -436,8 +438,10 @@ typedef struct {
        SPOOLSS_NOTIFY_MSG_GROUP        *msg_groups;
 } SPOOLSS_NOTIFY_MSG_CTR;
 
        SPOOLSS_NOTIFY_MSG_GROUP        *msg_groups;
 } SPOOLSS_NOTIFY_MSG_CTR;
 

-#define PRINTER_HANDLE_IS_PRINTER      0
-#define PRINTER_HANDLE_IS_PRINTSERVER  1
+#define SPLHND_PRINTER         1
+#define SPLHND_SERVER          2
+#define SPLHND_PORTMON_TCP     3
+#define SPLHND_PORTMON_LOCAL   4

 
 /* structure to store the printer handles */
 /* and a reference to what it's pointing to */
 
 /* structure to store the printer handles */
 /* and a reference to what it's pointing to */