summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>2000-03-07 18:29:17 +0000
committerLuke Leighton <lkcl@samba.org>2000-03-07 18:29:17 +0000
commitefbfe500d5cbb173d0d417ec58d6b0d2016a6742 (patch)
tree24bdb3b1dd5184ab07156bf1df27698227d8edcc
parent40a30948071c7ca97d847994e8721c430c76f910 (diff)
downloadsamba-efbfe500d5cbb173d0d417ec58d6b0d2016a6742.tar.gz
patch from jf who was having difficulty doing cvs commits on TNG.
Diffstat
-rw-r--r--source/Makefile.in2
-rw-r--r--source/include/nt_printing.h135
-rw-r--r--source/include/ntdomain.h13
-rw-r--r--source/include/nterr.h1
-rwxr-xr-xsource/include/rpc_spoolss.h607
-rw-r--r--source/rpc_client/cli_spoolss.c214
-rw-r--r--source/rpc_parse/parse_prs.c96
-rw-r--r--source/rpc_parse/parse_rpc.c2
-rw-r--r--source/rpc_parse/parse_spoolss.c4423
-rwxr-xr-xsource/rpc_server/srv_spoolss.c993
-rw-r--r--source/rpcclient/cmd_spoolss.c313
-rw-r--r--source/rpcclient/display_spool.c247
-rw-r--r--source/rpcclient/spoolss_cmds.c76
-rwxr-xr-xsource/spoolssd/srv_spoolss_nt.c3538
14 files changed, 5686 insertions, 4974 deletions
diff --git a/source/Makefile.in b/source/Makefile.in
index d68375c69cc..25cd77971ff 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -384,7 +384,7 @@ SPOOLSSD_OBJ = $(MSRPCD_OBJ) $(SPOOLSSD_OBJ1) \
$(PRINTING_OBJ) \
$(SIDDB_OBJ) \
$(RPC_SRVUTIL_OBJ) \
- $(LOCKING_OBJ) $(PROFILE_OBJ)
+ $(LOCKING_OBJ) $(PROFILE_OBJ) $(UBIQX_OBJ)
NETLOGOND_OBJ = $(MSRPCD_OBJ) $(NETLOGOND_OBJ1) \
$(RPC_SRVUTIL_OBJ) \
diff --git a/source/include/nt_printing.h b/source/include/nt_printing.h
index a575c01e496..22c837c7481 100644
--- a/source/include/nt_printing.h
+++ b/source/include/nt_printing.h
@@ -1,3 +1,113 @@
+#define ORIENTATION 0x00000001L
+#define PAPERSIZE 0x00000002L
+#define PAPERLENGTH 0x00000004L
+#define PAPERWIDTH 0x00000008L
+#define SCALE 0x00000010L
+#define COPIES 0x00000100L
+#define DEFAULTSOURCE 0x00000200L
+#define PRINTQUALITY 0x00000400L
+#define COLOR 0x00000800L
+#define DUPLEX 0x00001000L
+#define YRESOLUTION 0x00002000L
+#define TTOPTION 0x00004000L
+#define COLLATE 0x00008000L
+#define FORMNAME 0x00010000L
+#define LOGPIXELS 0x00020000L
+#define BITSPERPEL 0x00040000L
+#define PELSWIDTH 0x00080000L
+#define PELSHEIGHT 0x00100000L
+#define DISPLAYFLAGS 0x00200000L
+#define DISPLAYFREQUENCY 0x00400000L
+#define PANNINGWIDTH 0x00800000L
+#define PANNINGHEIGHT 0x01000000L
+
+#define ORIENT_PORTRAIT 1
+#define ORIENT_LANDSCAPE 2
+
+#define PAPER_FIRST PAPER_LETTER
+#define PAPER_LETTER 1 /* Letter 8 1/2 x 11 in */
+#define PAPER_LETTERSMALL 2 /* Letter Small 8 1/2 x 11 in */
+#define PAPER_TABLOID 3 /* Tabloid 11 x 17 in */
+#define PAPER_LEDGER 4 /* Ledger 17 x 11 in */
+#define PAPER_LEGAL 5 /* Legal 8 1/2 x 14 in */
+#define PAPER_STATEMENT 6 /* Statement 5 1/2 x 8 1/2 in */
+#define PAPER_EXECUTIVE 7 /* Executive 7 1/4 x 10 1/2 in */
+#define PAPER_A3 8 /* A3 297 x 420 mm */
+#define PAPER_A4 9 /* A4 210 x 297 mm */
+#define PAPER_A4SMALL 10 /* A4 Small 210 x 297 mm */
+#define PAPER_A5 11 /* A5 148 x 210 mm */
+#define PAPER_B4 12 /* B4 (JIS) 250 x 354 */
+#define PAPER_B5 13 /* B5 (JIS) 182 x 257 mm */
+#define PAPER_FOLIO 14 /* Folio 8 1/2 x 13 in */
+#define PAPER_QUARTO 15 /* Quarto 215 x 275 mm */
+#define PAPER_10X14 16 /* 10x14 in */
+#define PAPER_11X17 17 /* 11x17 in */
+#define PAPER_NOTE 18 /* Note 8 1/2 x 11 in */
+#define PAPER_ENV_9 19 /* Envelope #9 3 7/8 x 8 7/8 */
+#define PAPER_ENV_10 20 /* Envelope #10 4 1/8 x 9 1/2 */
+#define PAPER_ENV_11 21 /* Envelope #11 4 1/2 x 10 3/8 */
+#define PAPER_ENV_12 22 /* Envelope #12 4 \276 x 11 */
+#define PAPER_ENV_14 23 /* Envelope #14 5 x 11 1/2 */
+#define PAPER_CSHEET 24 /* C size sheet */
+#define PAPER_DSHEET 25 /* D size sheet */
+#define PAPER_ESHEET 26 /* E size sheet */
+#define PAPER_ENV_DL 27 /* Envelope DL 110 x 220mm */
+#define PAPER_ENV_C5 28 /* Envelope C5 162 x 229 mm */
+#define PAPER_ENV_C3 29 /* Envelope C3 324 x 458 mm */
+#define PAPER_ENV_C4 30 /* Envelope C4 229 x 324 mm */
+#define PAPER_ENV_C6 31 /* Envelope C6 114 x 162 mm */
+#define PAPER_ENV_C65 32 /* Envelope C65 114 x 229 mm */
+#define PAPER_ENV_B4 33 /* Envelope B4 250 x 353 mm */
+#define PAPER_ENV_B5 34 /* Envelope B5 176 x 250 mm */
+#define PAPER_ENV_B6 35 /* Envelope B6 176 x 125 mm */
+#define PAPER_ENV_ITALY 36 /* Envelope 110 x 230 mm */
+#define PAPER_ENV_MONARCH 37 /* Envelope Monarch 3.875 x 7.5 in */
+#define PAPER_ENV_PERSONAL 38 /* 6 3/4 Envelope 3 5/8 x 6 1/2 in */
+#define PAPER_FANFOLD_US 39 /* US Std Fanfold 14 7/8 x 11 in */
+#define PAPER_FANFOLD_STD_GERMAN 40 /* German Std Fanfold 8 1/2 x 12 in */
+#define PAPER_FANFOLD_LGL_GERMAN 41 /* German Legal Fanfold 8 1/2 x 13 in */
+
+#define PAPER_LAST PAPER_FANFOLD_LGL_GERMAN
+#define PAPER_USER 256
+
+#define BIN_FIRST BIN_UPPER
+#define BIN_UPPER 1
+#define BIN_ONLYONE 1
+#define BIN_LOWER 2
+#define BIN_MIDDLE 3
+#define BIN_MANUAL 4
+#define BIN_ENVELOPE 5
+#define BIN_ENVMANUAL 6
+#define BIN_AUTO 7
+#define BIN_TRACTOR 8
+#define BIN_SMALLFMT 9
+#define BIN_LARGEFMT 10
+#define BIN_LARGECAPACITY 11
+#define BIN_CASSETTE 14
+#define BIN_FORMSOURCE 15
+#define BIN_LAST BIN_FORMSOURCE
+
+#define BIN_USER 256 /* device specific bins start here */
+
+#define RES_DRAFT (-1)
+#define RES_LOW (-2)
+#define RES_MEDIUM (-3)
+#define RES_HIGH (-4)
+
+#define COLOR_MONOCHROME 1
+#define COLOR_COLOR 2
+
+#define DUP_SIMPLEX 1
+#define DUP_VERTICAL 2
+#define DUP_HORIZONTAL 3
+
+#define TT_BITMAP 1 /* print TT fonts as graphics */
+#define TT_DOWNLOAD 2 /* download TT fonts as soft fonts */
+#define TT_SUBDEV 3 /* substitute device fonts for TT fonts */
+
+#define COLLATE_FALSE 0
+#define COLLATE_TRUE 1
+
typedef struct nt_printer_driver_info_level_3
{
uint32 cversion;
@@ -99,4 +209,29 @@ typedef struct nt_printer_info_level
NT_PRINTER_INFO_LEVEL_2 *info_2;
} NT_PRINTER_INFO_LEVEL;
+typedef struct
+{
+ char name[100];
+ uint32 flag;
+ uint32 width;
+ uint32 length;
+ uint32 left;
+ uint32 top;
+ uint32 right;
+ 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;
+*/
diff --git a/source/include/ntdomain.h b/source/include/ntdomain.h
index 7925ab50ae8..ab7f0731183 100644
--- a/source/include/ntdomain.h
+++ b/source/include/ntdomain.h
@@ -46,7 +46,6 @@
#include "rpc_svcctl.h"
#include "rpc_wkssvc.h"
#include "rpc_atsvc.h"
-#include "rpc_spoolss.h"
#include "rpc_eventlog.h"
/* MS AD prototypes */
@@ -91,6 +90,18 @@ typedef struct parse_struct
}
prs_struct;
+/*
+ * Defines for io member of prs_struct.
+ */
+
+#define MARSHALL 0
+#define UNMARSHALL 1
+
+#define MARSHALLING(ps) (!(ps)->io)
+#define UNMARSHALLING(ps) ((ps)->io)
+
+#include "rpc_spoolss.h"
+
typedef struct netsec_auth_struct
{
RPC_AUTH_NETSEC_NEG netsec_neg;
diff --git a/source/include/nterr.h b/source/include/nterr.h
index 78c1adb5adf..1b3e2ff9085 100644
--- a/source/include/nterr.h
+++ b/source/include/nterr.h
@@ -13,6 +13,7 @@
using a loop in smbclient then printing a netmon sniff to a file */
#define NT_STATUS_NOPROBLEMO (0x0)
+#define NT_STATUS_NO_PROBLEMO (0x0)
#define NT_STATUS_UNSUCCESSFUL (0xC0000000 | 1)
#define NT_STATUS_NOT_IMPLEMENTED (0xC0000000 | 2)
#define NT_STATUS_INVALID_INFO_CLASS (0xC0000000 | 3)
diff --git a/source/include/rpc_spoolss.h b/source/include/rpc_spoolss.h
index 22f4359812a..69820676cc0 100755
--- a/source/include/rpc_spoolss.h
+++ b/source/include/rpc_spoolss.h
@@ -2,9 +2,9 @@
Unix SMB/Netbios implementation.
Version 1.9.
SMB parameters and setup
- Copyright (C) Andrew Tridgell 1992-1998
- Copyright (C) Luke Kenneth Casson Leighton 1996-1998
- Copyright (C) Jean Francois Micouleau 1998-1999
+ Copyright (C) Andrew Tridgell 1992-2000,
+ Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
+ Copyright (C) Jean Francois Micouleau 1998-2000.
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
@@ -68,7 +68,6 @@
*/
/* those are implemented */
-
#define SPOOLSS_ENUMPRINTERS 0x00
#define SPOOLSS_SETJOB 0x02
#define SPOOLSS_GETJOB 0x03
@@ -95,7 +94,7 @@
#define SPOOLSS_ENUMFORMS 0x22
#define SPOOLSS_ENUMPORTS 0x23
#define SPOOLSS_ENUMMONITORS 0x24
-#define SPOOLSS_ENUMPRINTPROCESSORDATATYPES 0x33
+#define SPOOLSS_ENUMPRINTPROCDATATYPES 0x33
#define SPOOLSS_GETPRINTERDRIVER2 0x35
/* find close printer notification */
#define SPOOLSS_FCPN 0x38
@@ -107,13 +106,6 @@
#define SPOOLSS_ADDPRINTEREX 0x46
#define SPOOLSS_ENUMPRINTERDATA 0x48
-
-#define SERVER_ACCESS_ADMINISTER 0x00000001
-#define SERVER_ACCESS_ENUMERATE 0x00000002
-
-#define PRINTER_ACCESS_ADMINISTER 0x00000004
-#define PRINTER_ACCESS_USE 0x00000008
-
#define PRINTER_CONTROL_UNPAUSE 0x00000000
#define PRINTER_CONTROL_PAUSE 0x00000001
#define PRINTER_CONTROL_RESUME 0x00000002
@@ -152,6 +144,11 @@
#define PRINTER_STATUS_POWER_SAVE 0x01000000
+
+#define SERVER_ACCESS_ADMINISTER 0x00000001
+#define SERVER_ACCESS_ENUMERATE 0x00000002
+#define PRINTER_ACCESS_ADMINISTER 0x00000004
+#define PRINTER_ACCESS_USE 0x00000008
#define JOB_ACCESS_ADMINISTER 0x00000010
#define STANDARD_RIGHTS_READ 0x00020000
@@ -187,6 +184,9 @@
#define JOB_NOTIFY_TYPE 0x01
#define MAX_PRINTER_NOTIFY 26
+#define MAX_JOB_NOTIFY 24
+
+#define MAX_NOTIFY_TYPE_FOR_NOW 26
#define PRINTER_NOTIFY_SERVER_NAME 0x00
#define PRINTER_NOTIFY_PRINTER_NAME 0x01
@@ -215,8 +215,6 @@
#define PRINTER_NOTIFY_TOTAL_BYTES 0x18
#define PRINTER_NOTIFY_BYTES_PRINTED 0x19
-#define MAX_JOB_NOTIFY 24
-
#define JOB_NOTIFY_PRINTER_NAME 0x00
#define JOB_NOTIFY_MACHINE_NAME 0x01
#define JOB_NOTIFY_PORT_NAME 0x02
@@ -242,6 +240,57 @@
#define JOB_NOTIFY_TOTAL_BYTES 0x16
#define JOB_NOTIFY_BYTES_PRINTED 0x17
+#define PRINTER_CHANGE_ADD_PRINTER 0x00000001
+#define PRINTER_CHANGE_SET_PRINTER 0x00000002
+#define PRINTER_CHANGE_DELETE_PRINTER 0x00000004
+#define PRINTER_CHANGE_FAILED_CONNECTION_PRINTER 0x00000008
+#define PRINTER_CHANGE_PRINTER (PRINTER_CHANGE_ADD_PRINTER | \
+ PRINTER_CHANGE_SET_PRINTER | \
+ PRINTER_CHANGE_DELETE_PRINTER | \
+ PRINTER_CHANGE_FAILED_CONNECTION_PRINTER )
+
+#define PRINTER_CHANGE_ADD_JOB 0x00000100
+#define PRINTER_CHANGE_SET_JOB 0x00000200
+#define PRINTER_CHANGE_DELETE_JOB 0x00000400
+#define PRINTER_CHANGE_WRITE_JOB 0x00000800
+#define PRINTER_CHANGE_JOB (PRINTER_CHANGE_ADD_JOB | \
+ PRINTER_CHANGE_SET_JOB | \
+ PRINTER_CHANGE_DELETE_JOB | \
+ PRINTER_CHANGE_WRITE_JOB )
+
+#define PRINTER_CHANGE_ADD_FORM 0x00010000
+#define PRINTER_CHANGE_SET_FORM 0x00020000
+#define PRINTER_CHANGE_DELETE_FORM 0x00040000
+#define PRINTER_CHANGE_FORM (PRINTER_CHANGE_ADD_FORM | \
+ PRINTER_CHANGE_SET_FORM | \
+ PRINTER_CHANGE_DELETE_FORM )
+
+#define PRINTER_CHANGE_ADD_PORT 0x00100000
+#define PRINTER_CHANGE_CONFIGURE_PORT 0x00200000
+#define PRINTER_CHANGE_DELETE_PORT 0x00400000
+#define PRINTER_CHANGE_PORT (PRINTER_CHANGE_ADD_PORT | \
+ PRINTER_CHANGE_CONFIGURE_PORT | \
+ PRINTER_CHANGE_DELETE_PORT )
+
+#define PRINTER_CHANGE_ADD_PRINT_PROCESSOR 0x01000000
+#define PRINTER_CHANGE_DELETE_PRINT_PROCESSOR 0x04000000
+#define PRINTER_CHANGE_PRINT_PROCESSOR (PRINTER_CHANGE_ADD_PRINT_PROCESSOR | \
+ PRINTER_CHANGE_DELETE_PRINT_PROCESSOR )
+
+#define PRINTER_CHANGE_ADD_PRINTER_DRIVER 0x10000000
+#define PRINTER_CHANGE_SET_PRINTER_DRIVER 0x20000000
+#define PRINTER_CHANGE_DELETE_PRINTER_DRIVER 0x40000000
+#define PRINTER_CHANGE_PRINTER_DRIVER (PRINTER_CHANGE_ADD_PRINTER_DRIVER | \
+ PRINTER_CHANGE_SET_PRINTER_DRIVER | \
+ PRINTER_CHANGE_DELETE_PRINTER_DRIVER )
+
+#define PRINTER_CHANGE_TIMEOUT 0x80000000
+#define PRINTER_CHANGE_ALL (PRINTER_CHANGE_JOB | \
+ PRINTER_CHANGE_FORM | \
+ PRINTER_CHANGE_PORT | \
+ PRINTER_CHANGE_PRINT_PROCESSOR | \
+ PRINTER_CHANGE_PRINTER_DRIVER )
+
/*
* The printer attributes.
* I #defined all of them (grabbed form MSDN)
@@ -272,6 +321,7 @@
#define MIN_PRIORITY 1
#define DEF_PRIORITY 1
+/* the flags of the query */
#define PRINTER_ENUM_DEFAULT 0x00000001
#define PRINTER_ENUM_LOCAL 0x00000002
#define PRINTER_ENUM_CONNECTIONS 0x00000004
@@ -281,9 +331,9 @@
#define PRINTER_ENUM_SHARED 0x00000020
#define PRINTER_ENUM_NETWORK 0x00000040
+/* the flags of each printers */
#define PRINTER_ENUM_EXPAND 0x00004000
#define PRINTER_ENUM_CONTAINER 0x00008000
-
#define PRINTER_ENUM_ICONMASK 0x00ff0000
#define PRINTER_ENUM_ICON1 0x00010000
#define PRINTER_ENUM_ICON2 0x00020000
@@ -294,33 +344,29 @@
#define PRINTER_ENUM_ICON7 0x00400000
#define PRINTER_ENUM_ICON8 0x00800000
-typedef struct
+#define POLICY_HND_SIZE 20
+
+/* this struct is undocumented */
+/* thanks to the ddk ... */
+typedef struct spool_user_1
{
- char name[100];
- uint32 flag;
- uint32 width;
- uint32 length;
- uint32 left;
- uint32 top;
- uint32 right;
- uint32 bottom;
-} nt_forms_struct;
+ uint32 size;
+ uint32 client_name_ptr;
+ uint32 user_name_ptr;
+ uint32 build;
+ uint32 major;
+ uint32 minor;
+ uint32 processor;
+ UNISTR2 client_name;
+ UNISTR2 user_name;
+} SPOOL_USER_1;
-typedef struct
+typedef struct spool_user_ctr_info
{
- char name[100];
- char architecture[100];
- uint32 version;
- char default_form[30];
- uint32 color_flag;
- char driver[100];
- char datafile[100];
- char configfile[100];
- char helpfile[100];
- char monitor[100];
- char monitor_name[100];
- char **dependant;
-} nt_drivers_struct;
+ uint32 level;
+ uint32 ptr;
+ SPOOL_USER_1 user1;
+} SPOOL_USER_CTR;
typedef struct devicemode
{
@@ -359,170 +405,34 @@ typedef struct devicemode
uint32 panningwidth;
uint32 panningheight;
uint8 *private;
-} DEVICEMODE;
-
-typedef struct devicemode_container
-{
- DEVICEMODE *dm;
- uint8 *buffer;
- uint32 size_of_buffer;
-} DEVICEMODE_CONTAINER;
-
-#define ORIENTATION 0x00000001L
-#define PAPERSIZE 0x00000002L
-#define PAPERLENGTH 0x00000004L
-#define PAPERWIDTH 0x00000008L
-#define SCALE 0x00000010L
-#define COPIES 0x00000100L
-#define DEFAULTSOURCE 0x00000200L
-#define PRINTQUALITY 0x00000400L
-#define COLOR 0x00000800L
-#define DUPLEX 0x00001000L
-#define YRESOLUTION 0x00002000L
-#define TTOPTION 0x00004000L
-#define COLLATE 0x00008000L
-#define FORMNAME 0x00010000L
-#define LOGPIXELS 0x00020000L
-#define BITSPERPEL 0x00040000L
-#define PELSWIDTH 0x00080000L
-#define PELSHEIGHT 0x00100000L
-#define DISPLAYFLAGS 0x00200000L
-#define DISPLAYFREQUENCY 0x00400000L
-#define PANNINGWIDTH 0x00800000L
-#define PANNINGHEIGHT 0x01000000L
-
-#define ORIENT_PORTRAIT 1
-#define ORIENT_LANDSCAPE 2
-
-#define PAPER_FIRST PAPER_LETTER
-#define PAPER_LETTER 1 /* Letter 8 1/2 x 11 in */
-#define PAPER_LETTERSMALL 2 /* Letter Small 8 1/2 x 11 in */
-#define PAPER_TABLOID 3 /* Tabloid 11 x 17 in */
-#define PAPER_LEDGER 4 /* Ledger 17 x 11 in */
-#define PAPER_LEGAL 5 /* Legal 8 1/2 x 14 in */
-#define PAPER_STATEMENT 6 /* Statement 5 1/2 x 8 1/2 in */
-#define PAPER_EXECUTIVE 7 /* Executive 7 1/4 x 10 1/2 in */
-#define PAPER_A3 8 /* A3 297 x 420 mm */
-#define PAPER_A4 9 /* A4 210 x 297 mm */
-#define PAPER_A4SMALL 10 /* A4 Small 210 x 297 mm */
-#define PAPER_A5 11 /* A5 148 x 210 mm */
-#define PAPER_B4 12 /* B4 (JIS) 250 x 354 */
-#define PAPER_B5 13 /* B5 (JIS) 182 x 257 mm */
-#define PAPER_FOLIO 14 /* Folio 8 1/2 x 13 in */
-#define PAPER_QUARTO 15 /* Quarto 215 x 275 mm */
-#define PAPER_10X14 16 /* 10x14 in */
-#define PAPER_11X17 17 /* 11x17 in */
-#define PAPER_NOTE 18 /* Note 8 1/2 x 11 in */
-#define PAPER_ENV_9 19 /* Envelope #9 3 7/8 x 8 7/8 */
-#define PAPER_ENV_10 20 /* Envelope #10 4 1/8 x 9 1/2 */
-#define PAPER_ENV_11 21 /* Envelope #11 4 1/2 x 10 3/8 */
-#define PAPER_ENV_12 22 /* Envelope #12 4 \276 x 11 */
-#define PAPER_ENV_14 23 /* Envelope #14 5 x 11 1/2 */
-#define PAPER_CSHEET 24 /* C size sheet */
-#define PAPER_DSHEET 25 /* D size sheet */
-#define PAPER_ESHEET 26 /* E size sheet */
-#define PAPER_ENV_DL 27 /* Envelope DL 110 x 220mm */
-#define PAPER_ENV_C5 28 /* Envelope C5 162 x 229 mm */
-#define PAPER_ENV_C3 29 /* Envelope C3 324 x 458 mm */
-#define PAPER_ENV_C4 30 /* Envelope C4 229 x 324 mm */
-#define PAPER_ENV_C6 31 /* Envelope C6 114 x 162 mm */
-#define PAPER_ENV_C65 32 /* Envelope C65 114 x 229 mm */
-#define PAPER_ENV_B4 33 /* Envelope B4 250 x 353 mm */
-#define PAPER_ENV_B5 34 /* Envelope B5 176 x 250 mm */
-#define PAPER_ENV_B6 35 /* Envelope B6 176 x 125 mm */
-#define PAPER_ENV_ITALY 36 /* Envelope 110 x 230 mm */
-#define PAPER_ENV_MONARCH 37 /* Envelope Monarch 3.875 x 7.5 in */
-#define PAPER_ENV_PERSONAL 38 /* 6 3/4 Envelope 3 5/8 x 6 1/2 in */
-#define PAPER_FANFOLD_US 39 /* US Std Fanfold 14 7/8 x 11 in */
-#define PAPER_FANFOLD_STD_GERMAN 40 /* German Std Fanfold 8 1/2 x 12 in */
-#define PAPER_FANFOLD_LGL_GERMAN 41 /* German Legal Fanfold 8 1/2 x 13 in */
-
-#define PAPER_LAST PAPER_FANFOLD_LGL_GERMAN
-#define PAPER_USER 256
-
-#define BIN_FIRST BIN_UPPER
-#define BIN_UPPER 1
-#define BIN_ONLYONE 1
-#define BIN_LOWER 2
-#define BIN_MIDDLE 3
-#define BIN_MANUAL 4
-#define BIN_ENVELOPE 5
-#define BIN_ENVMANUAL 6
-#define BIN_AUTO 7
-#define BIN_TRACTOR 8
-#define BIN_SMALLFMT 9
-#define BIN_LARGEFMT 10
-#define BIN_LARGECAPACITY 11
-#define BIN_CASSETTE 14
-#define BIN_FORMSOURCE 15
-#define BIN_LAST BIN_FORMSOURCE
-
-#define BIN_USER 256 /* device specific bins start here */
-
-#define RES_DRAFT (-1)
-#define RES_LOW (-2)
-#define RES_MEDIUM (-3)
-#define RES_HIGH (-4)
-
-#define COLOR_MONOCHROME 1
-#define COLOR_COLOR 2
-
-#define DUP_SIMPLEX 1
-#define DUP_VERTICAL 2
-#define DUP_HORIZONTAL 3
-
-#define TT_BITMAP 1 /* print TT fonts as graphics */
-#define TT_DOWNLOAD 2 /* download TT fonts as soft fonts */
-#define TT_SUBDEV 3 /* substitute device fonts for TT fonts */
-
-#define COLLATE_FALSE 0
-#define COLLATE_TRUE 1
+} DEVICEMODE;
-typedef struct s_header_type
+typedef struct _devmode_cont
{
- uint32 type;
- union
- {
- uint32 value;
- UNISTR string;
- } data;
-} HEADER_TYPE;
-
-typedef struct s_buffer
-{
- uint32 ptr;
uint32 size;
- uint32 count;
- uint8 *data;
- HEADER_TYPE *header;
-} BUFFER;
+ uint32 devmode_ptr;
+ DEVICEMODE *devmode;
+} DEVMODE_CTR;
+typedef struct _printer_default
+{
+ uint32 datatype_ptr;
+ UNISTR2 datatype;
+ DEVMODE_CTR devmode_cont;
+ uint32 access_required;
+} PRINTER_DEFAULT;
/* SPOOL_Q_OPEN_PRINTER_EX request to open a printer */
typedef struct spool_q_open_printer_ex
{
- uint32 ptr;
+ uint32 printername_ptr;
UNISTR2 printername;
- uint32 unknown0;
- uint32 cbbuf;
- uint32 devmod;
- uint32 access_required;
- uint32 unknown1; /* 0x0000 0001 */
- uint32 unknown2; /* 0x0000 0001 */
- uint32 unknown3; /* ??? pointer? */
- uint32 unknown4; /* 0x0000 001c */
- uint32 unknown5; /* ??? e.g 0xb94dd0 */
- uint32 unknown6; /* ??? pointer? */
- uint32 unknown7; /* 0x0000 0565 */
- uint32 unknown8; /* 0x0000 0002 */
- uint32 unknown9; /* 0x0000 0000 */
- uint32 unknown10; /* 0x0000 0000 */
- UNISTR2 station;
- UNISTR2 username;
-
+ PRINTER_DEFAULT printer_default;
+ uint32 user_switch;
+ SPOOL_USER_CTR user_ctr;
} SPOOL_Q_OPEN_PRINTER_EX;
-/* SPOOL_Q_OPEN_PRINTER_EX reply to an open printer */
+/* SPOOL_R_OPEN_PRINTER_EX reply to an open printer */
typedef struct spool_r_open_printer_ex
{
POLICY_HND handle; /* handle used along all transactions (20*uint8) */
@@ -530,11 +440,50 @@ typedef struct spool_r_open_printer_ex
} SPOOL_R_OPEN_PRINTER_EX;
+typedef struct spool_notify_option_type
+{
+ uint16 type;
+ uint16 reserved0;
+ uint32 reserved1;
+ uint32 reserved2;
+ uint32 count;
+ uint32 fields_ptr;
+ uint32 count2;
+ uint16 fields[MAX_NOTIFY_TYPE_FOR_NOW];
+} SPOOL_NOTIFY_OPTION_TYPE;
+
+typedef struct spool_notify_option_type_ctr
+{
+ uint32 count;
+ SPOOL_NOTIFY_OPTION_TYPE *type;
+} SPOOL_NOTIFY_OPTION_TYPE_CTR;
+
+
+
+typedef struct s_header_type
+{
+ uint32 type;
+ union
+ {
+ uint32 value;
+ UNISTR string;
+ } data;
+} HEADER_TYPE;
+
+typedef struct new_buffer
+{
+ uint32 ptr;
+ uint32 size;
+ prs_struct prs;
+ uint32 struct_start;
+ uint32 string_at_end;
+} NEW_BUFFER;
+
typedef struct spool_q_getprinterdata
{
POLICY_HND handle;
- UNISTR2 valuename;
- uint32 size;
+ UNISTR2 valuename;
+ uint32 size;
} SPOOL_Q_GETPRINTERDATA;
typedef struct spool_r_getprinterdata
@@ -542,7 +491,6 @@ typedef struct spool_r_getprinterdata
uint32 type;
uint32 size;
uint8 *data;
- uint32 numeric_data;
uint32 needed;
uint32 status;
} SPOOL_R_GETPRINTERDATA;
@@ -636,22 +584,13 @@ typedef struct spool_r_writeprinter
uint32 status;
} SPOOL_R_WRITEPRINTER;
-typedef struct spool_notify_option_type
-{
- uint16 type;
- uint16 reserved0;
- uint32 reserved1;
- uint32 reserved2;
- uint32 count;
- uint16 fields[16];
-} SPOOL_NOTIFY_OPTION_TYPE;
-
typedef struct spool_notify_option
{
uint32 version;
- uint32 reserved;
+ uint32 flags;
uint32 count;
- SPOOL_NOTIFY_OPTION_TYPE type[16]; /* totally arbitrary !!! */
+ uint32 option_type_ptr;
+ SPOOL_NOTIFY_OPTION_TYPE_CTR ctr;
} SPOOL_NOTIFY_OPTION;
typedef struct spool_notify_info_data
@@ -678,10 +617,7 @@ typedef struct spool_notify_info
uint32 version;
uint32 flags;
uint32 count;
- SPOOL_NOTIFY_INFO_DATA data[26*16];
- /* 26 differents data types */
- /* so size it for 16 printers at max */
- /* jfmxxxx: Have to make it dynamic !!!*/
+ SPOOL_NOTIFY_INFO_DATA *data;
} SPOOL_NOTIFY_INFO;
/* If the struct name looks obscure, yes it is ! */
@@ -691,9 +627,11 @@ typedef struct spoolss_q_rffpcnex
POLICY_HND handle;
uint32 flags;
uint32 options;
+ uint32 localmachine_ptr;
UNISTR2 localmachine;
uint32 printerlocal;
- SPOOL_NOTIFY_OPTION option;
+ uint32 option_ptr;
+ SPOOL_NOTIFY_OPTION *option;
} SPOOL_Q_RFFPCNEX;
typedef struct spool_r_rffpcnex
@@ -706,15 +644,15 @@ typedef struct spool_q_rfnpcnex
{
POLICY_HND handle;
uint32 change;
- SPOOL_NOTIFY_OPTION option;
+ uint32 option_ptr;
+ SPOOL_NOTIFY_OPTION *option;
} SPOOL_Q_RFNPCNEX;
typedef struct spool_r_rfnpcnex
{
- uint32 count;
+ uint32 info_ptr;
SPOOL_NOTIFY_INFO info;
uint32 status;
-
} SPOOL_R_RFNPCNEX;
/* Find Close Printer Notify */
@@ -799,32 +737,25 @@ typedef struct printer_info_2
typedef struct spool_q_enumprinters
{
uint32 flags;
+ uint32 servername_ptr;
UNISTR2 servername;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_ENUMPRINTERS;
typedef struct printer_info_ctr_info
{
- union {
- PRINTER_INFO_1 **printers_1;
- PRINTER_INFO_2 **printers_2;
- void *info;
- } printer;
-
+ PRINTER_INFO_1 *printers_1;
+ PRINTER_INFO_2 *printers_2;
} PRINTER_INFO_CTR;
typedef struct spool_r_enumprinters
{
- uint32 offered; /* number of bytes offered */
+ NEW_BUFFER *buffer;
uint32 needed; /* bytes needed */
- uint32 level;
- UNISTR servername;
- PRINTER_INFO_CTR ctr;
uint32 returned; /* number of printers */
uint32 status;
-
} SPOOL_R_ENUMPRINTERS;
@@ -832,9 +763,8 @@ typedef struct spool_q_getprinter
{
POLICY_HND handle;
uint32 level;
- uint8* buffer;
+ NEW_BUFFER *buffer;
uint32 offered;
-
} SPOOL_Q_GETPRINTER;
typedef struct printer_info_info
@@ -845,17 +775,11 @@ typedef struct printer_info_info
PRINTER_INFO_2 *info2;
void *info;
} printer;
-
} PRINTER_INFO;
typedef struct spool_r_getprinter
{
- POLICY_HND handle;
- uint32 level;
-
- PRINTER_INFO ctr;
-
- uint32 offered;
+ NEW_BUFFER *buffer;
uint32 needed;
uint32 status;
@@ -870,17 +794,6 @@ struct s_notify_info_data_table
void (*fn) (int snum, SPOOL_NOTIFY_INFO_DATA *data, print_queue_struct *queue, NT_PRINTER_INFO_LEVEL *printer);
};
-typedef struct spool_q_getprinterdriver2
-{
- POLICY_HND handle;
- UNISTR2 architecture;
- uint32 level;
- BUFFER buffer;
- uint32 buf_size;
- uint32 unknown;
-
-} SPOOL_Q_GETPRINTERDRIVER2;
-
typedef struct driver_info_1
{
UNISTR name;
@@ -920,17 +833,27 @@ typedef struct driver_info_info
} DRIVER_INFO;
-typedef struct spool_r_getprinterdriver2
+typedef struct spool_q_getprinterdriver2
{
+ POLICY_HND handle;
+ uint32 architecture_ptr;
+ UNISTR2 architecture;
uint32 level;
- DRIVER_INFO ctr;
- uint32 needed;
+ NEW_BUFFER *buffer;
uint32 offered;
- uint32 returned;
- uint32 status;
+ uint32 unknown;
+} SPOOL_Q_GETPRINTERDRIVER2;
+typedef struct spool_r_getprinterdriver2
+{
+ NEW_BUFFER *buffer;
+ uint32 needed;
+ uint32 unknown0;
+ uint32 unknown1;
+ uint32 status;
} SPOOL_R_GETPRINTERDRIVER2;
+
typedef struct add_jobinfo_1
{
UNISTR path;
@@ -942,8 +865,8 @@ typedef struct spool_q_addjob
{
POLICY_HND handle;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_ADDJOB;
typedef struct spool_r_addjob
@@ -1019,9 +942,8 @@ typedef struct spool_q_enumjobs
uint32 firstjob;
uint32 numofjobs;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
-
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_ENUMJOBS;
typedef struct job_info_ctr_info
@@ -1036,12 +958,10 @@ typedef struct job_info_ctr_info
typedef struct spool_r_enumjobs
{
- uint32 level;
- uint32 offered;
- JOB_INFO_CTR ctr;
- uint32 numofjobs;
+ NEW_BUFFER *buffer;
+ uint32 needed;
+ uint32 returned;
uint32 status;
-
} SPOOL_R_ENUMJOBS;
typedef struct spool_q_schedulejob
@@ -1071,10 +991,11 @@ typedef struct s_port_info_2
typedef struct spool_q_enumports
{
+ uint32 name_ptr;
UNISTR2 name;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_ENUMPORTS;
typedef struct port_info_ctr_info
@@ -1088,12 +1009,10 @@ typedef struct port_info_ctr_info
typedef struct spool_r_enumports
{
- uint32 level;
- PORT_INFO_CTR ctr;
- uint32 offered;
- uint32 numofports;
+ NEW_BUFFER *buffer;
+ uint32 needed; /* bytes needed */
+ uint32 returned; /* number of printers */
uint32 status;
-
} SPOOL_R_ENUMPORTS;
#define JOB_CONTROL_PAUSE 1
@@ -1129,22 +1048,21 @@ typedef struct spool_r_setjob
typedef struct spool_q_enumprinterdrivers
{
+ uint32 name_ptr;
UNISTR2 name;
+ uint32 environment_ptr;
UNISTR2 environment;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
-
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_ENUMPRINTERDRIVERS;
typedef struct spool_r_enumprinterdrivers
{
- uint32 level;
- DRIVER_INFO ctr;
- uint32 offered;
- uint32 numofdrivers;
+ NEW_BUFFER *buffer;
+ uint32 needed;
+ uint32 returned;
uint32 status;
-
} SPOOL_R_ENUMPRINTERDRIVERS;
typedef struct spool_form_1
@@ -1162,16 +1080,15 @@ typedef struct spool_form_1
typedef struct spool_q_enumforms
{
POLICY_HND handle;
- uint32 level;
- BUFFER buffer;
- uint32 buf_size;
+ uint32 level;
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_ENUMFORMS;
typedef struct spool_r_enumforms
{
- uint32 level;
- FORM_1 *forms_1;
- uint32 offered;
+ NEW_BUFFER *buffer;
+ uint32 needed;
uint32 numofforms;
uint32 status;
} SPOOL_R_ENUMFORMS;
@@ -1216,6 +1133,8 @@ typedef struct spool_printer_info_level_2
typedef struct spool_printer_info_level
{
+ uint32 level;
+ uint32 info_ptr;
SPOOL_PRINTER_INFO_LEVEL_2 *info_2;
} SPOOL_PRINTER_INFO_LEVEL;
@@ -1247,6 +1166,8 @@ typedef struct spool_printer_driver_info_level_3
typedef struct spool_printer_driver_info_level
{
+ uint32 level;
+ uint32 ptr;
SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 *info_3;
} SPOOL_PRINTER_DRIVER_INFO_LEVEL;
@@ -1276,8 +1197,7 @@ typedef struct spool_q_setprinter
POLICY_HND handle;
uint32 level;
SPOOL_PRINTER_INFO_LEVEL info;
-
- DEVICEMODE *devmode;
+ DEVMODE_CTR devmode_ctr;
/* lkclXXXX jean-francois, see SEC_DESC_BUF code */
struct
@@ -1313,8 +1233,10 @@ typedef struct spool_r_addprinter
uint32 status;
} SPOOL_R_ADDPRINTER;
+
typedef struct spool_q_addprinterex
{
+ uint32 server_name_ptr;
UNISTR2 server_name;
uint32 level;
SPOOL_PRINTER_INFO_LEVEL info;
@@ -1322,19 +1244,20 @@ typedef struct spool_q_addprinterex
uint32 unk1;
uint32 unk2;
uint32 unk3;
- uint32 user_level;
- SPOOL_USER_LEVEL user;
+ uint32 user_switch;
+ SPOOL_USER_CTR user_ctr;
} SPOOL_Q_ADDPRINTEREX;
-
typedef struct spool_r_addprinterex
{
POLICY_HND handle;
uint32 status;
} SPOOL_R_ADDPRINTEREX;
+
typedef struct spool_q_addprinterdriver
{
+ uint32 server_name_ptr;
UNISTR2 server_name;
uint32 level;
SPOOL_PRINTER_DRIVER_INFO_LEVEL info;
@@ -1345,19 +1268,10 @@ typedef struct spool_r_addprinterdriver
uint32 status;
} SPOOL_R_ADDPRINTERDRIVER;
-typedef struct spool_q_getprinterdriverdirectory
-{
- UNISTR2 name;
- UNISTR2 environment;
- uint32 level;
- BUFFER buffer;
- uint32 buf_size;
-} SPOOL_Q_GETPRINTERDRIVERDIR;
typedef struct driver_directory_1
{
UNISTR name;
-
} DRIVER_DIRECTORY_1 ;
typedef struct driver_info_ctr_info
@@ -1365,25 +1279,35 @@ typedef struct driver_info_ctr_info
union {
DRIVER_DIRECTORY_1 info_1;
} driver;
-
} DRIVER_DIRECTORY_CTR;
-typedef struct spool_r_getprinterdriverdirectory
+typedef struct spool_q_getprinterdriverdirectory
{
+ uint32 name_ptr;
+ UNISTR2 name;
+ uint32 environment_ptr;
+ UNISTR2 environment;
uint32 level;
- DRIVER_DIRECTORY_CTR ctr;
+ NEW_BUFFER *buffer;
uint32 offered;
- uint32 status;
+} SPOOL_Q_GETPRINTERDRIVERDIR;
+typedef struct spool_r_getprinterdriverdirectory
+{
+ NEW_BUFFER *buffer;
+ uint32 needed;
+ uint32 status;
} SPOOL_R_GETPRINTERDRIVERDIR;
typedef struct spool_q_enumprintprocessors
{
+ uint32 name_ptr;
UNISTR2 name;
+ uint32 environment_ptr;
UNISTR2 environment;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_ENUMPRINTPROCESSORS;
typedef struct printprocessor_1
@@ -1393,58 +1317,66 @@ typedef struct printprocessor_1
typedef struct spool_r_enumprintprocessors
{
- uint32 level;
- PRINTPROCESSOR_1 *info_1;
- uint32 offered;
- uint32 numofprintprocessors;
+ NEW_BUFFER *buffer;
+ uint32 needed;
+ uint32 returned;
uint32 status;
} SPOOL_R_ENUMPRINTPROCESSORS;
-typedef struct spool_q_enumprintprocessordatatypes
+typedef struct spool_q_enumprintprocdatatypes
{
+ uint32 name_ptr;
UNISTR2 name;
- UNISTR2 printprocessor;
+ uint32 processor_ptr;
+ UNISTR2 processor;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
-} SPOOL_Q_ENUMPRINTPROCESSORDATATYPES;
+ NEW_BUFFER *buffer;
+ uint32 offered;
+} SPOOL_Q_ENUMPRINTPROCDATATYPES;
typedef struct ppdatatype_1
{
UNISTR name;
-} PPDATATYPE_1;
+} PRINTPROCDATATYPE_1;
-typedef struct spool_r_enumprintprocessordatatypes
+typedef struct spool_r_enumprintprocdatatypes
{
- uint32 level;
- PPDATATYPE_1 *info_1;
- uint32 offered;
- uint32 numofppdatatypes;
+ NEW_BUFFER *buffer;
+ uint32 needed;
+ uint32 returned;
uint32 status;
-} SPOOL_R_ENUMPRINTPROCESSORDATATYPES;
-
-typedef struct spool_q_enumprintmonitors
-{
- UNISTR2 name;
- uint32 level;
- BUFFER buffer;
- uint32 buf_size;
-} SPOOL_Q_ENUMPRINTMONITORS;
+} SPOOL_R_ENUMPRINTPROCDATATYPES;
typedef struct printmonitor_1
{
UNISTR name;
} PRINTMONITOR_1;
-typedef struct spool_r_enumprintmonitors
+typedef struct printmonitor_2
+{
+ UNISTR name;
+ UNISTR environment;
+ UNISTR dll_name;
+} PRINTMONITOR_2;
+
+typedef struct spool_q_enumprintmonitors
{
+ uint32 name_ptr;
+ UNISTR2 name;
uint32 level;
- PRINTMONITOR_1 *info_1;
+ NEW_BUFFER *buffer;
uint32 offered;
- uint32 numofprintmonitors;
+} SPOOL_Q_ENUMPRINTMONITORS;
+
+typedef struct spool_r_enumprintmonitors
+{
+ NEW_BUFFER *buffer;
+ uint32 needed;
+ uint32 returned;
uint32 status;
} SPOOL_R_ENUMPRINTMONITORS;
+
typedef struct spool_q_enumprinterdata
{
POLICY_HND handle;
@@ -1456,7 +1388,7 @@ typedef struct spool_q_enumprinterdata
typedef struct spool_r_enumprinterdata
{
uint32 valuesize;
- UNISTR value;
+ uint16 *value;
uint32 realvaluesize;
uint32 type;
uint32 datasize;
@@ -1526,9 +1458,8 @@ typedef struct spool_q_getjob
POLICY_HND handle;
uint32 jobid;
uint32 level;
- BUFFER buffer;
- uint32 buf_size;
-
+ NEW_BUFFER *buffer;
+ uint32 offered;
} SPOOL_Q_GETJOB;
typedef struct pjob_info_info
@@ -1543,9 +1474,8 @@ typedef struct pjob_info_info
typedef struct spool_r_getjob
{
- uint32 level;
- PJOB_INFO ctr;
- uint32 offered;
+ NEW_BUFFER *buffer;
+ uint32 needed;
uint32 status;
} SPOOL_R_GETJOB;
@@ -1554,4 +1484,3 @@ typedef struct spool_r_getjob
#endif /* _RPC_SPOOLSS_H */
-
diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c
index 5c313ed25d0..8028001657a 100644
--- a/source/rpc_client/cli_spoolss.c
+++ b/source/rpc_client/cli_spoolss.c
@@ -3,9 +3,10 @@
* Unix SMB/Netbios implementation.
* Version 1.9.
* RPC Pipe client / server routines
- * Copyright (C) Andrew Tridgell 1992-1997,
- * Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- * Copyright (C) Paul Ashton 1997.
+ * Copyright (C) Andrew Tridgell 1992-2000,
+ * Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
+ * Copyright (C) Paul Ashton 1997-2000,
+ * Copyright (C) Jean Francois Micouleau 1998-2000,
*
* 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
@@ -37,93 +38,82 @@ extern int DEBUGLEVEL;
/****************************************************************************
do a SPOOLSS Enum Printers
****************************************************************************/
-BOOL spoolss_enum_printers(uint32 flags, const char *srv_name,
- uint32 level,
- uint32 *count,
- void ***printers)
+uint32 spoolss_enum_printers(uint32 flags, fstring srv_name, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
{
prs_struct rbuf;
prs_struct buf;
SPOOL_Q_ENUMPRINTERS q_o;
+ SPOOL_R_ENUMPRINTERS r_o;
BOOL valid_pol = False;
struct cli_connection *con = NULL;
if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
- {
return False;
- }
-
- if (count == NULL || printers == NULL) return False;
prs_init(&buf , 0, 4, False);
prs_init(&rbuf, 0, 4, True );
/* create and send a MSRPC command with api SPOOLSS_ENUM_PRINTERS */
- DEBUG(5,("SPOOLSS Enum Printers (Server: %s level: %d)\n",
- srv_name, level));
+ DEBUG(5,("SPOOLSS Enum Printers (Server: %s level: %d)\n", srv_name, level));
- make_spoolss_q_enumprinters(&q_o, flags, srv_name, level, 0x2000);
+ make_spoolss_q_enumprinters(&q_o, flags, "", level, buffer, offered);
/* turn parameters into data stream */
- if (spoolss_io_q_enumprinters("", &q_o, &buf, 0) &&
- rpc_con_pipe_req(con, SPOOLSS_ENUMPRINTERS, &buf, &rbuf))
- {
- SPOOL_R_ENUMPRINTERS r_o;
- BOOL p;
-
- ZERO_STRUCT(r_o);
-
- r_o.level = level; /* i can't believe you have to this */
-
- spoolss_io_r_enumprinters("", &r_o, &rbuf, 0);
- p = rbuf.offset != 0;
+ if (!spoolss_io_q_enumprinters("", &q_o, &buf, 0) ) {
+ prs_free_data(&rbuf);
+ prs_free_data(&buf );
- if (p && r_o.status != 0)
- {
- /* report error code */
- DEBUG(5,("SPOOLSS_ENUM_PRINTERS: %s\n", get_nt_error_msg(r_o.status)));
- p = False;
- }
+ cli_connection_unlink(con);
+ }
+
+ if(!rpc_con_pipe_req(con, SPOOLSS_ENUMPRINTERS, &buf, &rbuf)) {
+ prs_free_data(&rbuf);
+ prs_free_data(&buf );
- if (p)
- {
- /* ok, at last: we're happy. return the policy handle */
- (*count) = r_o.returned;
- (*printers) = r_o.ctr.printer.info;
- valid_pol = True;
- }
+ cli_connection_unlink(con);
}
+ prs_free_data(&buf );
+ ZERO_STRUCT(r_o);
+
+ buffer->prs.io=UNMARSHALL;
+ buffer->prs.offset=0;
+ r_o.buffer=buffer;
+
+ if(!new_spoolss_io_r_enumprinters("", &r_o, &rbuf, 0)) {
+ prs_free_data(&rbuf);
+ cli_connection_unlink(con);
+ }
+
+ *needed=r_o.needed;
+ *returned=r_o.returned;
+
prs_free_data(&rbuf);
prs_free_data(&buf );
cli_connection_unlink(con);
- return valid_pol;
+ return r_o.status;
}
/****************************************************************************
do a SPOOLSS Enum Jobs
****************************************************************************/
-uint32 spoolss_enum_jobs( const POLICY_HND *hnd,
- uint32 firstjob,
- uint32 numofjobs,
- uint32 level,
- uint32 *buf_size,
- uint32 *count,
- void ***jobs)
+uint32 spoolss_enum_jobs(const POLICY_HND *hnd, uint32 firstjob, uint32 numofjobs,
+ uint32 level, NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
{
prs_struct rbuf;
prs_struct buf;
SPOOL_Q_ENUMJOBS q_o;
- uint32 status = NT_STATUS_INTERNAL_ERROR;
+ SPOOL_R_ENUMJOBS r_o;
- if (hnd == NULL || count == NULL || jobs == NULL)
- {
+ if (hnd == NULL)
return NT_STATUS_INVALID_PARAMETER;
- }
prs_init(&buf , 0, 4, False);
prs_init(&rbuf, 0, 4, True );
@@ -132,54 +122,102 @@ uint32 spoolss_enum_jobs( const POLICY_HND *hnd,
DEBUG(5,("SPOOLSS Enum Jobs level: %d)\n", level));
- make_spoolss_q_enumjobs(&q_o, hnd,
- firstjob, numofjobs,
- level, *buf_size);
+ make_spoolss_q_enumjobs(&q_o, hnd, firstjob, numofjobs, level, buffer, offered);
/* turn parameters into data stream */
- if (spoolss_io_q_enumjobs("", &q_o, &buf, 0) &&
- rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMJOBS, &buf, &rbuf))
+ if (!spoolss_io_q_enumjobs("", &q_o, &buf, 0)) {
+ prs_free_data(&rbuf);
+ prs_free_data(&buf );
+ }
+
+ if(!rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMJOBS, &buf, &rbuf))
{
- SPOOL_R_ENUMJOBS r_o;
- BOOL p;
+ prs_free_data(&rbuf);
+ prs_free_data(&buf );
+ }
+
+ ZERO_STRUCT(r_o);
+ prs_free_data(&buf );
+
+ r_o.buffer=buffer;
+
+ if(!spoolss_io_r_enumjobs("", &r_o, &rbuf, 0)) {
+ prs_free_data(&rbuf);
+ }
+
+ *needed=r_o.needed;
+ *returned=r_o.returned;
- ZERO_STRUCT(r_o);
+ prs_free_data(&rbuf);
+ prs_free_data(&buf );
- r_o.level = level; /* i can't believe you have to this */
+ return r_o.status;
+}
- spoolss_io_r_enumjobs("", &r_o, &rbuf, 0);
- p = rbuf.offset != 0;
+/****************************************************************************
+do a SPOOLSS Enum printer datas
+****************************************************************************/
+uint32 spoolss_enum_printerdata(const POLICY_HND *hnd, uint32 index,
+ uint32 *valuelen, uint16 *value, uint32 *rvaluelen,
+ uint32 *type,
+ uint32 *datalen, uint8 *data, uint32 *rdatalen)
+{
+ prs_struct rbuf;
+ prs_struct buf;
+ SPOOL_Q_ENUMPRINTERDATA q_o;
+ SPOOL_R_ENUMPRINTERDATA r_o;
- status = r_o.status;
+ if (hnd == NULL)
+ return NT_STATUS_INVALID_PARAMETER;
- if (p && r_o.status != 0)
- {
- /* report error code */
- DEBUG(5,("SPOOLSS_ENUM_JOBS: %s\n", get_nt_error_msg(r_o.status)));
- p = status = ERROR_INSUFFICIENT_BUFFER;
- }
+ prs_init(&buf , 0, 4, False);
+ prs_init(&rbuf, 0, 4, True );
- if (p)
- {
- /* ok, at last: we're happy. return the policy handle */
- (*count) = r_o.numofjobs;
- (*jobs) = r_o.ctr.job.info;
- (*buf_size) = r_o.offered;
- }
+ /* create and send a MSRPC command with api SPOOLSS_ENUMJOBS */
+
+ DEBUG(5,("SPOOLSS Enum Printer data)\n"));
+
+ make_spoolss_q_enumprinterdata(&q_o, hnd, index, *valuelen, *datalen);
+
+ /* turn parameters into data stream */
+ if (!spoolss_io_q_enumprinterdata("", &q_o, &buf, 0)) {
+ prs_free_data(&rbuf);
+ prs_free_data(&buf );
+ }
+
+ if(!rpc_hnd_pipe_req(hnd, SPOOLSS_ENUMJOBS, &buf, &rbuf)) {
+ prs_free_data(&rbuf);
+ prs_free_data(&buf );
+ }
+
+ ZERO_STRUCT(r_o);
+ prs_free_data(&buf );
+
+ r_o.data=data;
+ r_o.value=value;
+
+ if(!spoolss_io_r_enumprinterdata("", &r_o, &rbuf, 0)) {
+ prs_free_data(&rbuf);
}
+
+ *valuelen=r_o.valuesize;
+ *rvaluelen=r_o.realvaluesize;
+ *type=r_o.type;
+ *datalen=r_o.datasize;
+ *rdatalen=r_o.realdatasize;
prs_free_data(&rbuf);
prs_free_data(&buf );
- return status;
+ return r_o.status;
}
/****************************************************************************
do a SPOOLSS Open Printer Ex
****************************************************************************/
-BOOL spoolss_open_printer_ex( const char *printername,
- uint32 cbbuf, uint32 devmod, uint32 des_access,
- const char *station, const char *username,
+BOOL spoolss_open_printer_ex( char *printername,
+ char *datatype, uint32 access_required,
+ char *station, char *username,
POLICY_HND *hnd)
{
prs_struct rbuf;
@@ -197,14 +235,10 @@ BOOL spoolss_open_printer_ex( const char *printername,
s = strchr(&srv_name[2], '\\');
if (s != NULL)
- {
*s = 0;
- }
if (!cli_connection_init(srv_name, PIPE_SPOOLSS, &con))
- {
return False;
- }
if (hnd == NULL) return False;
@@ -215,9 +249,8 @@ BOOL spoolss_open_printer_ex( const char *printername,
DEBUG(5,("SPOOLSS Open Printer Ex\n"));
- make_spoolss_q_open_printer_ex(&q_o, printername,
- cbbuf, devmod, des_access,
- station, username);
+ make_spoolss_q_open_printer_ex(&q_o, printername, datatype,
+ access_required, station, username);
/* turn parameters into data stream */
if (spoolss_io_q_open_printer_ex("", &q_o, &buf, 0) &&
@@ -243,7 +276,7 @@ BOOL spoolss_open_printer_ex( const char *printername,
valid_pol = register_policy_hnd(get_global_hnd_cache(),
cli_con_sec_ctx(con),
- hnd, des_access) &&
+ hnd, access_required) &&
set_policy_con(get_global_hnd_cache(),
hnd, con,
cli_connection_unlink);
@@ -294,11 +327,6 @@ BOOL spoolss_closeprinter(POLICY_HND *hnd)
DEBUG(0,("SPOOL_CLOSEPRINTER: %s\n", get_nt_error_msg(r_c.status)));
p = False;
}
-
- if (p)
- {
- valid_close = True;
- }
}
prs_free_data(&rbuf);
diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c
index 3509f996b8b..e8f30d32f7d 100644
--- a/source/rpc_parse/parse_prs.c
+++ b/source/rpc_parse/parse_prs.c
@@ -56,7 +56,7 @@ void prs_debug_out(const prs_struct * ps, char *msg, int level)
/*******************************************************************
initialise a parse structure
********************************************************************/
-void prs_init(prs_struct * ps, uint32 size, uint8 align, BOOL io)
+BOOL prs_init(prs_struct * ps, uint32 size, uint8 align, BOOL io)
{
ps->struct_start = 0xfefefefe;
ps->io = io;
@@ -82,6 +82,7 @@ void prs_init(prs_struct * ps, uint32 size, uint8 align, BOOL io)
}
CHECK_STRUCT(ps);
+ return True;
}
/*******************************************************************
@@ -451,18 +452,19 @@ void prs_link(prs_struct * prev, prs_struct * ps, prs_struct * next)
align a pointer to a multiple of align_offset bytes. looks like it
will work for offsets of 0, 2 and 4...
********************************************************************/
-void prs_align(prs_struct * ps)
+BOOL prs_align(prs_struct * ps)
{
int mod;
CHECK_STRUCT(ps);
if (ps->error)
- return;
+ return False;
mod = ps->offset & (ps->align - 1);
if (ps->align != 0 && mod != 0)
{
ps->offset += ps->align - mod;
prs_grow(ps, ps->offset);
}
+ return True;
}
/*******************************************************************
@@ -554,6 +556,94 @@ BOOL prs_add_data(prs_struct * ps, const char *data, int len)
}
/*******************************************************************
+ Change the struct type.
+ ********************************************************************/
+
+void prs_switch_type(prs_struct *ps, BOOL io)
+{
+ if ((ps->io ^ io) == True)
+ ps->io=io;
+}
+
+/*******************************************************************
+ Force a prs_struct to be dynamic even when it's size is 0.
+ ********************************************************************/
+
+void prs_force_dynamic(prs_struct *ps)
+{
+}
+
+/*******************************************************************
+ Fetch the current offset (external interface).
+ ********************************************************************/
+
+uint32 prs_offset(prs_struct *ps)
+{
+ return ps->offset;
+}
+
+/*******************************************************************
+ Set the current offset (external interface).
+ ********************************************************************/
+
+BOOL prs_set_offset(prs_struct *ps, uint32 offset)
+{
+ if(offset <= ps->offset) {
+ ps->offset = offset;
+ return True;
+ }
+
+ if(!prs_grow(ps, offset - ps->offset))
+ return False;
+
+ ps->offset = offset;
+ return True;
+}
+
+/*******************************************************************
+ Delete the memory in a parse structure - if we own it.
+ ********************************************************************/
+
+void prs_mem_free(prs_struct *ps)
+{
+ if (ps->data)
+ free(ps->data);
+ ps->data = NULL;
+ ps->offset = 0;
+}
+
+
+/*******************************************************************
+ Append some data from one parse_struct into another.
+ ********************************************************************/
+
+BOOL prs_append_some_prs_data(prs_struct *dst, prs_struct *src, int32 start, uint32 len)
+{
+
+ /*
+ * JFM:
+ * ok, it looks like shit. It smells like shit.
+ * summary: it's shit.
+ *
+ * I'm not proud of that code. I mae that ugly hack to
+ * a) not change luke's prs memory managment
+ * b) not change the spoolss parsing code
+ *
+ * mail me, call me, hit me before changing that piece of code.
+ */
+
+ if (start==0)
+ prs_add_data(dst, src->data, len);
+ else {
+ dst->data_size=0;
+ prs_add_data(dst, src->data+start, len);
+ }
+
+ dst->offset=dst->data_size;
+ return True;
+}
+
+/*******************************************************************
stream a uint8
********************************************************************/
BOOL _prs_uint8(char *name, prs_struct * ps, int depth, uint8 * data8)
diff --git a/source/rpc_parse/parse_rpc.c b/source/rpc_parse/parse_rpc.c
index 2deb5d93293..c482561436c 100644
--- a/source/rpc_parse/parse_rpc.c
+++ b/source/rpc_parse/parse_rpc.c
@@ -134,7 +134,7 @@ interface/version dce/rpc pipe identification
#define SYNT_SPOOLSS_V1 \
{ \
{ \
- 0x12345678, 0x1234, 0xabcb, \
+ 0x12345678, 0x1234, 0xabcd, \
{ 0xef, 0x00, 0x01, 0x23, \
0x45, 0x67, 0x89, 0xab } \
}, 0x01 \
diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c
index 0d833a7a109..d9e761da613 100644
--- a/source/rpc_parse/parse_spoolss.c
+++ b/source/rpc_parse/parse_spoolss.c
@@ -2,9 +2,9 @@
* Unix SMB/Netbios implementation.
* Version 1.9.
* RPC Pipe client / server routines
- * Copyright (C) Andrew Tridgell 1992-1998,
- * Copyright (C) Luke Kenneth Casson Leighton 1996-1998,
- * Copyright (C) Jean François Micouleau 1998.
+ * Copyright (C) Andrew Tridgell 1992-2000,
+ * Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
+ * Copyright (C) Jean François Micouleau 1998-2000.
*
* 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
@@ -23,12 +23,19 @@
#include "includes.h"
-#include "rpc_parse.h"
#include "nterr.h"
-extern int DEBUGLEVEL;
+#ifdef TNG
+ #define prs_uint16 _prs_uint16
+ #define prs_uint32 _prs_uint32
+ #define prs_uint8s _prs_uint8s
+ #define prs_uint16s _prs_uint16s
+ #define prs_unistr _prs_unistr
+ #define init_unistr2 make_unistr2
+#endif
+extern int DEBUGLEVEL;
/*******************************************************************
return the length of a UNISTR string.
********************************************************************/
@@ -165,24 +172,26 @@ static BOOL smb_io_doc_info_container(char *desc, DOC_INFO_CONTAINER *cont, prs_
/*******************************************************************
reads or writes an NOTIFY OPTION TYPE structure.
********************************************************************/
-static BOOL smb_io_notify_option_type(char *desc,
- SPOOL_NOTIFY_OPTION_TYPE *type,
- prs_struct *ps, int depth)
+static BOOL smb_io_notify_option_type(char *desc, SPOOL_NOTIFY_OPTION_TYPE *type, prs_struct *ps, int depth)
{
- uint32 useless_ptr;
-
prs_debug(ps, depth, desc, "smb_io_notify_option_type");
depth++;
- prs_align(ps);
-
- prs_uint16("type", ps, depth, &(type->type));
- prs_uint16("reserved0", ps, depth, &(type->reserved0));
- prs_uint32("reserved1", ps, depth, &(type->reserved1));
- prs_uint32("reserved2", ps, depth, &(type->reserved2));
- prs_uint32("count", ps, depth, &(type->count));
- prs_uint32("useless ptr", ps, depth, &useless_ptr);
+ if (!prs_align(ps))
+ return False;
+ if(!prs_uint16("type", ps, depth, &type->type))
+ return False;
+ if(!prs_uint16("reserved0", ps, depth, &type->reserved0))
+ return False;
+ if(!prs_uint32("reserved1", ps, depth, &type->reserved1))
+ return False;
+ if(!prs_uint32("reserved2", ps, depth, &type->reserved2))
+ return False;
+ if(!prs_uint32("count", ps, depth, &type->count))
+ return False;
+ if(!prs_uint32("fields_ptr", ps, depth, &type->fields_ptr))
+ return False;
return True;
}
@@ -190,79 +199,97 @@ static BOOL smb_io_notify_option_type(char *desc,
/*******************************************************************
reads or writes an NOTIFY OPTION TYPE DATA.
********************************************************************/
-static BOOL smb_io_notify_option_type_data(char *desc,
- SPOOL_NOTIFY_OPTION_TYPE *type,
- prs_struct *ps, int depth)
+static BOOL smb_io_notify_option_type_data(char *desc, SPOOL_NOTIFY_OPTION_TYPE *type, prs_struct *ps, int depth)
{
- uint32 count;
int i;
prs_debug(ps, depth, desc, "smb_io_notify_option_type_data");
depth++;
- prs_align(ps);
+ /* if there are no fields just return */
+ if (type->fields_ptr==0)
+ return True;
+
+ if(!prs_align(ps))
+ return False;
- prs_uint32("count", ps, depth, &count);
+ if(!prs_uint32("count2", ps, depth, &type->count2))
+ return False;
- if (count != type->count)
- {
- DEBUG(4,("What a mess, count was %x now is %x !\n",type->count,count));
- type->count=count;
- }
- for(i=0;i<count;i++)
- {
- /* read the option type struct */
- prs_uint16("fields",ps,depth,&(type->fields[i]));
- }
+ if (type->count2 != type->count)
+ DEBUG(4,("What a mess, count was %x now is %x !\n", type->count, type->count2));
+ /* parse the option type data */
+ for(i=0;i<type->count2;i++)
+ if(!prs_uint16("fields",ps,depth,&(type->fields[i])))
+ return False;
return True;
}
/*******************************************************************
reads or writes an NOTIFY OPTION structure.
********************************************************************/
-static BOOL smb_io_notify_option(char *desc, SPOOL_NOTIFY_OPTION *option,
- prs_struct *ps, int depth)
-{
- uint32 useless_ptr;
+static BOOL smb_io_notify_option_type_ctr(char *desc, SPOOL_NOTIFY_OPTION_TYPE_CTR *ctr , prs_struct *ps, int depth)
+{
int i;
-
- prs_debug(ps, depth, desc, "smb_io_notify_option");
+
+ prs_debug(ps, depth, desc, "smb_io_notify_option_type_ctr");
depth++;
- prs_align(ps);
+ if(!prs_uint32("count", ps, depth, &ctr->count))
+ return False;
- /* memory pointer to the struct */
- prs_uint32("useless ptr", ps, depth, &useless_ptr);
+ /* reading */
+ if (UNMARSHALLING(ps))
+ ctr->type=(SPOOL_NOTIFY_OPTION_TYPE *)malloc(ctr->count*sizeof(SPOOL_NOTIFY_OPTION_TYPE));
+
+ /* the option type struct */
+ for(i=0;i<ctr->count;i++)
+ if(!smb_io_notify_option_type("", &(ctr->type[i]) , ps, depth))
+ return False;
+
+ /* the type associated with the option type struct */
+ for(i=0;i<ctr->count;i++)
+ if(!smb_io_notify_option_type_data("", &(ctr->type[i]) , ps, depth))
+ return False;
- prs_uint32("version", ps, depth, &(option->version));
- prs_uint32("reserved", ps, depth, &(option->reserved));
- prs_uint32("count", ps, depth, &(option->count));
- prs_uint32("useless ptr", ps, depth, &useless_ptr);
- prs_uint32("count", ps, depth, &(option->count));
-
- /* read the option type struct */
- for(i=0;i<option->count;i++)
- {
- smb_io_notify_option_type("",&(option->type[i]) ,ps, depth);
- }
+ return True;
+}
- /* now read the type associated with the option type struct */
- for(i=0;i<option->count;i++)
- {
- smb_io_notify_option_type_data("",&(option->type[i]) ,ps, depth);
+/*******************************************************************
+reads or writes an NOTIFY OPTION structure.
+********************************************************************/
+static BOOL smb_io_notify_option(char *desc, SPOOL_NOTIFY_OPTION *option, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "smb_io_notify_option");
+ depth++;
+
+ if(!prs_uint32("version", ps, depth, &option->version))
+ return False;
+ if(!prs_uint32("flags", ps, depth, &option->flags))
+ return False;
+ if(!prs_uint32("count", ps, depth, &option->count))
+ return False;
+ if(!prs_uint32("option_type_ptr", ps, depth, &option->option_type_ptr))
+ return False;
+
+ /* marshalling or unmarshalling, that would work */
+ if (option->option_type_ptr!=0) {
+ if(!smb_io_notify_option_type_ctr("", &option->ctr ,ps, depth))
+ return False;
+ }
+ else {
+ option->ctr.type=NULL;
+ option->ctr.count=0;
}
-
return True;
}
-
/*******************************************************************
reads or writes an NOTIFY INFO DATA structure.
********************************************************************/
-static BOOL smb_io_notify_info_data(char *desc,SPOOL_NOTIFY_INFO_DATA *data,
- prs_struct *ps, int depth)
+static BOOL smb_io_notify_info_data(char *desc,SPOOL_NOTIFY_INFO_DATA *data, prs_struct *ps, int depth)
{
uint32 useless_ptr=0xADDE0FF0;
@@ -340,19 +367,16 @@ BOOL smb_io_notify_info_data_strings(char *desc,SPOOL_NOTIFY_INFO_DATA *data,
/*******************************************************************
reads or writes an NOTIFY INFO structure.
********************************************************************/
-static BOOL smb_io_notify_info(char *desc, SPOOL_NOTIFY_INFO *info,
- prs_struct *ps, int depth)
+static BOOL smb_io_notify_info(char *desc, SPOOL_NOTIFY_INFO *info, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0x0001;
int i;
- info->version=0x02;
prs_debug(ps, depth, desc, "smb_io_notify_info");
depth++;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- prs_uint32("pointer", ps, depth, &useless_ptr);
prs_uint32("count", ps, depth, &(info->count));
prs_uint32("version", ps, depth, &(info->version));
prs_uint32("flags", ps, depth, &(info->flags));
@@ -366,75 +390,277 @@ static BOOL smb_io_notify_info(char *desc, SPOOL_NOTIFY_INFO *info,
/* now do the strings at the end of the stream */
for (i=0;i<info->count;i++)
{
- smb_io_notify_info_data_strings(desc, &(info->data[i]),
- ps, depth);
+ smb_io_notify_info_data_strings(desc, &(info->data[i]), ps, depth);
}
return True;
}
+
/*******************************************************************
- * write a structure.
- * called from static spoolss_r_open_printer_ex (srv_spoolss.c)
- * called from spoolss_open_printer_ex (cli_spoolss.c)
- ********************************************************************/
-BOOL spoolss_io_r_open_printer_ex(char *desc, SPOOL_R_OPEN_PRINTER_EX *r_u, prs_struct *ps, int depth)
+********************************************************************/
+static BOOL spool_io_user_level_1(char *desc, SPOOL_USER_1 *q_u, prs_struct *ps, int depth)
{
- if (r_u == NULL) return False;
-
- prs_debug(ps, depth, desc, "spoolss_io_r_open_printer_ex");
+ prs_debug(ps, depth, desc, "");
depth++;
- prs_align(ps);
- smb_io_pol_hnd("printer handle",&r_u->handle,ps,depth);
+ /* reading */
+ if (ps->io)
+ ZERO_STRUCTP(q_u);
+
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("size", ps, depth, &(q_u->size)))
+ return False;
+ if (!prs_uint32("client_name_ptr", ps, depth, &(q_u->client_name_ptr)))
+ return False;
+ if (!prs_uint32("user_name_ptr", ps, depth, &(q_u->user_name_ptr)))
+ return False;
+ if (!prs_uint32("build", ps, depth, &(q_u->build)))
+ return False;
+ if (!prs_uint32("major", ps, depth, &(q_u->major)))
+ return False;
+ if (!prs_uint32("minor", ps, depth, &(q_u->minor)))
+ return False;
+ if (!prs_uint32("processor", ps, depth, &(q_u->processor)))
+ return False;
+
+ if (!smb_io_unistr2("", &(q_u->client_name), q_u->client_name_ptr, ps, depth))
+ return False;
+ if (!prs_align(ps))
+ return False;
+ if (!smb_io_unistr2("", &(q_u->user_name), q_u->user_name_ptr, ps, depth))
+ return False;
+
+ return True;
+}
-/* prs_align(ps);*/
+/*******************************************************************
+********************************************************************/
+static BOOL spool_io_user_level(char *desc, SPOOL_USER_CTR *q_u, prs_struct *ps, int depth)
+{
+ if (q_u==NULL)
+ return False;
- prs_uint32("status code", ps, depth, &(r_u->status));
+ prs_debug(ps, depth, desc, "spool_io_user_level");
+ depth++;
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
+ if (!prs_uint32("ptr", ps, depth, &q_u->ptr))
+ return False;
+
+ switch (q_u->level) {
+ case 1:
+ if (!spool_io_user_level_1("", &(q_u->user1), ps, depth))
+ return False;
+ break;
+ default:
+ return False;
+ }
return True;
}
/*******************************************************************
- * make a structure.
+ * read or write a DEVICEMODE struct.
+ * on reading allocate memory for the private member
********************************************************************/
-BOOL make_spoolss_q_open_printer_ex(SPOOL_Q_OPEN_PRINTER_EX *q_u,
- const char *printername,
- uint32 cbbuf, uint32 devmod, uint32 des_access,
- const char *station,
- const char *username)
+static BOOL spoolss_io_devmode(char *desc, prs_struct *ps, int depth, DEVICEMODE *devmode)
{
- int len_name = printername != NULL ? strlen(printername) : 0;
- int len_sta = station != NULL ? strlen(station ) : 0;
- int len_user = username != NULL ? strlen(username ) : 0;
+ prs_debug(ps, depth, desc, "spoolss_io_devmode");
+ depth++;
- if (q_u == NULL) return False;
+ if (!prs_uint16s(True,"devicename", ps, depth, devmode->devicename.buffer, 32))
+ return False;
+ if (!prs_uint16("specversion", ps, depth, &(devmode->specversion)))
+ return False;
+ if (!prs_uint16("driverversion", ps, depth, &(devmode->driverversion)))
+ return False;
+ if (!prs_uint16("size", ps, depth, &(devmode->size)))
+ return False;
+ if (!prs_uint16("driverextra", ps, depth, &(devmode->driverextra)))
+ return False;
+ if (!prs_uint32("fields", ps, depth, &(devmode->fields)))
+ return False;
+ if (!prs_uint16("orientation", ps, depth, &(devmode->orientation)))
+ return False;
+ if (!prs_uint16("papersize", ps, depth, &(devmode->papersize)))
+ return False;
+ if (!prs_uint16("paperlength", ps, depth, &(devmode->paperlength)))
+ return False;
+ if (!prs_uint16("paperwidth", ps, depth, &(devmode->paperwidth)))
+ return False;
+ if (!prs_uint16("scale", ps, depth, &(devmode->scale)))
+ return False;
+ if (!prs_uint16("copies", ps, depth, &(devmode->copies)))
+ return False;
+ if (!prs_uint16("defaultsource", ps, depth, &(devmode->defaultsource)))
+ return False;
+ if (!prs_uint16("printquality", ps, depth, &(devmode->printquality)))
+ return False;
+ if (!prs_uint16("color", ps, depth, &(devmode->color)))
+ return False;
+ if (!prs_uint16("duplex", ps, depth, &(devmode->duplex)))
+ return False;
+ if (!prs_uint16("yresolution", ps, depth, &(devmode->yresolution)))
+ return False;
+ if (!prs_uint16("ttoption", ps, depth, &(devmode->ttoption)))
+ return False;
+ if (!prs_uint16("collate", ps, depth, &(devmode->collate)))
+ return False;
+ if (!prs_uint16s(True, "formname", ps, depth, devmode->formname.buffer, 32))
+ return False;
+ if (!prs_uint16("logpixels", ps, depth, &(devmode->logpixels)))
+ return False;
+ if (!prs_uint32("bitsperpel", ps, depth, &(devmode->bitsperpel)))
+ return False;
+ if (!prs_uint32("pelswidth", ps, depth, &(devmode->pelswidth)))
+ return False;
+ if (!prs_uint32("pelsheight", ps, depth, &(devmode->pelsheight)))
+ return False;
+ if (!prs_uint32("displayflags", ps, depth, &(devmode->displayflags)))
+ return False;
+ if (!prs_uint32("displayfrequency", ps, depth, &(devmode->displayfrequency)))
+ return False;
+ if (!prs_uint32("icmmethod", ps, depth, &(devmode->icmmethod)))
+ return False;
+ if (!prs_uint32("icmintent", ps, depth, &(devmode->icmintent)))
+ return False;
+ if (!prs_uint32("mediatype", ps, depth, &(devmode->mediatype)))
+ return False;
+ if (!prs_uint32("dithertype", ps, depth, &(devmode->dithertype)))
+ return False;
+ if (!prs_uint32("reserved1", ps, depth, &(devmode->reserved1)))
+ return False;
+ if (!prs_uint32("reserved2", ps, depth, &(devmode->reserved2)))
+ return False;
+ if (!prs_uint32("panningwidth", ps, depth, &(devmode->panningwidth)))
+ return False;
+ if (!prs_uint32("panningheight", ps, depth, &(devmode->panningheight)))
+ return False;
+
+ if (devmode->driverextra!=0)
+ {
+ if (UNMARSHALLING(ps)) {
+ devmode->private=(uint8 *)malloc(devmode->driverextra*sizeof(uint8));
+ DEBUG(7,("spoolss_io_devmode: allocated memory [%d] for private\n",devmode->driverextra));
+ }
+
+ DEBUG(7,("spoolss_io_devmode: parsing [%d] bytes of private\n",devmode->driverextra));
+ if (!prs_uint8s(True, "private", ps, depth, devmode->private, devmode->driverextra))
+ return False;
+ }
+
+ return True;
+}
+
+/*******************************************************************
+ Read or write a DEVICEMODE container
+********************************************************************/
+static BOOL spoolss_io_devmode_cont(char *desc, DEVMODE_CTR *dm_c, prs_struct *ps, int depth)
+{
+ if (dm_c==NULL)
+ return False;
+
+ prs_debug(ps, depth, desc, "spoolss_io_devmode_cont");
+ depth++;
+
+ if(!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("size", ps, depth, &dm_c->size))
+ return False;
+
+ if (!prs_uint32("devmode_ptr", ps, depth, &dm_c->devmode_ptr))
+ return False;
+
+ if (dm_c->size==0 || dm_c->devmode_ptr==0) {
+ if (UNMARSHALLING(ps))
+ /* if while reading there is no DEVMODE ... */
+ dm_c->devmode=NULL;
+ return True;
+ }
+
+ /* so we have a DEVICEMODE to follow */
+ if (UNMARSHALLING(ps)) {
+ DEBUG(9,("Allocating memory for spoolss_io_devmode\n"));
+ dm_c->devmode=(DEVICEMODE *)malloc(sizeof(DEVICEMODE));
+ ZERO_STRUCTP(dm_c->devmode);
+ }
+
+ /* this is bad code, shouldn't be there */
+ if (!prs_uint32("size", ps, depth, &dm_c->size))
+ return False;
+
+ if (!spoolss_io_devmode(desc, ps, depth, dm_c->devmode))
+ return False;
- DEBUG(5,("make_spoolss_io_q_open_printer_ex\n"));
+ return True;
+}
+
+/*******************************************************************
+********************************************************************/
+static BOOL spoolss_io_printer_default(char *desc, PRINTER_DEFAULT *pd, prs_struct *ps, int depth)
+{
+ if (pd==NULL)
+ return False;
- q_u->ptr = 1;
- make_unistr2(&(q_u->printername), printername, len_name);
+ prs_debug(ps, depth, desc, "spoolss_io_printer_default");
+ depth++;
+
+ if (!prs_uint32("datatype_ptr", ps, depth, &pd->datatype_ptr))
+ return False;
+
+ if (!smb_io_unistr2("datatype", &(pd->datatype), pd->datatype_ptr, ps,depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
- q_u->unknown0 = 0x0; /* 0x0000 0000 */
- q_u->cbbuf = cbbuf; /* 0x0000 0000 */
- q_u->devmod = devmod; /* 0x0000 0000 */
- q_u->access_required = des_access;
+ if (!spoolss_io_devmode_cont("", &(pd->devmode_cont), ps, depth))
+ return False;
- q_u->unknown1 = 0x1;
- q_u->unknown2 = 0x1;
- q_u->unknown3 = 0x149f7d8; /* looks like a pointer */
- q_u->unknown4 = 0x1c;
- q_u->unknown5 = 0x00b94dd0;
- q_u->unknown6 = 0x0149f5cc; /* looks like _another_ pointer */
- q_u->unknown7 = 0x00000565;
- q_u->unknown8 = 0x2;
- q_u->unknown9 = 0x0;
- q_u->unknown10 = 0x0;
+ if (!prs_uint32("access_required", ps, depth, &pd->access_required))
+ return False;
- make_unistr2(&(q_u->station), station, len_sta);
- make_unistr2(&(q_u->username), username, len_user);
+ return True;
+}
+/*******************************************************************
+ * init a structure.
+ ********************************************************************/
+BOOL make_spoolss_q_open_printer_ex(SPOOL_Q_OPEN_PRINTER_EX *q_u, fstring printername, fstring datatype,
+ uint32 access_required, fstring client_name, fstring user_name)
+{
+ DEBUG(5,("make_spoolss_q_open_printer_ex\n"));
+ q_u->printername_ptr = (printername!=NULL)?1:0;
+ init_unistr2(&(q_u->printername), printername, strlen(printername));
+
+ q_u->printer_default.datatype_ptr = 0;
+/*
+ q_u->printer_default.datatype_ptr = (datatype!=NULL)?1:0;
+ init_unistr2(&(q_u->printer_default.datatype), datatype, strlen(datatype));
+*/
+ q_u->printer_default.devmode_cont.size=0;
+ q_u->printer_default.devmode_cont.devmode_ptr=0;
+ q_u->printer_default.devmode_cont.devmode=NULL;
+ q_u->printer_default.access_required=access_required;
+ q_u->user_switch=1;
+ q_u->user_ctr.level=1;
+ q_u->user_ctr.ptr=1;
+ q_u->user_ctr.user1.size=strlen(client_name)+strlen(user_name)+8;
+ q_u->user_ctr.user1.client_name_ptr = (client_name!=NULL)?1:0;
+ q_u->user_ctr.user1.user_name_ptr = (user_name!=NULL)?1:0;
+ q_u->user_ctr.user1.build=1381;
+ q_u->user_ctr.user1.major=2;
+ q_u->user_ctr.user1.minor=0;
+ q_u->user_ctr.user1.processor=0;
+ init_unistr2(&(q_u->user_ctr.user1.client_name), client_name, strlen(client_name));
+ init_unistr2(&(q_u->user_ctr.user1.user_name), user_name, strlen(user_name));
+
return True;
}
@@ -444,46 +670,58 @@ BOOL make_spoolss_q_open_printer_ex(SPOOL_Q_OPEN_PRINTER_EX *q_u,
********************************************************************/
BOOL spoolss_io_q_open_printer_ex(char *desc, SPOOL_Q_OPEN_PRINTER_EX *q_u, prs_struct *ps, int depth)
{
- if (q_u == NULL) return False;
+ if (q_u == NULL)
+ return False;
prs_debug(ps, depth, desc, "spoolss_io_q_open_printer_ex");
depth++;
- prs_align(ps);
+ if (!prs_align(ps))
+ return False;
- prs_uint32("ptr", ps, depth, &(q_u->ptr));
- smb_io_unistr2("", &(q_u->printername),True,ps,depth);
+ if (!prs_uint32("printername_ptr", ps, depth, &q_u->printername_ptr))
+ return False;
+ if (!smb_io_unistr2("", &q_u->printername, q_u->printername_ptr, ps,depth))
+ return False;
- prs_align(ps);
-
- prs_uint32("unknown0", ps, depth, &(q_u->unknown0));
- prs_uint32("cbbuf", ps, depth, &(q_u->cbbuf));
- prs_uint32("devmod", ps, depth, &(q_u->devmod));
- prs_uint32("access required", ps, depth, &(q_u->access_required));
-
- /* don't care to decode end of packet by now */
- /* but when acl will be implemented, it will be useful */
-
- prs_uint32("unknown1", ps, depth, &(q_u->unknown1));
- prs_uint32("unknown2", ps, depth, &(q_u->unknown2));
- prs_uint32("unknown3", ps, depth, &(q_u->unknown3));
- prs_uint32("unknown4", ps, depth, &(q_u->unknown4));
- prs_uint32("unknown5", ps, depth, &(q_u->unknown5));
- prs_uint32("unknown6", ps, depth, &(q_u->unknown6));
- prs_uint32("unknown7", ps, depth, &(q_u->unknown7));
- prs_uint32("unknown8", ps, depth, &(q_u->unknown8));
- prs_uint32("unknown9", ps, depth, &(q_u->unknown9));
- prs_uint32("unknown10", ps, depth, &(q_u->unknown10));
-
- smb_io_unistr2("", &(q_u->station),True,ps,depth);
- prs_align(ps);
- smb_io_unistr2("", &(q_u->username),True,ps,depth);
- prs_align(ps);
+ if (!prs_align(ps))
+ return False;
+ if (!spoolss_io_printer_default("", &q_u->printer_default, ps, depth))
+ return False;
+
+ if (!prs_uint32("user_switch", ps, depth, &q_u->user_switch))
+ return False;
+ if (!spool_io_user_level("", &q_u->user_ctr, ps, depth))
+ return False;
+
return True;
}
/*******************************************************************
+ * write a structure.
+ * called from static spoolss_r_open_printer_ex (srv_spoolss.c)
+ * called from spoolss_open_printer_ex (cli_spoolss.c)
+ ********************************************************************/
+BOOL spoolss_io_r_open_printer_ex(char *desc, SPOOL_R_OPEN_PRINTER_EX *r_u, prs_struct *ps, int depth)
+{
+ if (r_u == NULL) return False;
+
+ prs_debug(ps, depth, desc, "spoolss_io_r_open_printer_ex");
+ depth++;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!smb_io_pol_hnd("printer handle",&(r_u->handle),ps,depth))
+ return False;
+
+ if (!prs_uint32("status code", ps, depth, &(r_u->status)))
+ return False;
+
+ return True;
+}
+/*******************************************************************
* make a structure.
********************************************************************/
BOOL make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
@@ -498,7 +736,7 @@ BOOL make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
DEBUG(5,("make_spoolss_q_getprinterdata\n"));
memcpy(&(q_u->handle), handle, sizeof(q_u->handle));
- make_unistr2(&(q_u->valuename), valuename, len_name);
+ init_unistr2(&(q_u->valuename), valuename, len_name);
q_u->size = size;
return True;
@@ -515,12 +753,18 @@ BOOL spoolss_io_q_getprinterdata(char *desc, SPOOL_Q_GETPRINTERDATA *q_u, prs_st
prs_debug(ps, depth, desc, "spoolss_io_q_getprinterdata");
depth++;
- prs_align(ps);
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_align(ps);
- smb_io_unistr2("", &(q_u->valuename),True,ps,depth);
- prs_align(ps);
- prs_uint32("size", ps, depth, &(q_u->size));
+ if (!prs_align(ps))
+ return False;
+ if (!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+ return False;
+ if (!prs_align(ps))
+ return False;
+ if (!smb_io_unistr2("valuename", &(q_u->valuename),True,ps,depth))
+ return False;
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("size", ps, depth, &(q_u->size)))
+ return False;
return True;
}
@@ -531,22 +775,30 @@ BOOL spoolss_io_q_getprinterdata(char *desc, SPOOL_Q_GETPRINTERDATA *q_u, prs_st
********************************************************************/
BOOL spoolss_io_r_getprinterdata(char *desc, SPOOL_R_GETPRINTERDATA *r_u, prs_struct *ps, int depth)
{
- if (r_u == NULL) return False;
+ if (r_u == NULL)
+ return False;
prs_debug(ps, depth, desc, "spoolss_io_r_getprinterdata");
depth++;
- prs_align(ps);
- prs_uint32("type", ps, depth, &(r_u->type));
- prs_uint32("size", ps, depth, &(r_u->size));
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("type", ps, depth, &(r_u->type)))
+ return False;
+ if (!prs_uint32("size", ps, depth, &(r_u->size)))
+ return False;
- prs_uint8s(False,"data", ps, depth, r_u->data, r_u->size);
- prs_align(ps);
+ if (!prs_uint8s(False,"data", ps, depth, r_u->data, r_u->size))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
- prs_uint32("needed", ps, depth, &(r_u->needed));
- prs_uint32("status", ps, depth, &(r_u->status));
- prs_align(ps);
-
+ if (!prs_uint32("needed", ps, depth, &(r_u->needed)))
+ return False;
+ if (!prs_uint32("status", ps, depth, &(r_u->status)))
+ return False;
+
return True;
}
@@ -576,9 +828,11 @@ BOOL spoolss_io_q_closeprinter(char *desc, SPOOL_Q_CLOSEPRINTER *q_u, prs_struct
prs_debug(ps, depth, desc, "spoolss_io_q_closeprinter");
depth++;
- prs_align(ps);
+ if (!prs_align(ps))
+ return False;
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
+ if (!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
+ return False;
return True;
}
@@ -592,12 +846,15 @@ BOOL spoolss_io_r_closeprinter(char *desc, SPOOL_R_CLOSEPRINTER *r_u, prs_struct
{
prs_debug(ps, depth, desc, "spoolss_io_r_closeprinter");
depth++;
- prs_align(ps);
-
- smb_io_pol_hnd("printer handle",&(r_u->handle),ps,depth);
- prs_uint32("status", ps, depth, &(r_u->status));
+ if (!prs_align(ps))
+ return False;
+ if (!smb_io_pol_hnd("printer handle",&r_u->handle,ps,depth))
+ return False;
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
+
return True;
}
@@ -773,29 +1030,43 @@ BOOL spoolss_io_r_writeprinter(char *desc, SPOOL_R_WRITEPRINTER *r_u, prs_struct
* read a structure.
* called from spoolss_q_rffpcnex (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_q_rffpcnex(char *desc, SPOOL_Q_RFFPCNEX *q_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_q_rffpcnex(char *desc, SPOOL_Q_RFFPCNEX *q_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr;
-
prs_debug(ps, depth, desc, "spoolss_io_q_rffpcnex");
depth++;
- prs_align(ps);
-
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_uint32("flags", ps, depth, &(q_u->flags));
- prs_uint32("options", ps, depth, &(q_u->options));
- prs_uint32("useless ptr", ps, depth, &useless_ptr);
- /*prs_align(ps);*/
- smb_io_unistr2("", &(q_u->localmachine), True, ps, depth);
-
- prs_align(ps);
- prs_uint32("printerlocal", ps, depth, &(q_u->printerlocal));
+ if(!prs_align(ps))
+ return False;
- smb_io_notify_option("notify option", &(q_u->option), ps, depth);
+ if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
+ return False;
+ if(!prs_uint32("flags", ps, depth, &q_u->flags))
+ return False;
+ if(!prs_uint32("options", ps, depth, &q_u->options))
+ return False;
+ if(!prs_uint32("localmachine_ptr", ps, depth, &q_u->localmachine_ptr))
+ return False;
+ if(!smb_io_unistr2("localmachine", &q_u->localmachine, q_u->localmachine_ptr, ps, depth))
+ return False;
+ if(!prs_align(ps))
+ return False;
+
+ if(!prs_uint32("printerlocal", ps, depth, &q_u->printerlocal))
+ return False;
+ if(!prs_uint32("option_ptr", ps, depth, &q_u->option_ptr))
+ return False;
+
+ if (q_u->option_ptr!=0) {
+
+ if (UNMARSHALLING(ps))
+ q_u->option=(SPOOL_NOTIFY_OPTION *)malloc(sizeof(SPOOL_NOTIFY_OPTION));
+
+ if(!smb_io_notify_option("notify option", q_u->option, ps, depth))
+ return False;
+ }
+
return True;
}
@@ -803,13 +1074,13 @@ BOOL spoolss_io_q_rffpcnex(char *desc, SPOOL_Q_RFFPCNEX *q_u,
* write a structure.
* called from spoolss_r_rffpcnex (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_r_rffpcnex(char *desc, SPOOL_R_RFFPCNEX *r_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_r_rffpcnex(char *desc, SPOOL_R_RFFPCNEX *r_u, prs_struct *ps, int depth)
{
prs_debug(ps, depth, desc, "spoolss_io_r_rffpcnex");
depth++;
- prs_uint32("status", ps, depth, &(r_u->status));
+ if(!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
return True;
}
@@ -818,20 +1089,31 @@ BOOL spoolss_io_r_rffpcnex(char *desc, SPOOL_R_RFFPCNEX *r_u,
* read a structure.
* called from spoolss_q_rfnpcnex (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_q_rfnpcnex(char *desc, SPOOL_Q_RFNPCNEX *q_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_q_rfnpcnex(char *desc, SPOOL_Q_RFNPCNEX *q_u, prs_struct *ps, int depth)
{
-
prs_debug(ps, depth, desc, "spoolss_io_q_rfnpcnex");
depth++;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
+ if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
+ return False;
- prs_uint32("change", ps, depth, &(q_u->change));
+ if(!prs_uint32("change", ps, depth, &q_u->change))
+ return False;
- smb_io_notify_option("notify option",&(q_u->option),ps,depth);
+ if(!prs_uint32("option_ptr", ps, depth, &q_u->option_ptr))
+ return False;
+
+ if (q_u->option_ptr!=0) {
+
+ if (UNMARSHALLING(ps))
+ q_u->option=(SPOOL_NOTIFY_OPTION *)malloc(sizeof(SPOOL_NOTIFY_OPTION));
+
+ if(!smb_io_notify_option("notify option", q_u->option, ps, depth))
+ return False;
+ }
return True;
}
@@ -840,18 +1122,24 @@ BOOL spoolss_io_q_rfnpcnex(char *desc, SPOOL_Q_RFNPCNEX *q_u,
* write a structure.
* called from spoolss_r_rfnpcnex (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_r_rfnpcnex(char *desc,
- SPOOL_R_RFNPCNEX *r_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_r_rfnpcnex(char *desc, SPOOL_R_RFNPCNEX *r_u, prs_struct *ps, int depth)
{
prs_debug(ps, depth, desc, "spoolss_io_r_rfnpcnex");
depth++;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("info_ptr", ps, depth, &r_u->info_ptr))
+ return False;
- smb_io_notify_info("notify info",&(r_u->info),ps,depth);
- prs_align(ps);
- prs_uint32("status", ps, depth, &r_u->status);
+ if(!smb_io_notify_info("notify info", &r_u->info ,ps,depth))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
return True;
}
@@ -862,8 +1150,6 @@ BOOL spoolss_io_r_rfnpcnex(char *desc,
static uint32 size_of_uint32(uint32 *value)
{
return (sizeof(*value));
-
- return True;
}
/*******************************************************************
@@ -879,9 +1165,8 @@ static uint32 size_of_relative_string(UNISTR *string)
size=size+1; /* add the leading zero */
size=size*2; /* convert in char */
size=size+4; /* add the size of the ptr */
- return (size);
- return True;
+ return size;
}
/*******************************************************************
@@ -893,8 +1178,6 @@ static uint32 size_of_device_mode(DEVICEMODE *devmode)
return (4);
else
return (0xDC+4);
-
- return True;
}
/*******************************************************************
@@ -906,21 +1189,21 @@ static uint32 size_of_systemtime(SYSTEMTIME *systime)
return (4);
else
return (sizeof(SYSTEMTIME) +4);
-
- return True;
}
/*******************************************************************
* write a UNICODE string.
* used by all the RPC structs passing a buffer
********************************************************************/
-static BOOL spoolss_smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int depth)
+static BOOL spoolss_smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int depth)
{
- if (uni == NULL) return False;
+ if (uni == NULL)
+ return False;
prs_debug(ps, depth, desc, "spoolss_smb_io_unistr");
depth++;
- prs_unistr("unistr", ps, depth, uni);
+ if (!prs_unistr("unistr", ps, depth, uni))
+ return False;
return True;
}
@@ -929,39 +1212,59 @@ static BOOL spoolss_smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int
/*******************************************************************
* write a UNICODE string and its relative pointer.
* used by all the RPC structs passing a buffer
+ *
+ * As I'm a nice guy, I'm forcing myself to explain this code.
+ * MS did a good job in the overall spoolss code except in some
+ * functions where they are passing the API buffer directly in the
+ * RPC request/reply. That's to maintain compatiility at the API level.
+ * They could have done it the good way the first time.
+ *
+ * So what happen is: the strings are written at the buffer's end,
+ * in the reverse order of the original structure. Some pointers to
+ * the strings are also in the buffer. Those are relative to the
+ * buffer's start.
+ *
+ * If you don't understand or want to change that function,
+ * first get in touch with me: jfm@samba.org
+ *
********************************************************************/
-static BOOL smb_io_relstr(char *desc, prs_struct *ps, int depth, UNISTR *buffer,
- uint32 *start_offset, uint32 *end_offset)
+static BOOL new_smb_io_relstr(char *desc, NEW_BUFFER *buffer, int depth, UNISTR *string)
{
- if (!ps->io)
- {
- uint32 struct_offset = ps->offset;
+ prs_struct *ps=&(buffer->prs);
+
+ if (MARSHALLING(ps)) {
+ uint32 struct_offset = prs_offset(ps);
uint32 relative_offset;
- /* writing */
- *end_offset -= 2*(str_len_uni(buffer)+1);
- ps->offset=*end_offset;
- spoolss_smb_io_unistr(desc, buffer, ps, depth);
-
- ps->offset=struct_offset;
- relative_offset=*end_offset-*start_offset;
+ buffer->string_at_end -= 2*(str_len_uni(string)+1);
+ prs_set_offset(ps, buffer->string_at_end);
+
+ /* write the string */
+ if (!spoolss_smb_io_unistr(desc, string, ps, depth))
+ return False;
- prs_uint32("offset", ps, depth, &(relative_offset));
+ prs_set_offset(ps, struct_offset);
+
+ relative_offset=buffer->string_at_end - buffer->struct_start;
+ /* write its offset */
+ if (!prs_uint32("offset", ps, depth, &relative_offset))
+ return False;
}
- else
- {
+ else {
uint32 old_offset;
- uint32 relative_offset;
-
- prs_uint32("offset", ps, depth, &(relative_offset));
+
+ /* read the offset */
+ if (!prs_uint32("offset", ps, depth, &(buffer->string_at_end)))
+ return False;
- old_offset = ps->offset;
- ps->offset = (*start_offset) + relative_offset;
+ old_offset = prs_offset(ps);
+ prs_set_offset(ps, buffer->string_at_end+buffer->struct_start);
- spoolss_smb_io_unistr(desc, buffer, ps, depth);
+ /* read the string */
+ if (!spoolss_smb_io_unistr(desc, string, ps, depth))
+ return False;
- *end_offset = ps->offset;
- ps->offset = old_offset;
+ prs_set_offset(ps, old_offset);
}
return True;
}
@@ -971,430 +1274,755 @@ static BOOL smb_io_relstr(char *desc, prs_struct *ps, int depth, UNISTR *buffer,
* write a array UNICODE strings and its relative pointer.
* used by 2 RPC structs
********************************************************************/
-static BOOL smb_io_relarraystr(char *desc, prs_struct *ps, int depth, UNISTR ***buffer,
- uint32 *start_offset, uint32 *end_offset)
+static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, UNISTR ***string)
{
- int i=0;
- uint32 struct_offset;
- uint32 relative_offset;
- struct_offset=ps->offset;
-
- while ( (*buffer)[i]!=0x0000 )
- {
- i++;
- }
-
- i--;
+ prs_struct *ps=&(buffer->prs);
- /* that's for the ending NULL */
- *end_offset-=2;
+ if (MARSHALLING(ps)) {
+ uint32 struct_offset = prs_offset(ps);
+ uint32 relative_offset;
+ int i=0;
- do
- {
- *end_offset-= 2*(str_len_uni((*buffer)[i])+1);
- ps->offset=*end_offset;
- spoolss_smb_io_unistr(desc, (*buffer)[i], ps, depth);
-
+ while ( (*string)[i]!=0x0000 )
+ i++;
i--;
- }
- while (i>=0);
- ps->offset=struct_offset;
- relative_offset=*end_offset-*start_offset;
+ /* count the ending NULL of the array */
+ buffer->string_at_end -= 2;
- prs_uint32("offset", ps, depth, &(relative_offset));
+ /* jfm: FIXME: write a (uint16) 0 for the ending NULL */
+
+ do
+ {
+ buffer->string_at_end -= 2*(str_len_uni((*string)[i])+1);
+ prs_set_offset(ps, buffer->string_at_end);
- return True;
-}
+ /* write the string */
+ if (!spoolss_smb_io_unistr(desc, (*string)[i], ps, depth))
+ return False;
+
+ i--;
+ }
+ while (i>=0);
+
+ prs_set_offset(ps, struct_offset);
+
+ relative_offset=buffer->string_at_end - buffer->struct_start;
+ /* write its offset */
+ if (!prs_uint32("offset", ps, depth, &relative_offset))
+ return False;
+ }
+ else {
+ uint32 old_offset;
+
+ /* read the offset */
+ if (!prs_uint32("offset", ps, depth, &(buffer->string_at_end)))
+ return False;
-/*******************************************************************
- * write a DEVICEMODE struct.
- * on reading allocate memory for the private member
- ********************************************************************/
-static BOOL smb_io_devmode(char *desc, prs_struct *ps, int depth, DEVICEMODE *devmode)
-{
- prs_debug(ps, depth, desc, "smb_io_devmode");
- depth++;
+ old_offset = prs_offset(ps);
+ prs_set_offset(ps, buffer->string_at_end);
- prs_uint16s(True,"devicename", ps, depth, devmode->devicename.buffer, 32);
- prs_uint16("specversion", ps, depth, &(devmode->specversion));
- prs_uint16("driverversion", ps, depth, &(devmode->driverversion));
- prs_uint16("size", ps, depth, &(devmode->size));
- prs_uint16("driverextra", ps, depth, &(devmode->driverextra));
- prs_uint32("fields", ps, depth, &(devmode->fields));
- prs_uint16("orientation", ps, depth, &(devmode->orientation));
- prs_uint16("papersize", ps, depth, &(devmode->papersize));
- prs_uint16("paperlength", ps, depth, &(devmode->paperlength));
- prs_uint16("paperwidth", ps, depth, &(devmode->paperwidth));
- prs_uint16("scale", ps, depth, &(devmode->scale));
- prs_uint16("copies", ps, depth, &(devmode->copies));
- prs_uint16("defaultsource", ps, depth, &(devmode->defaultsource));
- prs_uint16("printquality", ps, depth, &(devmode->printquality));
- prs_uint16("color", ps, depth, &(devmode->color));
- prs_uint16("duplex", ps, depth, &(devmode->duplex));
- prs_uint16("yresolution", ps, depth, &(devmode->yresolution));
- prs_uint16("ttoption", ps, depth, &(devmode->ttoption));
- prs_uint16("collate", ps, depth, &(devmode->collate));
- prs_uint16s(True, "formname", ps, depth, devmode->formname.buffer, 32);
- prs_uint16("logpixels", ps, depth, &(devmode->logpixels));
- prs_uint32("bitsperpel", ps, depth, &(devmode->bitsperpel));
- prs_uint32("pelswidth", ps, depth, &(devmode->pelswidth));
- prs_uint32("pelsheight", ps, depth, &(devmode->pelsheight));
- prs_uint32("displayflags", ps, depth, &(devmode->displayflags));
- prs_uint32("displayfrequency", ps, depth, &(devmode->displayfrequency));
- prs_uint32("icmmethod", ps, depth, &(devmode->icmmethod));
- prs_uint32("icmintent", ps, depth, &(devmode->icmintent));
- prs_uint32("mediatype", ps, depth, &(devmode->mediatype));
- prs_uint32("dithertype", ps, depth, &(devmode->dithertype));
- prs_uint32("reserved1", ps, depth, &(devmode->reserved1));
- prs_uint32("reserved2", ps, depth, &(devmode->reserved2));
- prs_uint32("panningwidth", ps, depth, &(devmode->panningwidth));
- prs_uint32("panningheight", ps, depth, &(devmode->panningheight));
+ /* read the string */
- if (devmode->driverextra!=0)
- {
- if (ps->io)
- {
- devmode->private=(uint8 *)malloc(devmode->driverextra*sizeof(uint8));
- DEBUG(7,("smb_io_devmode: allocated memory [%d] for private\n",devmode->driverextra));
- }
- DEBUG(7,("smb_io_devmode: parsing [%d] bytes of private\n",devmode->driverextra));
+ /* jfm: FIXME: alloc memory and read all the strings until the string is NULL */
- prs_uint8s(True, "private", ps, depth, devmode->private, devmode->driverextra);
- DEBUG(8,("smb_io_devmode: parsed\n"));
+/*
+ if (!spoolss_smb_io_unistr(desc, string, ps, depth))
+ return False;
+*/
+ prs_set_offset(ps, old_offset);
}
-
return True;
}
+
/*******************************************************************
- * write a DEVMODE struct and its relative pointer.
- * used by all the RPC structs passing a buffer
- ********************************************************************/
-static BOOL smb_io_reldevmode(char *desc, prs_struct *ps, int depth, DEVICEMODE *devmode,
- uint32 *start_offset, uint32 *end_offset)
+ Parse a DEVMODE structure and its relative pointer.
+********************************************************************/
+static BOOL new_smb_io_reldevmode(char *desc, NEW_BUFFER *buffer, int depth, DEVICEMODE **devmode)
{
- uint32 struct_offset;
- uint32 relative_offset;
-
- prs_debug(ps, depth, desc, "smb_io_reldevmode");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_reldevmode");
depth++;
+
+ if (MARSHALLING(ps)) {
+ uint32 struct_offset = prs_offset(ps);
+ uint32 relative_offset;
- struct_offset=ps->offset;
- *end_offset-= (devmode->size+devmode->driverextra);
- ps->offset=*end_offset;
+ buffer->string_at_end -= ((*devmode)->size + (*devmode)->driverextra);
+
+ prs_set_offset(ps, buffer->string_at_end);
+
+ /* write the DEVMODE */
+ if (!spoolss_io_devmode(desc, ps, depth, *devmode))
+ return False;
- smb_io_devmode(desc, ps, depth, devmode);
+ prs_set_offset(ps, struct_offset);
+
+ relative_offset=buffer->string_at_end - buffer->struct_start;
+ /* write its offset */
+ if (!prs_uint32("offset", ps, depth, &relative_offset))
+ return False;
+ }
+ else {
+ uint32 old_offset;
+
+ /* read the offset */
+ if (!prs_uint32("offset", ps, depth, &(buffer->string_at_end)))
+ return False;
- ps->offset=struct_offset;
- relative_offset=*end_offset-*start_offset;
+ old_offset = prs_offset(ps);
+ prs_set_offset(ps, buffer->string_at_end + buffer->struct_start);
- prs_uint32("offset", ps, depth, &(relative_offset));
+ /* read the string */
+ *devmode=(DEVICEMODE *)malloc(sizeof(DEVICEMODE));
+ if (!spoolss_io_devmode(desc, ps, depth, *devmode))
+ return False;
+ prs_set_offset(ps, old_offset);
+ }
return True;
}
+
/*******************************************************************
+ Parse a PRINTER_INFO_0 structure.
********************************************************************/
-static BOOL smb_io_printer_info_0(char *desc, PRINTER_INFO_0 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL new_smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *info, int depth)
{
+ prs_struct *ps=&(buffer->prs);
+
prs_debug(ps, depth, desc, "smb_io_printer_info_0");
depth++;
- *start_offset=ps->offset;
- smb_io_relstr("printername",ps, depth, &(info->printername), start_offset, end_offset);
- smb_io_relstr("servername",ps, depth, &(info->servername), start_offset, end_offset);
- prs_uint32("cjobs", ps, depth, &(info->cjobs));
- prs_uint32("attributes", ps, depth, &(info->attributes));
-
- prs_uint32("unknown0", ps, depth, &(info->unknown0));
- prs_uint32("unknown1", ps, depth, &(info->unknown1));
- prs_uint32("unknown2", ps, depth, &(info->unknown2));
- prs_uint32("unknown3", ps, depth, &(info->unknown3));
- prs_uint32("unknown4", ps, depth, &(info->unknown4));
- prs_uint32("unknown5", ps, depth, &(info->unknown5));
- prs_uint32("unknown6", ps, depth, &(info->unknown6));
- prs_uint16("majorversion", ps, depth, &(info->majorversion));
- prs_uint16("buildversion", ps, depth, &(info->buildversion));
- prs_uint32("unknown7", ps, depth, &(info->unknown7));
- prs_uint32("unknown8", ps, depth, &(info->unknown8));
- prs_uint32("unknown9", ps, depth, &(info->unknown9));
- prs_uint32("unknown10", ps, depth, &(info->unknown10));
- prs_uint32("unknown11", ps, depth, &(info->unknown11));
- prs_uint32("unknown12", ps, depth, &(info->unknown12));
- prs_uint32("unknown13", ps, depth, &(info->unknown13));
- prs_uint32("unknown14", ps, depth, &(info->unknown14));
- prs_uint32("unknown15", ps, depth, &(info->unknown15));
- prs_uint32("unknown16", ps, depth, &(info->unknown16));
- prs_uint32("unknown17", ps, depth, &(info->unknown17));
- prs_uint32("unknown18", ps, depth, &(info->unknown18));
- prs_uint32("status" , ps, depth, &(info->status));
- prs_uint32("unknown20", ps, depth, &(info->unknown20));
- prs_uint32("unknown21", ps, depth, &(info->unknown21));
- prs_uint16("unknown22", ps, depth, &(info->unknown22));
- prs_uint32("unknown23", ps, depth, &(info->unknown23));
+ buffer->struct_start=prs_offset(ps);
+
+ if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
+ return False;
+ if (!new_smb_io_relstr("servername", buffer, depth, &info->servername))
+ return False;
+
+ if(!prs_uint32("cjobs", ps, depth, &info->cjobs))
+ return False;
+ if(!prs_uint32("attributes", ps, depth, &info->attributes))
+ return False;
+
+ if(!prs_uint32("unknown0", ps, depth, &info->unknown0))
+ return False;
+ if(!prs_uint32("unknown1", ps, depth, &info->unknown1))
+ return False;
+ if(!prs_uint32("unknown2", ps, depth, &info->unknown2))
+ return False;
+ if(!prs_uint32("unknown3", ps, depth, &info->unknown3))
+ return False;
+ if(!prs_uint32("unknown4", ps, depth, &info->unknown4))
+ return False;
+ if(!prs_uint32("unknown5", ps, depth, &info->unknown5))
+ return False;
+ if(!prs_uint32("unknown6", ps, depth, &info->unknown6))
+ return False;
+ if(!prs_uint16("majorversion", ps, depth, &info->majorversion))
+ return False;
+ if(!prs_uint16("buildversion", ps, depth, &info->buildversion))
+ return False;
+ if(!prs_uint32("unknown7", ps, depth, &info->unknown7))
+ return False;
+ if(!prs_uint32("unknown8", ps, depth, &info->unknown8))
+ return False;
+ if(!prs_uint32("unknown9", ps, depth, &info->unknown9))
+ return False;
+ if(!prs_uint32("unknown10", ps, depth, &info->unknown10))
+ return False;
+ if(!prs_uint32("unknown11", ps, depth, &info->unknown11))
+ return False;
+ if(!prs_uint32("unknown12", ps, depth, &info->unknown12))
+ return False;
+ if(!prs_uint32("unknown13", ps, depth, &info->unknown13))
+ return False;
+ if(!prs_uint32("unknown14", ps, depth, &info->unknown14))
+ return False;
+ if(!prs_uint32("unknown15", ps, depth, &info->unknown15))
+ return False;
+ if(!prs_uint32("unknown16", ps, depth, &info->unknown16))
+ return False;
+ if(!prs_uint32("unknown17", ps, depth, &info->unknown17))
+ return False;
+ if(!prs_uint32("unknown18", ps, depth, &info->unknown18))
+ return False;
+ if(!prs_uint32("status" , ps, depth, &info->status))
+ return False;
+ if(!prs_uint32("unknown20", ps, depth, &info->unknown20))
+ return False;
+ if(!prs_uint32("unknown21", ps, depth, &info->unknown21))
+ return False;
+ if(!prs_uint16("unknown22", ps, depth, &info->unknown22))
+ return False;
+ if(!prs_uint32("unknown23", ps, depth, &info->unknown23))
+ return False;
return True;
}
/*******************************************************************
+ Parse a PRINTER_INFO_1 structure.
********************************************************************/
-static BOOL smb_io_printer_info_1(char *desc, PRINTER_INFO_1 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL new_smb_io_printer_info_1(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_1 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_printer_info_1");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_printer_info_1");
depth++;
- *start_offset=ps->offset;
- prs_uint32("flags", ps, depth, &(info->flags));
- smb_io_relstr("description",ps, depth, &(info->description), start_offset, end_offset);
- smb_io_relstr("name",ps, depth, &(info->name), start_offset, end_offset);
- smb_io_relstr("comment",ps, depth, &(info->comment), start_offset, end_offset);
+ buffer->struct_start=prs_offset(ps);
+
+ if (!prs_uint32("flags", ps, depth, &info->flags))
+ return False;
+ if (!new_smb_io_relstr("description", buffer, depth, &info->description))
+ return False;
+ if (!new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
+ if (!new_smb_io_relstr("comment", buffer, depth, &info->comment))
+ return False;
return True;
}
/*******************************************************************
+ Parse a PRINTER_INFO_2 structure.
********************************************************************/
-static BOOL smb_io_printer_info_2(char *desc, PRINTER_INFO_2 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL new_smb_io_printer_info_2(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2 *info, int depth)
{
+ /* hack for the SEC DESC */
uint32 pipo=0;
- uint32 devmode_offset;
- uint32 backup_offset;
- prs_debug(ps, depth, desc, "smb_io_printer_info_2");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_printer_info_2");
depth++;
- *start_offset=ps->offset;
- smb_io_relstr("servername", ps, depth, &(info->servername), start_offset, end_offset);
- smb_io_relstr("printername", ps, depth, &(info->printername), start_offset, end_offset);
- smb_io_relstr("sharename", ps, depth, &(info->sharename), start_offset, end_offset);
- smb_io_relstr("portname", ps, depth, &(info->portname), start_offset, end_offset);
- smb_io_relstr("drivername", ps, depth, &(info->drivername), start_offset, end_offset);
- smb_io_relstr("comment", ps, depth, &(info->comment), start_offset, end_offset);
- smb_io_relstr("location", ps, depth, &(info->location), start_offset, end_offset);
-
- devmode_offset=ps->offset;
- ps->offset=ps->offset+4;
+ buffer->struct_start=prs_offset(ps);
+
+ if (!new_smb_io_relstr("servername", buffer, depth, &info->servername))
+ return False;
+ if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
+ return False;
+ if (!new_smb_io_relstr("sharename", buffer, depth, &info->sharename))
+ return False;
+ if (!new_smb_io_relstr("portname", buffer, depth, &info->portname))
+ return False;
+ if (!new_smb_io_relstr("drivername", buffer, depth, &info->drivername))
+ return False;
+ if (!new_smb_io_relstr("comment", buffer, depth, &info->comment))
+ return False;
+ if (!new_smb_io_relstr("location", buffer, depth, &info->location))
+ return False;
+
+ /* NT parses the DEVMODE at the end of the struct */
+ if (!new_smb_io_reldevmode("devmode", buffer, depth, &info->devmode))
+ return False;
- smb_io_relstr("sepfile", ps, depth, &(info->sepfile), start_offset, end_offset);
- smb_io_relstr("printprocessor",ps, depth, &(info->printprocessor), start_offset, end_offset);
- smb_io_relstr("datatype", ps, depth, &(info->datatype), start_offset, end_offset);
- smb_io_relstr("parameters", ps, depth, &(info->parameters), start_offset, end_offset);
-
- prs_uint32("security descriptor", ps, depth, &(pipo));
-
- prs_uint32("attributes", ps, depth, &(info->attributes));
- prs_uint32("priority", ps, depth, &(info->priority));
- prs_uint32("defpriority", ps, depth, &(info->defaultpriority));
- prs_uint32("starttime", ps, depth, &(info->starttime));
- prs_uint32("untiltime", ps, depth, &(info->untiltime));
- prs_uint32("status", ps, depth, &(info->status));
- prs_uint32("jobs", ps, depth, &(info->cjobs));
- prs_uint32("averageppm", ps, depth, &(info->averageppm));
+ if (!new_smb_io_relstr("sepfile", buffer, depth, &info->sepfile))
+ return False;
+ if (!new_smb_io_relstr("printprocessor", buffer, depth, &info->printprocessor))
+ return False;
+ if (!new_smb_io_relstr("datatype", buffer, depth, &info->datatype))
+ return False;
+ if (!new_smb_io_relstr("parameters", buffer, depth, &info->parameters))
+ return False;
- /*
- I'm not sure if putting the devmode at the end the struct is worth it
- but NT does it
- */
- backup_offset=ps->offset;
- ps->offset=devmode_offset;
- smb_io_reldevmode("devmode", ps, depth, info->devmode, start_offset, end_offset);
- ps->offset=backup_offset;
+ if (!prs_uint32("security descriptor", ps, depth, &pipo))
+ return False;
+ if (!prs_uint32("attributes", ps, depth, &info->attributes))
+ return False;
+ if (!prs_uint32("priority", ps, depth, &info->priority))
+ return False;
+ if (!prs_uint32("defpriority", ps, depth, &info->defaultpriority))
+ return False;
+ if (!prs_uint32("starttime", ps, depth, &info->starttime))
+ return False;
+ if (!prs_uint32("untiltime", ps, depth, &info->untiltime))
+ return False;
+ if (!prs_uint32("status", ps, depth, &info->status))
+ return False;
+ if (!prs_uint32("jobs", ps, depth, &info->cjobs))
+ return False;
+ if (!prs_uint32("averageppm", ps, depth, &info->averageppm))
+ return False;
return True;
}
/*******************************************************************
-********************************************************************/
-static BOOL smb_io_printer_driver_info_1(char *desc, DRIVER_INFO_1 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+ Parse a DRIVER_INFO_1 structure.
+********************************************************************/
+BOOL new_smb_io_printer_driver_info_1(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_1 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_printer_driver_info_1");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_printer_driver_info_1");
depth++;
- *start_offset=ps->offset;
+
+ buffer->struct_start=prs_offset(ps);
- smb_io_relstr("name", ps, depth, &(info->name), start_offset, end_offset);
+ if (!new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
return True;
}
+
/*******************************************************************
-********************************************************************/
-static BOOL smb_io_printer_driver_info_2(char *desc, DRIVER_INFO_2 *info,prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+ Parse a DRIVER_INFO_2 structure.
+********************************************************************/
+BOOL new_smb_io_printer_driver_info_2(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_2 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_printer_xxx");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_printer_driver_info_2");
depth++;
- *start_offset=ps->offset;
+
+ buffer->struct_start=prs_offset(ps);
- prs_uint32("version", ps, depth, &(info->version));
- smb_io_relstr("name", ps, depth, &(info->name), start_offset, end_offset);
- smb_io_relstr("architecture", ps, depth, &(info->architecture), start_offset, end_offset);
- smb_io_relstr("driverpath", ps, depth, &(info->driverpath), start_offset, end_offset);
- smb_io_relstr("datafile", ps, depth, &(info->datafile), start_offset, end_offset);
- smb_io_relstr("configfile", ps, depth, &(info->configfile), start_offset, end_offset);
+ if (!prs_uint32("version", ps, depth, &info->version))
+ return False;
+ if (!new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
+ if (!new_smb_io_relstr("architecture", buffer, depth, &info->architecture))
+ return False;
+ if (!new_smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
+ return False;
+ if (!new_smb_io_relstr("datafile", buffer, depth, &info->datafile))
+ return False;
+ if (!new_smb_io_relstr("configfile", buffer, depth, &info->configfile))
+ return False;
return True;
}
+
/*******************************************************************
-********************************************************************/
-static BOOL smb_io_printer_driver_info_3(char *desc, DRIVER_INFO_3 *info,prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+ Parse a DRIVER_INFO_3 structure.
+********************************************************************/
+BOOL new_smb_io_printer_driver_info_3(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_3 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_printer_driver_info_3");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_printer_driver_info_3");
depth++;
- *start_offset=ps->offset;
+
+ buffer->struct_start=prs_offset(ps);
- prs_uint32("version", ps, depth, &(info->version));
- smb_io_relstr("name", ps, depth, &(info->name), start_offset, end_offset);
- smb_io_relstr("architecture", ps, depth, &(info->architecture), start_offset, end_offset);
- smb_io_relstr("driverpath", ps, depth, &(info->driverpath), start_offset, end_offset);
- smb_io_relstr("datafile", ps, depth, &(info->datafile), start_offset, end_offset);
- smb_io_relstr("configfile", ps, depth, &(info->configfile), start_offset, end_offset);
- smb_io_relstr("helpfile", ps, depth, &(info->helpfile), start_offset, end_offset);
+ if (!prs_uint32("version", ps, depth, &info->version))
+ return False;
+ if (!new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
+ if (!new_smb_io_relstr("architecture", buffer, depth, &info->architecture))
+ return False;
+ if (!new_smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
+ return False;
+ if (!new_smb_io_relstr("datafile", buffer, depth, &info->datafile))
+ return False;
+ if (!new_smb_io_relstr("configfile", buffer, depth, &info->configfile))
+ return False;
+ if (!new_smb_io_relstr("helpfile", buffer, depth, &info->helpfile))
+ return False;
- smb_io_relarraystr("dependentfiles", ps, depth, &(info->dependentfiles), start_offset, end_offset);
+ if (!new_smb_io_relarraystr("dependentfiles", buffer, depth, &info->dependentfiles))
+ return False;
- smb_io_relstr("monitorname", ps, depth, &(info->monitorname), start_offset, end_offset);
- smb_io_relstr("defaultdatatype", ps, depth, &(info->defaultdatatype), start_offset, end_offset);
+ if (!new_smb_io_relstr("monitorname", buffer, depth, &info->monitorname))
+ return False;
+ if (!new_smb_io_relstr("defaultdatatype", buffer, depth, &info->defaultdatatype))
+ return False;
return True;
}
+
/*******************************************************************
+ Parse a JOB_INFO_1 structure.
********************************************************************/
-static BOOL smb_io_job_info_1(char *desc, JOB_INFO_1 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL new_smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_job_info_1");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_job_info_1");
depth++;
- *start_offset=ps->offset;
- prs_uint32("jobid", ps, depth, &(info->jobid));
- smb_io_relstr("printername", ps, depth, &(info->printername), start_offset, end_offset);
- smb_io_relstr("machinename", ps, depth, &(info->machinename), start_offset, end_offset);
- smb_io_relstr("username", ps, depth, &(info->username), start_offset, end_offset);
- smb_io_relstr("document", ps, depth, &(info->document), start_offset, end_offset);
- smb_io_relstr("datatype", ps, depth, &(info->datatype), start_offset, end_offset);
- smb_io_relstr("text_status", ps, depth, &(info->text_status), start_offset, end_offset);
- prs_uint32("status", ps, depth, &(info->status));
- prs_uint32("priority", ps, depth, &(info->priority));
- prs_uint32("position", ps, depth, &(info->position));
- prs_uint32("totalpages", ps, depth, &(info->totalpages));
- prs_uint32("pagesprinted", ps, depth, &(info->pagesprinted));
- spoolss_io_system_time("submitted", ps, depth, &(info->submitted) );
+ buffer->struct_start=prs_offset(ps);
+
+ if (!prs_uint32("jobid", ps, depth, &info->jobid))
+ return False;
+ if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
+ return False;
+ if (!new_smb_io_relstr("machinename", buffer, depth, &info->machinename))
+ return False;
+ if (!new_smb_io_relstr("username", buffer, depth, &info->username))
+ return False;
+ if (!new_smb_io_relstr("document", buffer, depth, &info->document))
+ return False;
+ if (!new_smb_io_relstr("datatype", buffer, depth, &info->datatype))
+ return False;
+ if (!new_smb_io_relstr("text_status", buffer, depth, &info->text_status))
+ return False;
+ if (!prs_uint32("status", ps, depth, &info->status))
+ return False;
+ if (!prs_uint32("priority", ps, depth, &info->priority))
+ return False;
+ if (!prs_uint32("position", ps, depth, &info->position))
+ return False;
+ if (!prs_uint32("totalpages", ps, depth, &info->totalpages))
+ return False;
+ if (!prs_uint32("pagesprinted", ps, depth, &info->pagesprinted))
+ return False;
+ if (!spoolss_io_system_time("submitted", ps, depth, &info->submitted))
+ return False;
return True;
}
/*******************************************************************
+ Parse a JOB_INFO_2 structure.
********************************************************************/
-static BOOL smb_io_job_info_2(char *desc, JOB_INFO_2 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL new_smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int depth)
{
int pipo=0;
- prs_debug(ps, depth, desc, "smb_io_job_info_2");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_job_info_2");
depth++;
- *start_offset=ps->offset;
+
+ buffer->struct_start=prs_offset(ps);
- prs_uint32("jobid", ps, depth, &(info->jobid));
- smb_io_relstr("printername", ps, depth, &(info->printername), start_offset, end_offset);
- smb_io_relstr("machinename", ps, depth, &(info->machinename), start_offset, end_offset);
- smb_io_relstr("username", ps, depth, &(info->username), start_offset, end_offset);
- smb_io_relstr("document", ps, depth, &(info->document), start_offset, end_offset);
- smb_io_relstr("notifyname", ps, depth, &(info->notifyname), start_offset, end_offset);
- smb_io_relstr("datatype", ps, depth, &(info->datatype), start_offset, end_offset);
-
- smb_io_relstr("printprocessor", ps, depth, &(info->printprocessor), start_offset, end_offset);
- smb_io_relstr("parameters", ps, depth, &(info->parameters), start_offset, end_offset);
- smb_io_relstr("drivername", ps, depth, &(info->drivername), start_offset, end_offset);
- smb_io_reldevmode("devmode", ps, depth, info->devmode, start_offset, end_offset);
- smb_io_relstr("text_status", ps, depth, &(info->text_status), start_offset, end_offset);
+ if (!prs_uint32("jobid",ps, depth, &info->jobid))
+ return False;
+ if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
+ return False;
+ if (!new_smb_io_relstr("machinename", buffer, depth, &info->machinename))
+ return False;
+ if (!new_smb_io_relstr("username", buffer, depth, &info->username))
+ return False;
+ if (!new_smb_io_relstr("document", buffer, depth, &info->document))
+ return False;
+ if (!new_smb_io_relstr("notifyname", buffer, depth, &info->notifyname))
+ return False;
+ if (!new_smb_io_relstr("datatype", buffer, depth, &info->datatype))
+ return False;
+
+ if (!new_smb_io_relstr("printprocessor", buffer, depth, &info->printprocessor))
+ return False;
+ if (!new_smb_io_relstr("parameters", buffer, depth, &info->parameters))
+ return False;
+ if (!new_smb_io_relstr("drivername", buffer, depth, &info->drivername))
+ return False;
+ if (!new_smb_io_reldevmode("devmode", buffer, depth, &info->devmode))
+ return False;
+ if (!new_smb_io_relstr("text_status", buffer, depth, &info->text_status))
+ return False;
/* SEC_DESC sec_desc;*/
- prs_uint32("Hack! sec desc", ps, depth, &pipo);
-
- prs_uint32("status", ps, depth, &(info->status));
- prs_uint32("priority", ps, depth, &(info->priority));
- prs_uint32("position", ps, depth, &(info->position));
- prs_uint32("starttime", ps, depth, &(info->starttime));
- prs_uint32("untiltime", ps, depth, &(info->untiltime));
- prs_uint32("totalpages", ps, depth, &(info->totalpages));
- prs_uint32("size", ps, depth, &(info->size));
- spoolss_io_system_time("submitted", ps, depth, &(info->submitted) );
- prs_uint32("timeelapsed", ps, depth, &(info->timeelapsed));
- prs_uint32("pagesprinted", ps, depth, &(info->pagesprinted));
+ if (!prs_uint32("Hack! sec desc", ps, depth, &pipo))
+ return False;
+
+ if (!prs_uint32("status",ps, depth, &info->status))
+ return False;
+ if (!prs_uint32("priority",ps, depth, &info->priority))
+ return False;
+ if (!prs_uint32("position",ps, depth, &info->position))
+ return False;
+ if (!prs_uint32("starttime",ps, depth, &info->starttime))
+ return False;
+ if (!prs_uint32("untiltime",ps, depth, &info->untiltime))
+ return False;
+ if (!prs_uint32("totalpages",ps, depth, &info->totalpages))
+ return False;
+ if (!prs_uint32("size",ps, depth, &info->size))
+ return False;
+ if (!spoolss_io_system_time("submitted", ps, depth, &info->submitted) )
+ return False;
+ if (!prs_uint32("timeelapsed",ps, depth, &info->timeelapsed))
+ return False;
+ if (!prs_uint32("pagesprinted",ps, depth, &info->pagesprinted))
+ return False;
+
+ return True;
+}
+
+/*******************************************************************
+********************************************************************/
+BOOL new_smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth)
+{
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_form_1");
+ depth++;
+
+ buffer->struct_start=prs_offset(ps);
+
+ if (!prs_uint32("flag", ps, depth, &(info->flag)))
+ return False;
+
+ if (!new_smb_io_relstr("name", buffer, depth, &(info->name)))
+ return False;
+
+ if (!prs_uint32("width", ps, depth, &(info->width)))
+ return False;
+ if (!prs_uint32("length", ps, depth, &(info->length)))
+ return False;
+ if (!prs_uint32("left", ps, depth, &(info->left)))
+ return False;
+ if (!prs_uint32("top", ps, depth, &(info->top)))
+ return False;
+ if (!prs_uint32("right", ps, depth, &(info->right)))
+ return False;
+ if (!prs_uint32("bottom", ps, depth, &(info->bottom)))
+ return False;
+
+ return True;
+}
+
+/*******************************************************************
+ Read/write a BUFFER struct.
+********************************************************************/
+static BOOL new_spoolss_io_buffer(char *desc, prs_struct *ps, int depth, NEW_BUFFER *buffer)
+{
+ if (buffer == NULL)
+ return False;
+
+ prs_debug(ps, depth, desc, "new_spoolss_io_buffer");
+ depth++;
+
+ if (!prs_uint32("ptr", ps, depth, &(buffer->ptr)))
+ return False;
+
+ /* reading */
+ if (UNMARSHALLING(ps)) {
+ buffer->size=0;
+ buffer->string_at_end=0;
+
+ if (buffer->ptr==0) {
+ if (!prs_init(&(buffer->prs), 0, 4, UNMARSHALL))
+ return False;
+ return True;
+ }
+
+ if (!prs_uint32("size", ps, depth, &buffer->size))
+ return False;
+
+ if (!prs_init(&(buffer->prs), buffer->size, 4, UNMARSHALL))
+ return False;
+
+ if (!prs_append_some_prs_data(&(buffer->prs), ps, prs_offset(ps), buffer->size))
+ return False;
+
+ if (!prs_set_offset(&buffer->prs, 0))
+ return False;
+
+ if (!prs_set_offset(ps, buffer->size+prs_offset(ps)))
+ return False;
+
+ buffer->string_at_end=buffer->size;
+
+ return True;
+ }
+ else {
+ /* writing */
+ if (buffer->ptr==0)
+ return True;
+
+ if (!prs_uint32("size", ps, depth, &(buffer->size)))
+ return False;
+ if (!prs_append_some_prs_data(ps, &(buffer->prs), 0, buffer->size))
+ return False;
+
+ return True;
+ }
+}
+
+/*******************************************************************
+ move a BUFFER from the query to the reply.
+********************************************************************/
+void new_spoolss_move_buffer(NEW_BUFFER *src, NEW_BUFFER **dest)
+{
+ prs_switch_type(&(src->prs), MARSHALL);
+ prs_set_offset(&(src->prs), 0);
+ prs_force_dynamic(&(src->prs));
+
+ *dest=src;
+}
+
+/*******************************************************************
+ create a BUFFER struct.
+********************************************************************/
+void new_spoolss_allocate_buffer(NEW_BUFFER **buffer)
+{
+ if (buffer==NULL)
+ return;
+
+ *buffer=(NEW_BUFFER *)malloc(sizeof(NEW_BUFFER));
+
+ (*buffer)->ptr=0x0;
+ (*buffer)->size=0;
+ (*buffer)->string_at_end=0;
+}
+
+/*******************************************************************
+ Destroy a BUFFER struct.
+********************************************************************/
+void new_spoolss_free_buffer(NEW_BUFFER *buffer)
+{
+ if (buffer==NULL)
+ return;
+
+ prs_mem_free(&(buffer->prs));
+ buffer->ptr=0x0;
+ buffer->size=0;
+ buffer->string_at_end=0;
+
+ free(buffer);
+}
+
+/*******************************************************************
+ Get the size of a BUFFER struct.
+********************************************************************/
+uint32 new_get_buffer_size(NEW_BUFFER *buffer)
+{
+ return (buffer->size);
+}
+
+
+/*******************************************************************
+ Parse a DRIVER_DIRECTORY_1 structure.
+********************************************************************/
+BOOL new_smb_io_driverdir_1(char *desc, NEW_BUFFER *buffer, DRIVER_DIRECTORY_1 *info, int depth)
+{
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_driverdir_1");
+ depth++;
+
+ buffer->struct_start=prs_offset(ps);
+
+ if(!new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
+
+ return True;
+}
+
+/*******************************************************************
+ Parse a PORT_INFO_1 structure.
+********************************************************************/
+BOOL new_smb_io_port_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth)
+{
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_port_1");
+ depth++;
+
+ buffer->struct_start=prs_offset(ps);
+
+ if(!new_smb_io_relstr("port_name", buffer, depth, &info->port_name))
+ return False;
+
+ return True;
+}
+
+/*******************************************************************
+ Parse a PORT_INFO_2 structure.
+********************************************************************/
+BOOL new_smb_io_port_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth)
+{
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "new_smb_io_port_2");
+ depth++;
+
+ buffer->struct_start=prs_offset(ps);
+
+ if(!new_smb_io_relstr("port_name", buffer, depth, &info->port_name))
+ return False;
+ if(!new_smb_io_relstr("monitor_name", buffer, depth, &info->monitor_name))
+ return False;
+ if(!new_smb_io_relstr("description", buffer, depth, &info->description))
+ return False;
+ if(!prs_uint32("port_type", ps, depth, &info->port_type))
+ return False;
+ if(!prs_uint32("reserved", ps, depth, &info->reserved))
+ return False;
return True;
}
+
/*******************************************************************
********************************************************************/
-static BOOL smb_io_form_1(char *desc, FORM_1 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL smb_io_printprocessor_info_1(char *desc, NEW_BUFFER *buffer, PRINTPROCESSOR_1 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_form_1");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "smb_io_printprocessor_info_1");
depth++;
- *start_offset=ps->offset;
- prs_uint32("flag", ps, depth, &(info->flag));
- smb_io_relstr("name",ps, depth, &(info->name), start_offset, end_offset);
- prs_uint32("width", ps, depth, &(info->width));
- prs_uint32("length", ps, depth, &(info->length));
- prs_uint32("left", ps, depth, &(info->left));
- prs_uint32("top", ps, depth, &(info->top));
- prs_uint32("right", ps, depth, &(info->right));
- prs_uint32("bottom", ps, depth, &(info->bottom));
+ buffer->struct_start=prs_offset(ps);
+
+ if (new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
return True;
}
/*******************************************************************
********************************************************************/
-static BOOL smb_io_port_2(char *desc, PORT_INFO_2 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL smb_io_printprocdatatype_info_1(char *desc, NEW_BUFFER *buffer, PRINTPROCDATATYPE_1 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_form_1");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "smb_io_printprocdatatype_info_1");
depth++;
- *start_offset=ps->offset;
- smb_io_relstr("port_name",ps, depth, &(info->port_name), start_offset, end_offset);
- smb_io_relstr("monitor_name",ps, depth, &(info->monitor_name), start_offset, end_offset);
- smb_io_relstr("description",ps, depth, &(info->description), start_offset, end_offset);
- prs_uint32("port_type", ps, depth, &(info->port_type));
- prs_uint32("reserved", ps, depth, &(info->reserved));
+ buffer->struct_start=prs_offset(ps);
+
+ if (new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
return True;
}
/*******************************************************************
********************************************************************/
-static BOOL smb_io_processor_info_1(char *desc, PRINTPROCESSOR_1 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL smb_io_printmonitor_info_1(char *desc, NEW_BUFFER *buffer, PRINTMONITOR_1 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_processor_info_1");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "smb_io_printmonitor_info_1");
depth++;
- *start_offset=ps->offset;
- smb_io_relstr("name",ps, depth, &(info->name), start_offset, end_offset);
+ buffer->struct_start=prs_offset(ps);
+
+ if (!new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
return True;
}
/*******************************************************************
********************************************************************/
-static BOOL smb_io_monitor_info_1(char *desc, PRINTMONITOR_1 *info, prs_struct *ps, int depth,
- uint32 *start_offset, uint32 *end_offset)
+BOOL smb_io_printmonitor_info_2(char *desc, NEW_BUFFER *buffer, PRINTMONITOR_2 *info, int depth)
{
- prs_debug(ps, depth, desc, "smb_io_monitor_info_1");
+ prs_struct *ps=&(buffer->prs);
+
+ prs_debug(ps, depth, desc, "smb_io_printmonitor_info_2");
depth++;
- *start_offset=ps->offset;
- smb_io_relstr("name",ps, depth, &(info->name), start_offset, end_offset);
+ buffer->struct_start=prs_offset(ps);
+
+ if (!new_smb_io_relstr("name", buffer, depth, &info->name))
+ return False;
+ if (!new_smb_io_relstr("environment", buffer, depth, &info->environment))
+ return False;
+ if (!new_smb_io_relstr("dll_name", buffer, depth, &info->dll_name))
+ return False;
return True;
}
@@ -1402,22 +2030,24 @@ static BOOL smb_io_monitor_info_1(char *desc, PRINTMONITOR_1 *info, prs_struct *
/*******************************************************************
return the size required by a struct in the stream
********************************************************************/
-static uint32 spoolss_size_printer_info_0(PRINTER_INFO_0 *info)
+uint32 spoolss_size_printer_info_0(PRINTER_INFO_0 *info)
{
int size=0;
-
+
+ size+=24*4;
+ size+=6;
+
size+=size_of_uint32( &(info->attributes) );
size+=size_of_relative_string( &(info->printername) );
size+=size_of_relative_string( &(info->servername) );
- return (size);
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
********************************************************************/
-static uint32 spoolss_size_printer_info_1(PRINTER_INFO_1 *info)
+uint32 spoolss_size_printer_info_1(PRINTER_INFO_1 *info)
{
int size=0;
@@ -1425,15 +2055,14 @@ static uint32 spoolss_size_printer_info_1(PRINTER_INFO_1 *info)
size+=size_of_relative_string( &(info->description) );
size+=size_of_relative_string( &(info->name) );
size+=size_of_relative_string( &(info->comment) );
- return (size);
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
-********************************************************************/
-static uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info)
+********************************************************************/
+uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info)
{
int size=0;
@@ -1462,33 +2091,26 @@ static uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info)
size+=size_of_uint32( &(info->status) );
size+=size_of_uint32( &(info->cjobs) );
size+=size_of_uint32( &(info->averageppm) );
- return (size);
-
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
-********************************************************************/
-static uint32 spoolss_size_printer_driver_info_1(DRIVER_INFO_1 *info)
+********************************************************************/
+uint32 spoolss_size_printer_driver_info_1(DRIVER_INFO_1 *info)
{
int size=0;
- DEBUG(9,("Sizing driver info_1\n"));
size+=size_of_relative_string( &(info->name) );
- DEBUGADD(9,("size: [%d]\n", size));
- return (size);
-
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
-********************************************************************/
-static uint32 spoolss_size_printer_driver_info_2(DRIVER_INFO_2 *info)
+********************************************************************/
+uint32 spoolss_size_printer_driver_info_2(DRIVER_INFO_2 *info)
{
int size=0;
- DEBUG(9,("Sizing driver info_2\n"));
size+=size_of_uint32( &(info->version) );
size+=size_of_relative_string( &(info->name) );
size+=size_of_relative_string( &(info->architecture) );
@@ -1496,22 +2118,18 @@ static uint32 spoolss_size_printer_driver_info_2(DRIVER_INFO_2 *info)
size+=size_of_relative_string( &(info->datafile) );
size+=size_of_relative_string( &(info->configfile) );
- DEBUGADD(9,("size: [%d]\n", size));
- return (size);
-
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
-********************************************************************/
-static uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3 *info)
+********************************************************************/
+uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3 *info)
{
int size=0;
UNISTR **string;
int i=0;
- DEBUG(9,("Sizing driver info_3\n"));
size+=size_of_uint32( &(info->version) );
size+=size_of_relative_string( &(info->name) );
size+=size_of_relative_string( &(info->architecture) );
@@ -1531,16 +2149,13 @@ static uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3 *info)
}
size+=6;
- DEBUGADD(9,("size: [%d]\n", size));
- return (size);
-
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
********************************************************************/
-static uint32 spoolss_size_job_info_1(JOB_INFO_1 *info)
+uint32 spoolss_size_job_info_1(JOB_INFO_1 *info)
{
int size=0;
size+=size_of_uint32( &(info->jobid) );
@@ -1556,15 +2171,14 @@ static uint32 spoolss_size_job_info_1(JOB_INFO_1 *info)
size+=size_of_uint32( &(info->totalpages) );
size+=size_of_uint32( &(info->pagesprinted) );
size+=size_of_systemtime( &(info->submitted) );
- return (size);
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
********************************************************************/
-static uint32 spoolss_size_job_info_2(JOB_INFO_2 *info)
+uint32 spoolss_size_job_info_2(JOB_INFO_2 *info)
{
int size=0;
@@ -1593,15 +2207,14 @@ static uint32 spoolss_size_job_info_2(JOB_INFO_2 *info)
size+=size_of_systemtime( &(info->submitted) );
size+=size_of_uint32( &(info->timeelapsed) );
size+=size_of_uint32( &(info->pagesprinted) );
- return (size);
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
-********************************************************************/
-static uint32 spoolss_size_form_1(FORM_1 *info)
+********************************************************************/
+uint32 spoolss_size_form_1(FORM_1 *info)
{
int size=0;
@@ -1614,171 +2227,131 @@ static uint32 spoolss_size_form_1(FORM_1 *info)
size+=size_of_uint32( &(info->right) );
size+=size_of_uint32( &(info->bottom) );
- return (size);
-
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
********************************************************************/
-static uint32 spoolss_size_port_info_2(PORT_INFO_2 *info)
+uint32 spoolss_size_port_info_1(PORT_INFO_1 *info)
{
int size=0;
- size+=size_of_relative_string( &(info->port_name) );
- size+=size_of_relative_string( &(info->monitor_name) );
- size+=size_of_relative_string( &(info->description) );
-
- size+=size_of_uint32( &(info->port_type) );
- size+=size_of_uint32( &(info->reserved) );
+ size+=size_of_relative_string( &info->port_name );
- return (size);
-
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
********************************************************************/
-static uint32 spoolss_size_processor_info_1(PRINTPROCESSOR_1 *info)
+uint32 spoolss_size_driverdir_info_1(DRIVER_DIRECTORY_1 *info)
{
int size=0;
- size+=size_of_relative_string( &(info->name) );
- return (size);
+ size+=size_of_relative_string( &info->name );
- return True;
+ return size;
}
/*******************************************************************
return the size required by a struct in the stream
********************************************************************/
-static uint32 spoolss_size_monitor_info_1(PRINTMONITOR_1 *info)
+uint32 spoolss_size_port_info_2(PORT_INFO_2 *info)
{
int size=0;
- size+=size_of_relative_string( &(info->name) );
- return (size);
+ size+=size_of_relative_string( &info->port_name );
+ size+=size_of_relative_string( &info->monitor_name );
+ size+=size_of_relative_string( &info->description );
- return True;
+ size+=size_of_uint32( &info->port_type );
+ size+=size_of_uint32( &info->reserved );
+
+ return size;
}
/*******************************************************************
- * make a structure.
- ********************************************************************/
-static BOOL make_spoolss_buffer(BUFFER* buffer, uint32 size)
+return the size required by a struct in the stream
+********************************************************************/
+uint32 spoolss_size_printprocessor_info_1(PRINTPROCESSOR_1 *info)
{
- buffer->ptr = (size != 0) ? 1 : 0;
- buffer->size = size;
- buffer->data = (uint8 *)Realloc( NULL, (buffer->size) * sizeof(uint8) );
+ int size=0;
+ size+=size_of_relative_string( &info->name );
- return (buffer->data != NULL || size == 0);
+ return size;
}
/*******************************************************************
- * read a uint8 buffer of size *size.
- * allocate memory for it
- * return a pointer to the allocated memory and the size
- * return NULL and a size of 0 if the buffer is empty
- *
- * jfmxxxx: fix it to also write a buffer
- ********************************************************************/
-static BOOL spoolss_io_read_buffer(char *desc, prs_struct *ps, int depth, BUFFER *buffer)
+return the size required by a struct in the stream
+********************************************************************/
+uint32 spoolss_size_printprocdatatype_info_1(PRINTPROCDATATYPE_1 *info)
{
- prs_debug(ps, depth, desc, "spoolss_io_read_buffer");
- depth++;
-
- prs_align(ps);
+ int size=0;
+ size+=size_of_relative_string( &info->name );
- prs_uint32("pointer", ps, depth, &(buffer->ptr));
-
- if (buffer->ptr != 0x0000)
- {
- prs_uint32("size", ps, depth, &(buffer->size));
- if (ps->io)
- {
- /* reading */
- buffer->data=(uint8 *)Realloc(NULL, buffer->size * sizeof(uint8) );
- }
- if (buffer->data == NULL)
- {
- return False;
- }
- prs_uint8s(True, "buffer", ps, depth, buffer->data, buffer->size);
- prs_align(ps);
+ return size;
+}
- }
- else
- {
- if (ps->io)
- {
- /* reading */
- buffer->data=0x0000;
- buffer->size=0x0000;
- }
- }
+/*******************************************************************
+return the size required by a struct in the stream
+********************************************************************/
+uint32 spoolss_size_printmonitor_info_1(PRINTMONITOR_1 *info)
+{
+ int size=0;
+ size+=size_of_relative_string( &info->name );
- if (!ps->io)
- {
- /* writing */
- if (buffer->data != NULL)
- {
- free(buffer->data);
- }
- buffer->data = NULL;
- }
- return True;
+ return size;
}
/*******************************************************************
- * read a uint8 buffer of size *size.
- * allocate memory for it
- * return a pointer to the allocated memory and the size
- * return NULL and a size of 0 if the buffer is empty
- *
- * jfmxxxx: fix it to also write a buffer
- ********************************************************************/
-BOOL spoolss_io_free_buffer(BUFFER *buffer)
+return the size required by a struct in the stream
+********************************************************************/
+uint32 spoolss_size_printmonitor_info_2(PRINTMONITOR_2 *info)
{
- DEBUG(8,("spoolss_io_free_buffer\n"));
-
- if (buffer->ptr != 0x0000)
- {
- free(buffer->data);
- }
+ int size=0;
+ size+=size_of_relative_string( &info->name);
+ size+=size_of_relative_string( &info->environment);
+ size+=size_of_relative_string( &info->dll_name);
- return True;
+ return size;
}
/*******************************************************************
* read a structure.
* called from spoolss_getprinterdriver2 (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_q_getprinterdriver2(char *desc,
- SPOOL_Q_GETPRINTERDRIVER2 *q_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_q_getprinterdriver2(char *desc, SPOOL_Q_GETPRINTERDRIVER2 *q_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr;
prs_debug(ps, depth, desc, "spoolss_io_q_getprinterdriver2");
depth++;
- prs_align(ps);
-
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- smb_io_unistr2("architecture", &(q_u->architecture),True,ps,depth);
+ if(!prs_align(ps))
+ return False;
- prs_align(ps);
+ if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
+ return False;
+ if(!prs_uint32("architecture_ptr", ps, depth, &q_u->architecture_ptr))
+ return False;
+ if(!smb_io_unistr2("architecture", &q_u->architecture, q_u->architecture_ptr, ps, depth))
+ return False;
- prs_uint32("level", ps, depth, &(q_u->level));
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
+
+ if(!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- prs_uint32("buffer size", ps, depth, &(q_u->buf_size));
- DEBUG(0,("spoolss_io_q_getprinterdriver2: renamed status - unknown\n"));
- prs_uint32("unknown", ps, depth, &(q_u->unknown));
+ if(!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
+
+ if(!prs_uint32("unknown", ps, depth, &q_u->unknown))
+ return False;
return True;
}
@@ -1787,185 +2360,46 @@ BOOL spoolss_io_q_getprinterdriver2(char *desc,
* read a structure.
* called from spoolss_getprinterdriver2 (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_r_getprinterdriver2(char *desc, SPOOL_R_GETPRINTERDRIVER2 *r_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_r_getprinterdriver2(char *desc, SPOOL_R_GETPRINTERDRIVER2 *r_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- uint32 pipo=0;
- DRIVER_INFO_1 *info1;
- DRIVER_INFO_2 *info2;
- DRIVER_INFO_3 *info3;
-
prs_debug(ps, depth, desc, "spoolss_io_r_getprinterdriver2");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
-
- info1 = r_u->ctr.driver.info1;
- info2 = r_u->ctr.driver.info2;
- info3 = r_u->ctr.driver.info3;
-
- switch (r_u->level)
- {
- case 1:
- {
- bufsize_required += spoolss_size_printer_driver_info_1(info1);
- break;
- }
- case 2:
- {
- bufsize_required += spoolss_size_printer_driver_info_2(info2);
- break;
- }
- case 3:
- {
- bufsize_required += spoolss_size_printer_driver_info_3(info3);
- break;
- }
- }
-
- if (ps->io)
- {
- /* reading */
- r_u->offered = bufsize_required;
- }
-
- DEBUG(4,("spoolss_io_r_getprinterdriver2, size needed: %d\n",bufsize_required));
- DEBUG(4,("spoolss_io_r_getprinterdriver2, size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
- if (r_u->offered < bufsize_required)
- {
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
-
- DEBUG(4,("spoolss_io_r_getprinterdriver2, buffer too small\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("spoolss_io_r_getprinterdriver2, buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
-
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
-
- switch (r_u->level)
- {
- case 1:
- {
- smb_io_printer_driver_info_1(desc,
- info1,
- ps,
- depth,
- &start_offset,
- &end_offset);
- break;
- }
- case 2:
- {
- smb_io_printer_driver_info_2(desc,
- info2,
- ps,
- depth,
- &start_offset,
- &end_offset);
- break;
- }
- case 3:
- {
- smb_io_printer_driver_info_3(desc,
- info3,
- ps,
- depth,
- &start_offset,
- &end_offset);
- break;
- }
-
- }
-
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
-
- if (!ps->io)
- {
- /* writing */
- switch (r_u->level)
- {
- case 1:
- {
- safe_free(info1);
- break;
- }
- case 2:
- {
- safe_free(info2);
- break;
- }
- case 3:
- {
- if (info3!=NULL)
- {
- UNISTR **dependentfiles;
- int j=0;
- dependentfiles=info3->dependentfiles;
- while ( dependentfiles[j] != NULL )
- {
- free(dependentfiles[j]);
- j++;
- }
- free(dependentfiles);
-
- free(info3);
- }
- break;
- }
+ if (!prs_align(ps))
+ return False;
- }
- }
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("pipo", ps, depth, &pipo);
- prs_uint32("pipo", ps, depth, &pipo);
- prs_uint32("status", ps, depth, &(r_u->status));
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+ if (!prs_uint32("unknown0", ps, depth, &r_u->unknown0))
+ return False;
+ if (!prs_uint32("unknown1", ps, depth, &r_u->unknown1))
+ return False;
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- return True;
+ return True;
}
/*******************************************************************
- * make a structure.
+ * init a structure.
********************************************************************/
-BOOL make_spoolss_q_enumprinters(SPOOL_Q_ENUMPRINTERS *q_u,
- uint32 flags,
- const char* servername,
- uint32 level,
- uint32 size)
+BOOL make_spoolss_q_enumprinters(SPOOL_Q_ENUMPRINTERS *q_u, uint32 flags,
+ fstring servername, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered)
{
- size_t len_name = servername != NULL ? strlen(servername) : 0;
-
- DEBUG(5,("make_spoolss_q_enumprinters. size: %d\n", size));
-
- q_u->flags = flags;
-
- make_unistr2(&q_u->servername, servername, len_name);
+ q_u->flags=flags;
+
+ q_u->servername_ptr = (servername != NULL) ? 1 : 0;
+ init_unistr2(&(q_u->servername), servername, strlen(servername));
- q_u->level = level;
- make_spoolss_buffer(&q_u->buffer, size);
- q_u->buf_size = size;
+ q_u->level=level;
+ q_u->buffer=buffer;
+ q_u->offered=offered;
return True;
}
@@ -1974,197 +2408,65 @@ BOOL make_spoolss_q_enumprinters(SPOOL_Q_ENUMPRINTERS *q_u,
* read a structure.
* called from spoolss_enumprinters (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_q_enumprinters(char *desc, SPOOL_Q_ENUMPRINTERS *q_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_q_enumprinters(char *desc, SPOOL_Q_ENUMPRINTERS *q_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr = 0x01;
prs_debug(ps, depth, desc, "spoolss_io_q_enumprinters");
depth++;
- prs_align(ps);
-
- prs_uint32("flags", ps, depth, &(q_u->flags));
- prs_uint32("useless ptr", ps, depth, &useless_ptr);
+ if (!prs_align(ps))
+ return False;
- smb_io_unistr2("", &q_u->servername,True,ps,depth);
- prs_align(ps);
+ if (!prs_uint32("flags", ps, depth, &q_u->flags))
+ return False;
+ if (!prs_uint32("servername_ptr", ps, depth, &q_u->servername_ptr))
+ return False;
- prs_uint32("level", ps, depth, &(q_u->level));
+ if (!smb_io_unistr2("", &q_u->servername, q_u->servername_ptr, ps, depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
- spoolss_io_read_buffer("buffer", ps, depth, &(q_u->buffer));
+ if (!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
- prs_uint32("buf_size", ps, depth, &q_u->buf_size);
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
-/****************************************************************************
-****************************************************************************/
-void free_r_enumprinters(SPOOL_R_ENUMPRINTERS *r_u)
-{
- DEBUG(4,("free_enum_printers_info: [%d] structs to free at level [%d]\n", r_u->returned, r_u->level));
- switch (r_u->level)
- {
- case 1:
- {
- free_print1_array(r_u->returned, r_u->ctr.printer.printers_1);
- break;
- }
- case 2:
- {
- free_print2_array(r_u->returned, r_u->ctr.printer.printers_2);
- break;
- }
- }
-}
-
/*******************************************************************
- * write a structure.
- * called from spoolss_r_enum_printers (srv_spoolss.c)
- *
+ Parse a SPOOL_R_ENUMPRINTERS structure.
********************************************************************/
-BOOL spoolss_io_r_enumprinters(char *desc,
- SPOOL_R_ENUMPRINTERS *r_u,
- prs_struct *ps, int depth)
-{
- uint32 useless_ptr=0xADDE0FF0;
- int i;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- uint32 tmp_ct = 0;
-
- PRINTER_INFO_1 *info1;
- PRINTER_INFO_2 *info2;
- fstring tmp;
-
- slprintf(tmp, sizeof(tmp)-1, "spoolss_io_r_enumprinters %d", r_u->level);
-
- prs_debug(ps, depth, desc, tmp);
+BOOL new_spoolss_io_r_enumprinters(char *desc, SPOOL_R_ENUMPRINTERS *r_u, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "new_spoolss_io_r_enumprinters");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
-
- if (!ps->io)
- {
- /* writing */
- for(i=0;i<r_u->returned;i++)
- {
- switch (r_u->level)
- {
- case 1:
- info1 = r_u->ctr.printer.printers_1[i];
- bufsize_required += spoolss_size_printer_info_1(info1);
- break;
- case 2:
- info2 = r_u->ctr.printer.printers_2[i];
- bufsize_required += spoolss_size_printer_info_2(info2);
- break;
- }
- }
-
- DEBUG(4,("spoolss_io_r_enumprinters, size needed: %d\n",bufsize_required));
- DEBUG(4,("spoolss_io_r_enumprinters, size offered: %d\n",r_u->offered));
-
- if (r_u->offered<bufsize_required)
- {
- /*
- * so the buffer is too small to handle datas
- * reply the minimum size required in the status
- * make the buffer equal 0
- * and reply no printers in buffer
- */
- r_u->status=ERROR_INSUFFICIENT_BUFFER;
- r_u->offered=0;
- /*r_u->returned=0;*/
-
- DEBUG(4,("spoolss_io_r_enumprinters, buffer too small\n"));
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("count", ps, depth, &(r_u->returned));
- prs_uint32("status", ps, depth, &(r_u->status));
- return False;
- }
+ if (!prs_align(ps))
+ return False;
- DEBUG(4,("spoolss_io_r_enumprinters, buffer large enough\n"));
- }
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
-
- /* have to skip to end of buffer when reading, and have to record
- * size of buffer when writing. *shudder*.
- */
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- beginning = ps->offset;
- start_offset = ps->offset;
- end_offset = start_offset + r_u->offered;
+ if (!prs_align(ps))
+ return False;
- if (ps->io)
- {
- /* reading */
- ps->offset = beginning + r_u->offered;
-
- prs_align(ps);
- prs_uint32("buffer size", ps, depth, &(bufsize_required));
- prs_uint32("count", ps, depth, &(r_u->returned));
-
- ps->offset = beginning;
- }
-
- for(i=0;i<r_u->returned;i++)
- {
-
- switch (r_u->level)
- {
- case 1:
- {
- if (ps->io)
- {
- /* reading */
- r_u->ctr.printer.printers_1[i] = add_print1_to_array(&tmp_ct, &r_u->ctr.printer.printers_1, NULL);
- }
- info1 = r_u->ctr.printer.printers_1[i];
- if (info1 == NULL)
- {
- return False;
- }
- smb_io_printer_info_1(desc, info1, ps, depth,
- &start_offset, &end_offset);
- break;
- }
- case 2:
- {
- if (ps->io)
- {
- /* reading */
- r_u->ctr.printer.printers_2[i] = add_print2_to_array(&tmp_ct, &r_u->ctr.printer.printers_2, NULL);
- }
- info2 = r_u->ctr.printer.printers_2[i];
- if (info2 == NULL)
- {
- return False;
- }
- smb_io_printer_info_2(desc, info2, ps, depth,
- &start_offset, &end_offset);
- break;
- }
- }
- }
-
- ps->offset = beginning + r_u->offered;
- prs_align(ps);
-
- prs_uint32("buffer size", ps, depth, &(bufsize_required));
- prs_uint32("count", ps, depth, &(r_u->returned));
- prs_uint32("status", ps, depth, &(r_u->status));
-
- if (!ps->io)
- {
- /* writing */
- free_r_enumprinters(r_u);
- }
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+
+ if (!prs_uint32("returned", ps, depth, &r_u->returned))
+ return False;
+
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- return True;
+ return True;
}
/*******************************************************************
@@ -2172,229 +2474,55 @@ BOOL spoolss_io_r_enumprinters(char *desc,
* called from spoolss_r_enum_printers (srv_spoolss.c)
*
********************************************************************/
-BOOL spoolss_io_r_getprinter(char *desc,
- SPOOL_R_GETPRINTER *r_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_r_getprinter(char *desc, SPOOL_R_GETPRINTER *r_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
-
prs_debug(ps, depth, desc, "spoolss_io_r_getprinter");
depth++;
- prs_align(ps);
-
- prs_uint32("pointer", ps, depth, &useless_ptr);
-
- switch (r_u->level)
- {
- case 0:
- {
- PRINTER_INFO_0 *info;
- info = r_u->ctr.printer.info0;
- bufsize_required += spoolss_size_printer_info_0(info);
- break;
- }
- case 1:
- {
- PRINTER_INFO_1 *info;
- info = r_u->ctr.printer.info1;
- bufsize_required += spoolss_size_printer_info_1(info);
- break;
- }
- case 2:
- {
- PRINTER_INFO_2 *info;
- info = r_u->ctr.printer.info2;
- bufsize_required += spoolss_size_printer_info_2(info);
- break;
- }
- }
-
- DEBUG(4,("spoolss_io_r_getprinter, size needed: %d\n",bufsize_required));
- DEBUG(4,("spoolss_io_r_getprinter, size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
- if (r_u->offered < bufsize_required)
- {
- /* it's too small */
- r_u->status = ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered = 0; /* don't send back the buffer */
+ if (!prs_align(ps))
+ return False;
- DEBUG(4,("spoolss_io_r_getprinter, buffer too small\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("spoolss_io_r_getprinter, buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
-
- if (ps->io)
- {
- /* reading */
- r_u->ctr.printer.info = Realloc(NULL, r_u->offered);
- }
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- if (bufsize_required <= r_u->offered)
- {
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
-
- switch (r_u->level)
- {
- case 0:
- {
- PRINTER_INFO_0 *info;
- info = r_u->ctr.printer.info0;
- smb_io_printer_info_0(desc,
- info,
- ps,
- depth,
- &start_offset,
- &end_offset);
- if (!ps->io)
- {
- /* writing */
- free(info);
- }
- break;
- }
- case 1:
- {
- PRINTER_INFO_1 *info;
- info = r_u->ctr.printer.info1;
- smb_io_printer_info_1(desc,
- info,
- ps,
- depth,
- &start_offset,
- &end_offset);
- if (!ps->io)
- {
- /* writing */
- free(info);
- }
- break;
- }
- case 2:
- {
- PRINTER_INFO_2 *info;
- info = r_u->ctr.printer.info2;
- smb_io_printer_info_2(desc,
- info,
- ps,
- depth,
- &start_offset,
- &end_offset);
- if (!ps->io)
- {
- /* writing */
- free_printer_info_2(info);
- }
- break;
- }
+ if (!prs_align(ps))
+ return False;
- }
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
-
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("status", ps, depth, &(r_u->status));
-
- return True;
-}
-
-/*******************************************************************
- * read a uint8 buffer of size *size.
- * allocate memory for it
- * return a pointer to the allocated memory and the size
- * return NULL and a size of 0 if the buffer is empty
- *
- * jfmxxxx: fix it to also write a buffer
- ********************************************************************/
-static BOOL spoolss_io_read_buffer8(char *desc, prs_struct *ps, uint8 **buffer, uint32 *size,int depth)
-{
- prs_debug(ps, depth, desc, "spoolss_io_read_buffer8");
- depth++;
-
- prs_align(ps);
-
- prs_uint32("buffer size", ps, depth, size);
- *buffer = (uint8 *)Realloc(NULL, (*size) * sizeof(uint8) );
- prs_uint8s(True,"buffer",ps,depth,*buffer,*size);
- prs_align(ps);
-
- return True;
-}
-
-/*******************************************************************
- * make a structure.
- * called from spoolss_getprinter (srv_spoolss.c)
- ********************************************************************/
-BOOL make_spoolss_q_getprinter(SPOOL_Q_GETPRINTER *q_u,
- POLICY_HND *hnd,
- uint32 level,
- uint32 buf_size)
-{
- if (q_u == NULL) return False;
-
- memcpy(&q_u->handle, hnd, sizeof(q_u->handle));
-
- q_u->level = level;
- q_u->buffer = (uint8 *)Realloc(NULL, (buf_size) * sizeof(uint8) );
- q_u->offered = buf_size;
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- return True;
+ return True;
}
/*******************************************************************
* read a structure.
* called from spoolss_getprinter (srv_spoolss.c)
********************************************************************/
-BOOL spoolss_io_q_getprinter(char *desc, SPOOL_Q_GETPRINTER *q_u,
- prs_struct *ps, int depth)
+BOOL spoolss_io_q_getprinter(char *desc, SPOOL_Q_GETPRINTER *q_u, prs_struct *ps, int depth)
{
- uint32 count = 0;
- uint32 buf_ptr = q_u->buffer != NULL ? 1 : 0;
prs_debug(ps, depth, desc, "spoolss_io_q_getprinter");
depth++;
- prs_align(ps);
+ if (!prs_align(ps))
+ return False;
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
-
- prs_uint32("level", ps, depth, &(q_u->level));
+ if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
+ return False;
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
- if (!ps->io)
- {
- /* writing */
- buf_ptr = q_u->buffer != NULL ? 1 : 0;
- }
- prs_uint32("buffer pointer", ps, depth, &buf_ptr);
+ if (!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
- if (buf_ptr != 0)
- {
- spoolss_io_read_buffer8("",ps, &q_u->buffer, &count,depth);
- }
- if (q_u->buffer != NULL)
- {
- free(q_u->buffer);
- }
- prs_uint32("buffer size", ps, depth, &(q_u->offered));
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
- return count == q_u->offered;
+ return True;
}
/*******************************************************************
@@ -2413,61 +2541,30 @@ BOOL spoolss_io_r_setprinter(char *desc, SPOOL_R_SETPRINTER *r_u, prs_struct *ps
/*******************************************************************
********************************************************************/
-static BOOL spoolss_io_devmode(char *desc, prs_struct *ps, int depth, DEVICEMODE **devmode)
-{
- uint32 devmode_size=0x0;
- uint32 useless_ptr=0x0;
-
- prs_debug(ps, depth, desc, "spoolss_io_devmode");
- depth++;
-
- prs_uint32("devmode_size", ps, depth, &(devmode_size));
- prs_uint32("useless_ptr", ps, depth, &(useless_ptr));
-
- if (devmode_size!=0 && useless_ptr!=0)
- {
- /* so we have a DEVICEMODE to follow */
- if (ps->io)
- {
- DEBUG(9,("Allocating memory for spoolss_io_devmode\n"));
- *devmode=(DEVICEMODE *)malloc(sizeof(DEVICEMODE));
- ZERO_STRUCTP(*devmode);
- }
-
- /* this is bad code, shouldn't be there */
- prs_uint32("devmode_size", ps, depth, &(devmode_size));
-
- smb_io_devmode(desc, ps, depth, *devmode);
- }
-
- return True;
-}
-
-/*******************************************************************
-********************************************************************/
BOOL spoolss_io_q_setprinter(char *desc, SPOOL_Q_SETPRINTER *q_u, prs_struct *ps, int depth)
{
prs_debug(ps, depth, desc, "spoolss_io_q_setprinter");
depth++;
- prs_align(ps);
-
- smb_io_pol_hnd("printer handle", &(q_u->handle),ps,depth);
- prs_uint32("level", ps, depth, &(q_u->level));
-
- /* again a designed mess */
- /* sometimes I'm wondering how all of this work ! */
+ if(!prs_align(ps))
+ return False;
- /* To be correct it need to be split in 3 functions */
+ if(!smb_io_pol_hnd("printer handle", &q_u->handle ,ps, depth))
+ return False;
+ if(!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
- spool_io_printer_info_level("", &(q_u->info), ps, depth);
+ if(!spool_io_printer_info_level("", &q_u->info, ps, depth))
+ return False;
- spoolss_io_devmode(desc, ps, depth, &(q_u->devmode));
+ if (!spoolss_io_devmode_cont(desc, &q_u->devmode_ctr, ps, depth))
+ return False;
- prs_uint32("security.size_of_buffer", ps, depth, &(q_u->security.size_of_buffer));
- prs_uint32("security.data", ps, depth, &(q_u->security.data));
+ prs_uint32("security.size_of_buffer", ps, depth, &q_u->security.size_of_buffer);
+ prs_uint32("security.data", ps, depth, &q_u->security.data);
- prs_uint32("command", ps, depth, &(q_u->command));
+ if(!prs_uint32("command", ps, depth, &q_u->command))
+ return False;
return True;
}
@@ -2509,9 +2606,11 @@ BOOL spoolss_io_r_addjob(char *desc, SPOOL_R_ADDJOB *r_u, prs_struct *ps, int de
prs_debug(ps, depth, desc, "");
depth++;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- prs_uint32("status", ps, depth, &(r_u->status));
+ if(!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
return True;
}
@@ -2520,216 +2619,66 @@ BOOL spoolss_io_r_addjob(char *desc, SPOOL_R_ADDJOB *r_u, prs_struct *ps, int de
********************************************************************/
BOOL spoolss_io_q_addjob(char *desc, SPOOL_Q_ADDJOB *q_u, prs_struct *ps, int depth)
{
-
prs_debug(ps, depth, desc, "");
depth++;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_uint32("level", ps, depth, &(q_u->level));
+ if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
+ return False;
+ if(!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
+ if(!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if(!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
-/****************************************************************************
-****************************************************************************/
-void free_job_info_ctr(JOB_INFO_CTR *ctr, uint32 level, uint32 numofjobs)
-{
- DEBUG(4,("free_enum_jobs_info: [%d] structs to free at level [%d]\n",
- numofjobs, level));
- switch (level)
- {
- case 1:
- {
- free_job1_array(numofjobs,
- ctr->job.job_info_1);
- break;
- }
- case 2:
- {
- free_job2_array(numofjobs,
- ctr->job.job_info_2);
- break;
- }
- }
-}
-
-/****************************************************************************
-****************************************************************************/
-void free_r_enumjobs(SPOOL_R_ENUMJOBS *r_u)
-{
- free_job_info_ctr(&r_u->ctr, r_u->level, r_u->numofjobs);
-}
-
/*******************************************************************
********************************************************************/
BOOL spoolss_io_r_enumjobs(char *desc, SPOOL_R_ENUMJOBS *r_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr = 0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- uint32 tmp_ct = 0;
- int i;
-
prs_debug(ps, depth, desc, "spoolss_io_r_enumjobs");
depth++;
- prs_align(ps);
-
- if (!ps->io)
- {
- /* writing */
- switch (r_u->level)
- {
- case 1:
- {
- for (i=0; i<r_u->numofjobs; i++)
- {
- JOB_INFO_1 *info;
- info=r_u->ctr.job.job_info_1[i];
- bufsize_required += spoolss_size_job_info_1(&(info[i]));
- }
- break;
- }
- case 2:
- {
- for (i=0; i<r_u->numofjobs; i++)
- {
- JOB_INFO_2 *info;
- info=r_u->ctr.job.job_info_2[i];
-
- bufsize_required += spoolss_size_job_info_2(&(info[i]));
- }
- break;
- }
- }
-
- DEBUG(4,("spoolss_io_r_enumjobs, size needed: %d\n",
- bufsize_required));
- DEBUG(4,("spoolss_io_r_enumjobs, size offered: %d\n",
- r_u->offered));
-
- /* check if the buffer is big enough for the datas */
- if (r_u->offered<bufsize_required)
- {
- /* it's too small */
- r_u->status = ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered = bufsize_required;
- useless_ptr = 0;
-
- DEBUG(4,("spoolss_io_r_enumjobs, buffer too small\n"));
-
- }
- else
- {
- useless_ptr = 1;
- }
- }
-
- prs_uint32("pointer", ps, depth, &useless_ptr);
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
-
- if (useless_ptr != 0)
- {
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
+ if (!prs_align(ps))
+ return False;
- tmp_ct = 0;
-
- if (ps->io)
- {
- /* reading */
- ps->offset = beginning + r_u->offered;
-
- prs_align(ps);
- prs_uint32("buffer size", ps, depth, &(bufsize_required));
- prs_uint32("numofjobs", ps, depth, &(r_u->numofjobs));
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- ps->offset = beginning;
- }
+ if (!prs_align(ps))
+ return False;
- switch (r_u->level)
- {
- case 1:
- {
- JOB_INFO_1 *info;
- for (i=0; i<r_u->numofjobs; i++)
- {
- if (ps->io)
- {
- /* reading */
- r_u->ctr.job.job_info_1[i] = add_job1_to_array(&tmp_ct, &r_u->ctr.job.job_info_1, NULL);
- }
- info = r_u->ctr.job.job_info_1[i];
- smb_io_job_info_1(desc,
- info,
- ps,
- depth,
- &start_offset,
- &end_offset);
- }
- break;
- }
- case 2:
- {
- JOB_INFO_2 *info;
- for (i=0; i<r_u->numofjobs; i++)
- {
- if (ps->io)
- {
- /* reading */
- r_u->ctr.job.job_info_2[i] = add_job2_to_array(&tmp_ct, &r_u->ctr.job.job_info_2, NULL);
- }
- info = r_u->ctr.job.job_info_2[i];
- smb_io_job_info_2(desc,
- info,
- ps,
- depth,
- &start_offset,
- &end_offset);
- }
- break;
- }
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
+ if (!prs_uint32("returned", ps, depth, &r_u->returned))
+ return False;
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("buffer size", ps, depth, &(bufsize_required));
- }
-
- prs_uint32("numofjobs", ps, depth, &(r_u->numofjobs));
- prs_uint32("status", ps, depth, &(r_u->status));
-
- if (!ps->io)
- {
- /* writing */
- free_r_enumjobs(r_u);
- }
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- return True;
+ return True;
}
+
/*******************************************************************
********************************************************************/
BOOL make_spoolss_q_enumjobs(SPOOL_Q_ENUMJOBS *q_u, const POLICY_HND *hnd,
uint32 firstjob,
uint32 numofjobs,
uint32 level,
- uint32 buf_size)
+ NEW_BUFFER *buffer,
+ uint32 offered)
{
if (q_u == NULL)
{
@@ -2739,13 +2688,8 @@ BOOL make_spoolss_q_enumjobs(SPOOL_Q_ENUMJOBS *q_u, const POLICY_HND *hnd,
q_u->firstjob = firstjob;
q_u->numofjobs = numofjobs;
q_u->level = level;
-
- if (!make_spoolss_buffer(&q_u->buffer, buf_size))
- {
- return False;
- }
- q_u->buf_size = buf_size;
-
+ q_u->buffer= buffer;
+ q_u->offered = offered;
return True;
}
@@ -2756,16 +2700,24 @@ BOOL spoolss_io_q_enumjobs(char *desc, SPOOL_Q_ENUMJOBS *q_u, prs_struct *ps, in
prs_debug(ps, depth, desc, "spoolss_io_q_enumjobs");
depth++;
- prs_align(ps);
+ if (!prs_align(ps))
+ return False;
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_uint32("firstjob", ps, depth, &(q_u->firstjob));
- prs_uint32("numofjobs", ps, depth, &(q_u->numofjobs));
- prs_uint32("level", ps, depth, &(q_u->level));
-
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
+ if (!smb_io_pol_hnd("printer handle",&q_u->handle, ps, depth))
+ return False;
+
+ if (!prs_uint32("firstjob", ps, depth, &q_u->firstjob))
+ return False;
+ if (!prs_uint32("numofjobs", ps, depth, &q_u->numofjobs))
+ return False;
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if (!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
+
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
@@ -2835,506 +2787,268 @@ BOOL spoolss_io_q_setjob(char *desc, SPOOL_Q_SETJOB *q_u, prs_struct *ps, int de
}
/*******************************************************************
+ Parse a SPOOL_R_ENUMPRINTERDRIVERS structure.
********************************************************************/
-BOOL spoolss_io_r_enumdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth)
-{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- int i;
-
- prs_debug(ps, depth, desc, "spoolss_io_r_enumdrivers");
+BOOL new_spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "new_spoolss_io_r_enumprinterdrivers");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
-
- DEBUG(7,("Level [%d], number [%d]\n", r_u->level, r_u->numofdrivers));
- switch (r_u->level)
- {
- case 1:
- {
- DRIVER_INFO_1 *driver_info_1;
- driver_info_1=r_u->ctr.driver.info1;
-
- for (i=0; i<r_u->numofdrivers; i++)
- {
- bufsize_required += spoolss_size_printer_driver_info_1(&(driver_info_1[i]));
- }
- break;
- }
- case 2:
- {
- DRIVER_INFO_2 *driver_info_2;
- driver_info_2=r_u->ctr.driver.info2;
-
- for (i=0; i<r_u->numofdrivers; i++)
- {
- bufsize_required += spoolss_size_printer_driver_info_2(&(driver_info_2[i]));
- }
- break;
- }
- case 3:
- {
- DRIVER_INFO_3 *driver_info_3;
- driver_info_3=r_u->ctr.driver.info3;
-
- for (i=0; i<r_u->numofdrivers; i++)
- {
- bufsize_required += spoolss_size_printer_driver_info_3(&(driver_info_3[i]));
- }
- break;
- }
- }
-
- DEBUGADD(7,("size needed: %d\n",bufsize_required));
- DEBUGADD(7,("size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
-
- if (r_u->offered<bufsize_required)
- {
-
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
- DEBUGADD(8,("buffer too small\n"));
+ if (!prs_align(ps))
+ return False;
+
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUGADD(8,("buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
+ if (!prs_align(ps))
+ return False;
- switch (r_u->level)
- {
- case 1:
- {
- DRIVER_INFO_1 *info;
- for (i=0; i<r_u->numofdrivers; i++)
- {
- info = &(r_u->ctr.driver.info1[i]);
- smb_io_printer_driver_info_1(desc, info, ps, depth, &start_offset, &end_offset);
- }
- break;
- }
- case 2:
- {
- DRIVER_INFO_2 *info;
- for (i=0; i<r_u->numofdrivers; i++)
- {
- info = &(r_u->ctr.driver.info2[i]);
- smb_io_printer_driver_info_2(desc, info, ps, depth, &start_offset, &end_offset);
- }
- break;
- }
- case 3:
- {
- DRIVER_INFO_3 *info;
- for (i=0; i<r_u->numofdrivers; i++)
- {
- info = &(r_u->ctr.driver.info3[i]);
- smb_io_printer_driver_info_3(desc, info, ps, depth, &start_offset, &end_offset);
- }
- break;
- }
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
-
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("numofdrivers", ps, depth, &(r_u->numofdrivers));
- prs_uint32("status", ps, depth, &(r_u->status));
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+
+ if (!prs_uint32("returned", ps, depth, &r_u->returned))
+ return False;
+
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- return True;
+ return True;
}
-void free_spoolss_r_enumdrivers(SPOOL_R_ENUMPRINTERDRIVERS *r_u)
-{
- switch (r_u->level)
- {
- case 1:
- {
- DRIVER_INFO_1 *driver_info_1;
- driver_info_1=r_u->ctr.driver.info1;
-
- free(driver_info_1);
- break;
- }
- case 2:
- {
- DRIVER_INFO_2 *driver_info_2;
- driver_info_2=r_u->ctr.driver.info2;
-
- free(driver_info_2);
- break;
- }
- case 3:
- {
- DRIVER_INFO_3 *driver_info_3;
-
- UNISTR **dependentfiles;
- int i;
-
- driver_info_3=r_u->ctr.driver.info3;
-
- for (i=0; i<r_u->numofdrivers; i++)
- {
- int j=0;
- dependentfiles=(driver_info_3[i]).dependentfiles;
- while ( dependentfiles[j] != NULL )
- {
- free(dependentfiles[j]);
- j++;
- }
-
- free(dependentfiles);
- }
- free(driver_info_3);
- break;
- }
- }
-}
-
/*******************************************************************
+ Parse a SPOOL_Q_ENUMPRINTERDRIVERS structure.
********************************************************************/
BOOL spoolss_io_q_enumprinterdrivers(char *desc, SPOOL_Q_ENUMPRINTERDRIVERS *q_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0xADDE0FF0;
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "spoolss_io_q_enumprinterdrivers");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- smb_io_unistr2("", &(q_u->name),True,ps,depth);
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- smb_io_unistr2("", &(q_u->environment),True,ps,depth);
- prs_align(ps);
- prs_uint32("level", ps, depth, &(q_u->level));
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
- prs_align(ps);
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("name_ptr", ps, depth, &q_u->name_ptr))
+ return False;
+ if (!smb_io_unistr2("", &q_u->name, q_u->name_ptr,ps, depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("environment_ptr", ps, depth, &q_u->environment_ptr))
+ return False;
+ if (!smb_io_unistr2("", &q_u->environment, q_u->environment_ptr, ps, depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
+
+ if (!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
/*******************************************************************
********************************************************************/
-BOOL spoolss_io_r_enumforms(char *desc, SPOOL_R_ENUMFORMS *r_u, prs_struct *ps, int depth)
-{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- int i;
-
- prs_debug(ps, depth, desc, "spoolss_io_r_enumforms");
+BOOL spoolss_io_q_enumforms(char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps, int depth)
+{
+
+ prs_debug(ps, depth, desc, "spoolss_io_q_enumforms");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- switch (r_u->level)
- {
- case 1:
- {
- FORM_1 *forms_1;
- forms_1=r_u->forms_1;
-
- for (i=0; i<r_u->numofforms; i++)
- {
- bufsize_required += spoolss_size_form_1(&(forms_1[i]));
- }
- break;
- }
- }
+ if (!prs_align(ps))
+ return False;
+ if (!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+ return False;
+ if (!prs_uint32("level", ps, depth, &(q_u->level)))
+ return False;
- DEBUG(4,("spoolss_io_r_enumforms, size needed: %d\n",bufsize_required));
- DEBUG(4,("spoolss_io_r_enumforms, size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
-
- if (r_u->offered<bufsize_required)
- {
-
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
-
- DEBUG(4,("spoolss_io_r_enumforms, buffer too small\n"));
+ if (!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("spoolss_io_r_enumforms, buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
-
- if (r_u->offered!=0)
- {
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
-
- switch (r_u->level)
- {
- case 1:
- {
- FORM_1 *info;
- for (i=0; i<r_u->numofforms; i++)
- {
- info = &(r_u->forms_1[i]);
- smb_io_form_1(desc, info, ps, depth, &start_offset, &end_offset);
- }
- break;
- }
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
- }
-
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("numofforms", ps, depth, &(r_u->numofforms));
- prs_uint32("status", ps, depth, &(r_u->status));
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("offered", ps, depth, &(q_u->offered)))
+ return False;
return True;
}
/*******************************************************************
********************************************************************/
-void spoolss_free_r_enumforms(SPOOL_R_ENUMFORMS *r_u)
-{
- switch (r_u->level)
- {
- case 1:
- {
- free(r_u->forms_1);
- break;
- }
- }
-}
-
-/*******************************************************************
-********************************************************************/
-BOOL spoolss_io_q_enumforms(char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps, int depth)
+BOOL new_spoolss_io_r_enumforms(char *desc, SPOOL_R_ENUMFORMS *r_u, prs_struct *ps, int depth)
{
-
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "new_spoolss_io_r_enumforms");
depth++;
- prs_align(ps);
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_uint32("level", ps, depth, &(q_u->level));
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
- prs_align(ps);
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if (!prs_align(ps))
+ return False;
+
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("size of buffer needed", ps, depth, &(r_u->needed)))
+ return False;
+
+ if (!prs_uint32("numofforms", ps, depth, &(r_u->numofforms)))
+ return False;
+
+ if (!prs_uint32("status", ps, depth, &(r_u->status)))
+ return False;
return True;
+
}
/*******************************************************************
+ Parse a SPOOL_R_ENUMPORTS structure.
********************************************************************/
-BOOL spoolss_io_r_enumports(char *desc, SPOOL_R_ENUMPORTS *r_u, prs_struct *ps, int depth)
-{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- int i;
-
- prs_debug(ps, depth, desc, "spoolss_io_r_enumports");
+BOOL new_spoolss_io_r_enumports(char *desc, SPOOL_R_ENUMPORTS *r_u, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "new_spoolss_io_r_enumports");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- switch (r_u->level)
- {
- case 2:
- {
- PORT_INFO_2 *port_2;
- port_2=r_u->ctr.port.info_2;
-
- for (i=0; i<r_u->numofports; i++)
- {
- bufsize_required += spoolss_size_port_info_2(&(port_2[i]));
- }
- break;
- }
- }
-
- DEBUG(4,("size needed: %d\n",bufsize_required));
- DEBUG(4,("size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
- if (r_u->offered<bufsize_required)
- {
-
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
+ if (!prs_align(ps))
+ return False;
- DEBUG(4,("buffer too small\n"));
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
+ if (!prs_align(ps))
+ return False;
- switch (r_u->level)
- {
- case 2:
- {
- PORT_INFO_2 *info;
- for (i=0; i<r_u->numofports; i++)
- {
- info = &(r_u->ctr.port.info_2[i]);
- smb_io_port_2(desc, info, ps, depth, &start_offset, &end_offset);
- }
- break;
- }
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
-
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("numofports", ps, depth, &(r_u->numofports));
- prs_uint32("status", ps, depth, &(r_u->status));
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+
+ if (!prs_uint32("returned", ps, depth, &r_u->returned))
+ return False;
+
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- return True;
+ return True;
}
-void spoolss_free_r_enumports(SPOOL_R_ENUMPORTS *r_u)
-{
- switch (r_u->level)
- {
- case 2:
- {
- safe_free(r_u->ctr.port.info_2);
- break;
- }
- }
-}
/*******************************************************************
********************************************************************/
BOOL spoolss_io_q_enumports(char *desc, SPOOL_Q_ENUMPORTS *q_u, prs_struct *ps, int depth)
{
- uint32 useless;
prs_debug(ps, depth, desc, "");
depth++;
- prs_align(ps);
- prs_uint32("useless", ps, depth, &useless);
- smb_io_unistr2("", &(q_u->name),True,ps,depth);
- prs_align(ps);
- prs_uint32("level", ps, depth, &(q_u->level));
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
- prs_align(ps);
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("", ps, depth, &q_u->name_ptr))
+ return False;
+ if (!smb_io_unistr2("", &q_u->name,True,ps,depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
+
+ if (!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
-
/*******************************************************************
+ Parse a SPOOL_PRINTER_INFO_LEVEL_2 structure.
********************************************************************/
-BOOL spool_io_printer_info_level_2(char *desc, SPOOL_PRINTER_INFO_LEVEL_2 **q_u, prs_struct *ps, int depth)
+BOOL spool_io_printer_info_level_2(char *desc, SPOOL_PRINTER_INFO_LEVEL_2 *il, prs_struct *ps, int depth)
{
- SPOOL_PRINTER_INFO_LEVEL_2 *il;
-
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "spool_io_printer_info_level_2");
depth++;
-
- /* reading */
- if (ps->io)
- {
- il=(SPOOL_PRINTER_INFO_LEVEL_2 *)malloc(sizeof(SPOOL_PRINTER_INFO_LEVEL_2));
- ZERO_STRUCTP(il);
- *q_u=il;
- DEBUG(7,("lecture: memoire ok\n"));
- }
- else
- {
- il=*q_u;
- }
- prs_align(ps);
-
- prs_uint32("servername_ptr", ps, depth, &(il->servername_ptr));
- prs_uint32("printername_ptr", ps, depth, &(il->printername_ptr));
- prs_uint32("sharename_ptr", ps, depth, &(il->sharename_ptr));
- prs_uint32("portname_ptr", ps, depth, &(il->portname_ptr));
- prs_uint32("drivername_ptr", ps, depth, &(il->drivername_ptr));
- prs_uint32("comment_ptr", ps, depth, &(il->comment_ptr));
- prs_uint32("location_ptr", ps, depth, &(il->location_ptr));
- prs_uint32("devmode_ptr", ps, depth, &(il->devmode_ptr));
- prs_uint32("sepfile_ptr", ps, depth, &(il->sepfile_ptr));
- prs_uint32("printprocessor_ptr", ps, depth, &(il->printprocessor_ptr));
- prs_uint32("datatype_ptr", ps, depth, &(il->datatype_ptr));
- prs_uint32("parameters_ptr", ps, depth, &(il->parameters_ptr));
- prs_uint32("secdesc_ptr", ps, depth, &(il->secdesc_ptr));
-
- prs_uint32("attributes", ps, depth, &(il->attributes));
- prs_uint32("priority", ps, depth, &(il->priority));
- prs_uint32("default_priority", ps, depth, &(il->default_priority));
- prs_uint32("starttime", ps, depth, &(il->starttime));
- prs_uint32("untiltime", ps, depth, &(il->untiltime));
- prs_uint32("status", ps, depth, &(il->status));
- prs_uint32("cjobs", ps, depth, &(il->cjobs));
- prs_uint32("averageppm", ps, depth, &(il->averageppm));
-
- smb_io_unistr2("", &(il->servername), il->servername_ptr, ps, depth);
- smb_io_unistr2("", &(il->printername), il->printername_ptr, ps, depth);
- smb_io_unistr2("", &(il->sharename), il->sharename_ptr, ps, depth);
- smb_io_unistr2("", &(il->portname), il->portname_ptr, ps, depth);
- smb_io_unistr2("", &(il->drivername), il->drivername_ptr, ps, depth);
- smb_io_unistr2("", &(il->comment), il->comment_ptr, ps, depth);
- smb_io_unistr2("", &(il->location), il->location_ptr, ps, depth);
- smb_io_unistr2("", &(il->sepfile), il->sepfile_ptr, ps, depth);
- smb_io_unistr2("", &(il->printprocessor), il->printprocessor_ptr, ps, depth);
- smb_io_unistr2("", &(il->datatype), il->datatype_ptr, ps, depth);
- smb_io_unistr2("", &(il->parameters), il->parameters_ptr, ps, depth);
+ if(!prs_align(ps))
+ return False;
- prs_align(ps);
+ if(!prs_uint32("servername_ptr", ps, depth, &il->servername_ptr))
+ return False;
+ if(!prs_uint32("printername_ptr", ps, depth, &il->printername_ptr))
+ return False;
+ if(!prs_uint32("sharename_ptr", ps, depth, &il->sharename_ptr))
+ return False;
+ if(!prs_uint32("portname_ptr", ps, depth, &il->portname_ptr))
+ return False;
+ if(!prs_uint32("drivername_ptr", ps, depth, &il->drivername_ptr))
+ return False;
+ if(!prs_uint32("comment_ptr", ps, depth, &il->comment_ptr))
+ return False;
+ if(!prs_uint32("location_ptr", ps, depth, &il->location_ptr))
+ return False;
+ if(!prs_uint32("devmode_ptr", ps, depth, &il->devmode_ptr))
+ return False;
+ if(!prs_uint32("sepfile_ptr", ps, depth, &il->sepfile_ptr))
+ return False;
+ if(!prs_uint32("printprocessor_ptr", ps, depth, &il->printprocessor_ptr))
+ return False;
+ if(!prs_uint32("datatype_ptr", ps, depth, &il->datatype_ptr))
+ return False;
+ if(!prs_uint32("parameters_ptr", ps, depth, &il->parameters_ptr))
+ return False;
+ if(!prs_uint32("secdesc_ptr", ps, depth, &il->secdesc_ptr))
+ return False;
- /* this code as nothing to do here !!!
-
- if (il->secdesc_ptr)
- {
- il->secdesc=NULL;
- sec_io_desc_buf("", &(il->secdesc), ps, depth);
- }
-
- */
+ if(!prs_uint32("attributes", ps, depth, &il->attributes))
+ return False;
+ if(!prs_uint32("priority", ps, depth, &il->priority))
+ return False;
+ if(!prs_uint32("default_priority", ps, depth, &il->default_priority))
+ return False;
+ if(!prs_uint32("starttime", ps, depth, &il->starttime))
+ return False;
+ if(!prs_uint32("untiltime", ps, depth, &il->untiltime))
+ return False;
+ if(!prs_uint32("status", ps, depth, &il->status))
+ return False;
+ if(!prs_uint32("cjobs", ps, depth, &il->cjobs))
+ return False;
+ if(!prs_uint32("averageppm", ps, depth, &il->averageppm))
+ return False;
+
+ if(!smb_io_unistr2("servername", &il->servername, il->servername_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("printername", &il->printername, il->printername_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("sharename", &il->sharename, il->sharename_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("portname", &il->portname, il->portname_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("drivername", &il->drivername, il->drivername_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("comment", &il->comment, il->comment_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("location", &il->location, il->location_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("sepfile", &il->sepfile, il->sepfile_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("printprocessor", &il->printprocessor, il->printprocessor_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("datatype", &il->datatype, il->datatype_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("parameters", &il->parameters, il->parameters_ptr, ps, depth))
+ return False;
return True;
}
@@ -3343,17 +3057,24 @@ BOOL spool_io_printer_info_level_2(char *desc, SPOOL_PRINTER_INFO_LEVEL_2 **q_u,
********************************************************************/
BOOL spool_io_printer_info_level(char *desc, SPOOL_PRINTER_INFO_LEVEL *il, prs_struct *ps, int depth)
{
- uint32 useless;
- uint32 level;
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "spool_io_printer_info_level");
depth++;
- prs_align(ps);
- prs_uint32("info level", ps, depth, &level);
- prs_uint32("useless", ps, depth, &useless);
-
- switch (level)
- {
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("level", ps, depth, &il->level))
+ return False;
+ if(!prs_uint32("info_ptr", ps, depth, &il->info_ptr))
+ return False;
+
+ /* if no struct inside just return */
+ if (il->info_ptr==0) {
+ if (UNMARSHALLING(ps))
+ il->info_2=NULL;
+ return True;
+ }
+
+ switch (il->level) {
/*
* level 0 is used by setprinter when managing the queue
* (hold, stop, start a queue)
@@ -3365,71 +3086,13 @@ BOOL spool_io_printer_info_level(char *desc, SPOOL_PRINTER_INFO_LEVEL *il, prs_s
* and by setprinter when updating printer's info
*/
case 2:
- spool_io_printer_info_level_2("", &(il->info_2), ps, depth);
+ if (UNMARSHALLING(ps))
+ il->info_2=(SPOOL_PRINTER_INFO_LEVEL_2 *)malloc(sizeof(SPOOL_PRINTER_INFO_LEVEL_2));
+ if (!spool_io_printer_info_level_2("", il->info_2, ps, depth))
+ return False;
break;
}
-
- return True;
-}
-
-/*******************************************************************
-********************************************************************/
-BOOL spool_io_user_level_1(char *desc, SPOOL_USER_LEVEL_1 **q_u, prs_struct *ps, int depth)
-{
- SPOOL_USER_LEVEL_1 *il;
- prs_debug(ps, depth, desc, "");
- depth++;
-
- /* reading */
- if (ps->io)
- {
- il=(SPOOL_USER_LEVEL_1 *)malloc(sizeof(SPOOL_USER_LEVEL_1));
- ZERO_STRUCTP(il);
- *q_u=il;
- }
- else
- {
- il=*q_u;
- }
-
- prs_align(ps);
- prs_uint32("size", ps, depth, &(il->size));
- prs_uint32("client_name_ptr", ps, depth, &(il->client_name_ptr));
- prs_uint32("user_name_ptr", ps, depth, &(il->user_name_ptr));
- prs_uint32("build", ps, depth, &(il->build));
- prs_uint32("major", ps, depth, &(il->major));
- prs_uint32("minor", ps, depth, &(il->minor));
- prs_uint32("processor", ps, depth, &(il->processor));
-
- smb_io_unistr2("", &(il->client_name), il->client_name_ptr, ps, depth);
- prs_align(ps);
- smb_io_unistr2("", &(il->user_name), il->user_name_ptr, ps, depth);
-
- return True;
-}
-
-/*******************************************************************
-********************************************************************/
-BOOL spool_io_user_level(char *desc, SPOOL_USER_LEVEL *q_u, prs_struct *ps, int depth)
-{
- uint32 useless;
- uint32 level;
- prs_debug(ps, depth, desc, "spool_io_user_level");
- depth++;
-
- prs_align(ps);
- prs_uint32("info_level", ps, depth, &level);
- prs_uint32("useless", ps, depth, &useless);
-
- switch (level)
- {
- case 1:
- spool_io_user_level_1("", &(q_u->user_level_1), ps, depth);
- break;
-
- }
-
return True;
}
@@ -3437,7 +3100,6 @@ BOOL spool_io_user_level(char *desc, SPOOL_USER_LEVEL *q_u, prs_struct *ps, int
********************************************************************/
BOOL spoolss_io_q_addprinterex(char *desc, SPOOL_Q_ADDPRINTEREX *q_u, prs_struct *ps, int depth)
{
- uint32 useless;
prs_debug(ps, depth, desc, "spoolss_io_q_addprinterex");
depth++;
@@ -3447,32 +3109,44 @@ BOOL spoolss_io_q_addprinterex(char *desc, SPOOL_Q_ADDPRINTEREX *q_u, prs_struct
* the info level are handled in a nice way.
*/
- prs_align(ps);
- prs_uint32("useless", ps, depth, &useless);
- smb_io_unistr2("", &(q_u->server_name),True,ps,depth);
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("", ps, depth, &q_u->server_name_ptr))
+ return False;
+ if(!smb_io_unistr2("", &q_u->server_name, q_u->server_name_ptr, ps, depth))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
+
+ if(!prs_uint32("info_level", ps, depth, &q_u->level))
+ return False;
- prs_uint32("info_level", ps, depth, &(q_u->level));
-
- spool_io_printer_info_level("", &(q_u->info), ps, depth);
-
- /* the 4 unknown are all 0 */
+ if(!spool_io_printer_info_level("", &(q_u->info), ps, depth))
+ return False;
+ /* the 4 unknown are all 0 */
+
/*
* en fait ils sont pas inconnu
* par recoupement avec rpcSetPrinter
* c'est le devicemode
* et le security descriptor.
*/
-
- prs_uint32("unk0", ps, depth, &(q_u->unk0));
- prs_uint32("unk1", ps, depth, &(q_u->unk1));
- prs_uint32("unk2", ps, depth, &(q_u->unk2));
- prs_uint32("unk3", ps, depth, &(q_u->unk3));
-
- prs_uint32("info_level", ps, depth, &(q_u->user_level));
- spool_io_user_level("", &(q_u->user), ps, depth);
+ if(!prs_uint32("unk0", ps, depth, &q_u->unk0))
+ return False;
+ if(!prs_uint32("unk1", ps, depth, &q_u->unk1))
+ return False;
+ if(!prs_uint32("unk2", ps, depth, &q_u->unk2))
+ return False;
+ if(!prs_uint32("unk3", ps, depth, &q_u->unk3))
+ return False;
+
+ if(!prs_uint32("user_switch", ps, depth, &q_u->user_switch))
+ return False;
+ if(!spool_io_user_level("", &q_u->user_ctr, ps, depth))
+ return False;
return True;
}
@@ -3499,52 +3173,71 @@ BOOL spool_io_printer_driver_info_level_3(char *desc, SPOOL_PRINTER_DRIVER_INFO_
{
SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 *il;
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "spool_io_printer_driver_info_level_3");
depth++;
/* reading */
- if (ps->io)
- {
+ if (UNMARSHALLING(ps)) {
il=(SPOOL_PRINTER_DRIVER_INFO_LEVEL_3 *)malloc(sizeof(SPOOL_PRINTER_DRIVER_INFO_LEVEL_3));
ZERO_STRUCTP(il);
*q_u=il;
- DEBUG(1,("lecture: memoire ok\n"));
}
- else
- {
+ else {
il=*q_u;
}
- prs_align(ps);
-
- prs_uint32("cversion", ps, depth, &(il->cversion));
- prs_uint32("name", ps, depth, &(il->name_ptr));
- prs_uint32("environment", ps, depth, &(il->environment_ptr));
- prs_uint32("driverpath", ps, depth, &(il->driverpath_ptr));
- prs_uint32("datafile", ps, depth, &(il->datafile_ptr));
- prs_uint32("configfile", ps, depth, &(il->configfile_ptr));
- prs_uint32("helpfile", ps, depth, &(il->helpfile_ptr));
- prs_uint32("monitorname", ps, depth, &(il->monitorname_ptr));
- prs_uint32("defaultdatatype", ps, depth, &(il->defaultdatatype_ptr));
- prs_uint32("dependentfilessize", ps, depth, &(il->dependentfilessize));
- prs_uint32("dependentfiles", ps, depth, &(il->dependentfiles_ptr));
-
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
+
+ if(!prs_uint32("cversion", ps, depth, &il->cversion))
+ return False;
+ if(!prs_uint32("name", ps, depth, &il->name_ptr))
+ return False;
+ if(!prs_uint32("environment", ps, depth, &il->environment_ptr))
+ return False;
+ if(!prs_uint32("driverpath", ps, depth, &il->driverpath_ptr))
+ return False;
+ if(!prs_uint32("datafile", ps, depth, &il->datafile_ptr))
+ return False;
+ if(!prs_uint32("configfile", ps, depth, &il->configfile_ptr))
+ return False;
+ if(!prs_uint32("helpfile", ps, depth, &il->helpfile_ptr))
+ return False;
+ if(!prs_uint32("monitorname", ps, depth, &il->monitorname_ptr))
+ return False;
+ if(!prs_uint32("defaultdatatype", ps, depth, &il->defaultdatatype_ptr))
+ return False;
+ if(!prs_uint32("dependentfilessize", ps, depth, &il->dependentfilessize))
+ return False;
+ if(!prs_uint32("dependentfiles", ps, depth, &il->dependentfiles_ptr))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
- smb_io_unistr2("", &(il->name), il->name_ptr, ps, depth);
- smb_io_unistr2("", &(il->environment), il->environment_ptr, ps, depth);
- smb_io_unistr2("", &(il->driverpath), il->driverpath_ptr, ps, depth);
- smb_io_unistr2("", &(il->datafile), il->datafile_ptr, ps, depth);
- smb_io_unistr2("", &(il->configfile), il->configfile_ptr, ps, depth);
- smb_io_unistr2("", &(il->helpfile), il->helpfile_ptr, ps, depth);
- smb_io_unistr2("", &(il->monitorname), il->monitorname_ptr, ps, depth);
- smb_io_unistr2("", &(il->defaultdatatype), il->defaultdatatype_ptr, ps, depth);
-
- prs_align(ps);
+ if(!smb_io_unistr2("name", &il->name, il->name_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("environment", &il->environment, il->environment_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("driverpath", &il->driverpath, il->driverpath_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("datafile", &il->datafile, il->datafile_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("configfile", &il->configfile, il->configfile_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("helpfile", &il->helpfile, il->helpfile_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("monitorname", &il->monitorname, il->monitorname_ptr, ps, depth))
+ return False;
+ if(!smb_io_unistr2("defaultdatatype", &il->defaultdatatype, il->defaultdatatype_ptr, ps, depth))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
+
if (il->dependentfiles_ptr)
smb_io_buffer5("", &(il->dependentfiles), ps, depth);
-
return True;
}
@@ -3630,23 +3323,25 @@ BOOL smb_io_unibuffer(char *desc, UNISTR2 *buffer, prs_struct *ps, int depth)
********************************************************************/
BOOL spool_io_printer_driver_info_level(char *desc, SPOOL_PRINTER_DRIVER_INFO_LEVEL *il, prs_struct *ps, int depth)
{
- uint32 useless;
- uint32 level;
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "spool_io_printer_driver_info_level");
depth++;
- prs_align(ps);
- prs_uint32("info level", ps, depth, &level);
- prs_uint32("useless", ps, depth, &useless);
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("level", ps, depth, &il->level))
+ return False;
+ if(!prs_uint32("ptr", ps, depth, &il->ptr))
+ return False;
+
+ if (il->ptr==0)
+ return True;
- switch (level)
- {
+ switch (il->level) {
case 3:
spool_io_printer_driver_info_level_3("", &(il->info_3), ps, depth);
break;
}
-
return True;
}
@@ -3654,17 +3349,24 @@ BOOL spool_io_printer_driver_info_level(char *desc, SPOOL_PRINTER_DRIVER_INFO_LE
********************************************************************/
BOOL spoolss_io_q_addprinterdriver(char *desc, SPOOL_Q_ADDPRINTERDRIVER *q_u, prs_struct *ps, int depth)
{
- uint32 useless;
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "spoolss_io_q_addprinterdriver");
depth++;
- prs_align(ps);
- prs_uint32("useless", ps, depth, &useless);
- smb_io_unistr2("", &(q_u->server_name),True,ps,depth);
- prs_align(ps);
- prs_uint32("info_level", ps, depth, &(q_u->level));
+ if(!prs_align(ps))
+ return False;
+
+ if(!prs_uint32("server_name_ptr", ps, depth, &q_u->server_name_ptr))
+ return False;
+ if(!smb_io_unistr2("server_name", &q_u->server_name, q_u->server_name_ptr, ps, depth))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("info_level", ps, depth, &q_u->level))
+ return False;
- spool_io_printer_driver_info_level("", &(q_u->info), ps, depth);
+ if(!spool_io_printer_driver_info_level("", &q_u->info, ps, depth))
+ return False;
return True;
}
@@ -3673,10 +3375,11 @@ BOOL spoolss_io_q_addprinterdriver(char *desc, SPOOL_Q_ADDPRINTERDRIVER *q_u, pr
********************************************************************/
BOOL spoolss_io_r_addprinterdriver(char *desc, SPOOL_R_ADDPRINTERDRIVER *q_u, prs_struct *ps, int depth)
{
- prs_debug(ps, depth, desc, "");
+ prs_debug(ps, depth, desc, "spoolss_io_r_addprinterdriver");
depth++;
- prs_uint32("status", ps, depth, &(q_u->status));
+ if(!prs_uint32("status", ps, depth, &q_u->status))
+ return False;
return True;
}
@@ -3767,331 +3470,299 @@ BOOL uni_2_asc_printer_info_2(const SPOOL_PRINTER_INFO_LEVEL_2 *uni,
}
/*******************************************************************
+ Parse a SPOOL_Q_GETPRINTERDRIVERDIR structure.
********************************************************************/
-BOOL spoolss_io_r_getprinterdriverdir(char *desc, SPOOL_R_GETPRINTERDRIVERDIR *r_u, prs_struct *ps, int depth)
-{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
-
- prs_debug(ps, depth, desc, "spoolss_io_r_getprinterdriverdir");
+BOOL spoolss_io_q_getprinterdriverdir(char *desc, SPOOL_Q_GETPRINTERDRIVERDIR *q_u, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "spoolss_io_q_getprinterdriverdir");
depth++;
- prs_align(ps);
-
- prs_uint32("pointer", ps, depth, &useless_ptr);
-
- switch (r_u->level)
- {
- case 1:
- {
- DRIVER_DIRECTORY_1 *driver_info_1;
- driver_info_1=&(r_u->ctr.driver.info_1);
-
- bufsize_required = size_of_relative_string(&(driver_info_1->name));
- break;
- }
- }
-
- DEBUG(4,("spoolss_io_r_getprinterdriverdir, size needed: %d\n",bufsize_required));
- DEBUG(4,("spoolss_io_r_getprinterdriverdir, size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
-
- if (r_u->offered<bufsize_required)
- {
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("name_ptr", ps, depth, &q_u->name_ptr))
+ return False;
+ if(!smb_io_unistr2("", &q_u->name, q_u->name_ptr, ps, depth))
+ return False;
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
- DEBUG(4,("spoolss_io_r_getprinterdriverdir, buffer too small\n"));
+ if(!prs_align(ps))
+ return False;
+
+ if(!prs_uint32("", ps, depth, &q_u->environment_ptr))
+ return False;
+ if(!smb_io_unistr2("", &q_u->environment, q_u->environment_ptr, ps, depth))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("spoolss_io_r_getprinterdriverdir, buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
+ if(!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
- switch (r_u->level)
- {
- case 1:
- {
- DRIVER_DIRECTORY_1 *info;
- info = &(r_u->ctr.driver.info_1);
- prs_unistr("name", ps, depth, &(info->name));
- /*smb_io_printer_driver_dir_1(desc, info, ps, depth, &start_offset, &end_offset);*/
- break;
- }
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
-
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("status", ps, depth, &(r_u->status));
+ if(!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
+
+ if(!prs_align(ps))
+ return False;
+
+ if(!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
/*******************************************************************
+ Parse a SPOOL_R_GETPRINTERDRIVERDIR structure.
********************************************************************/
-BOOL spoolss_io_q_getprinterdriverdir(char *desc, SPOOL_Q_GETPRINTERDRIVERDIR *q_u, prs_struct *ps, int depth)
-{
-
- uint32 useless_ptr=0xADDE0FF0;
- prs_debug(ps, depth, desc, "");
+BOOL spoolss_io_r_getprinterdriverdir(char *desc, SPOOL_R_GETPRINTERDRIVERDIR *r_u, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "spoolss_io_r_getprinterdriverdir");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- smb_io_unistr2("", &(q_u->name),True,ps,depth);
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- smb_io_unistr2("", &(q_u->environment),True,ps,depth);
- prs_align(ps);
- prs_uint32("level", ps, depth, &(q_u->level));
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
- prs_align(ps);
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if (!prs_align(ps))
+ return False;
+
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- return True;
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
+
+ return True;
}
/*******************************************************************
********************************************************************/
BOOL spoolss_io_r_enumprintprocessors(char *desc, SPOOL_R_ENUMPRINTPROCESSORS *r_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- int i;
-
prs_debug(ps, depth, desc, "spoolss_io_r_enumprintprocessors");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- switch (r_u->level)
- {
- case 1:
- {
- PRINTPROCESSOR_1 *info_1;
- info_1=r_u->info_1;
-
- for (i=0; i<r_u->numofprintprocessors; i++)
- {
- bufsize_required += spoolss_size_processor_info_1(&(info_1[i]));
- }
- break;
- }
- }
-
- DEBUG(4,("size needed: %d\n",bufsize_required));
- DEBUG(4,("size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
- if (r_u->offered<bufsize_required)
- {
-
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
+ if (!prs_align(ps))
+ return False;
- DEBUG(4,("buffer too small\n"));
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
+ if (!prs_align(ps))
+ return False;
- switch (r_u->level)
- {
- case 1:
- {
- PRINTPROCESSOR_1 *info_1;
- for (i=0; i<r_u->numofprintprocessors; i++)
- {
- info_1 = &(r_u->info_1[i]);
- smb_io_processor_info_1(desc, info_1, ps, depth, &start_offset, &end_offset);
- }
- break;
- }
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
-
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("numofprintprocessors", ps, depth, &(r_u->numofprintprocessors));
- prs_uint32("status", ps, depth, &(r_u->status));
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+
+ if (!prs_uint32("returned", ps, depth, &r_u->returned))
+ return False;
+
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- return True;
+ return True;
}
/*******************************************************************
********************************************************************/
BOOL spoolss_io_q_enumprintprocessors(char *desc, SPOOL_Q_ENUMPRINTPROCESSORS *q_u, prs_struct *ps, int depth)
{
- uint32 useless;
prs_debug(ps, depth, desc, "spoolss_io_q_enumprintprocessors");
depth++;
- prs_align(ps);
- prs_uint32("useless", ps, depth, &useless);
- smb_io_unistr2("", &(q_u->name),True,ps,depth);
- prs_align(ps);
- prs_uint32("useless", ps, depth, &useless);
- smb_io_unistr2("", &(q_u->environment),True,ps,depth);
- prs_align(ps);
- prs_uint32("level", ps, depth, &(q_u->level));
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
- prs_align(ps);
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("name_ptr", ps, depth, &q_u->name_ptr))
+ return False;
+ if (!smb_io_unistr2("name", &q_u->name, True, ps, depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("", ps, depth, &q_u->environment_ptr))
+ return False;
+ if (!smb_io_unistr2("", &q_u->environment, q_u->environment_ptr, ps, depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
+
+ if(!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
/*******************************************************************
********************************************************************/
-BOOL spoolss_io_r_enumprintmonitors(char *desc, SPOOL_R_ENUMPRINTMONITORS *r_u, prs_struct *ps, int depth)
+BOOL spoolss_io_r_enumprintprocdatatypes(char *desc, SPOOL_R_ENUMPRINTPROCDATATYPES *r_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
- int i;
-
- prs_debug(ps, depth, desc, "spoolss_io_r_enumprintmonitors");
+ prs_debug(ps, depth, desc, "spoolss_io_r_enumprintprocdatatypes");
depth++;
- prs_align(ps);
- prs_uint32("pointer", ps, depth, &useless_ptr);
- switch (r_u->level)
- {
- case 1:
- {
- PRINTMONITOR_1 *info_1;
- info_1=r_u->info_1;
-
- for (i=0; i<r_u->numofprintmonitors; i++)
- {
- bufsize_required += spoolss_size_monitor_info_1(&(info_1[i]));
- }
- break;
- }
- }
-
- DEBUG(4,("size needed: %d\n",bufsize_required));
- DEBUG(4,("size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
- if (r_u->offered<bufsize_required)
- {
+ if (!prs_align(ps))
+ return False;
+
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+
+ if (!prs_uint32("returned", ps, depth, &r_u->returned))
+ return False;
- DEBUG(4,("buffer too small\n"));
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
+ return True;
+}
+
+/*******************************************************************
+********************************************************************/
+BOOL spoolss_io_q_enumprintprocdatatypes(char *desc, SPOOL_Q_ENUMPRINTPROCDATATYPES *q_u, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "spoolss_io_q_enumprintprocdatatypes");
+ depth++;
+
+ if (!prs_align(ps))
+ return False;
- switch (r_u->level)
- {
- case 1:
- {
- PRINTMONITOR_1 *info_1;
- for (i=0; i<r_u->numofprintmonitors; i++)
- {
- info_1 = &(r_u->info_1[i]);
- smb_io_monitor_info_1(desc, info_1, ps, depth, &start_offset, &end_offset);
- }
- break;
- }
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
+ if (!prs_uint32("name_ptr", ps, depth, &q_u->name_ptr))
+ return False;
+ if (!smb_io_unistr2("name", &q_u->name, True, ps, depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("processor_ptr", ps, depth, &q_u->processor_ptr))
+ return False;
+ if (!smb_io_unistr2("processor", &q_u->processor, q_u->processor_ptr, ps, depth))
+ return False;
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("numofprintmonitors", ps, depth, &(r_u->numofprintmonitors));
- prs_uint32("status", ps, depth, &(r_u->status));
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
+
+ if(!new_spoolss_io_buffer("buffer", ps, depth, q_u->buffer))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
/*******************************************************************
+ Parse a SPOOL_Q_ENUMPRINTMONITORS structure.
********************************************************************/
BOOL spoolss_io_q_enumprintmonitors(char *desc, SPOOL_Q_ENUMPRINTMONITORS *q_u, prs_struct *ps, int depth)
{
- uint32 useless;
prs_debug(ps, depth, desc, "spoolss_io_q_enumprintmonitors");
depth++;
- prs_align(ps);
- prs_uint32("useless", ps, depth, &useless);
- smb_io_unistr2("", &(q_u->name),True,ps,depth);
- prs_align(ps);
- prs_uint32("level", ps, depth, &(q_u->level));
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
- prs_align(ps);
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("name_ptr", ps, depth, &q_u->name_ptr))
+ return False;
+ if (!smb_io_unistr2("name", &q_u->name, True, ps, depth))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
+
+ if(!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
/*******************************************************************
********************************************************************/
+BOOL spoolss_io_r_enumprintmonitors(char *desc, SPOOL_R_ENUMPRINTMONITORS *r_u, prs_struct *ps, int depth)
+{
+ prs_debug(ps, depth, desc, "spoolss_io_r_enumprintmonitors");
+ depth++;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
+
+ if (!prs_align(ps))
+ return False;
+
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
+
+ if (!prs_uint32("returned", ps, depth, &r_u->returned))
+ return False;
+
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
+
+ return True;
+}
+
+/*******************************************************************
+********************************************************************/
BOOL spoolss_io_r_enumprinterdata(char *desc, SPOOL_R_ENUMPRINTERDATA *r_u, prs_struct *ps, int depth)
{
prs_debug(ps, depth, desc, "spoolss_io_r_enumprinterdata");
depth++;
- prs_align(ps);
- prs_uint32("valuesize", ps, depth, &(r_u->valuesize));
- prs_unistr("value", ps, depth, &(r_u->value));
- prs_uint32("realvaluesize", ps, depth, &(r_u->realvaluesize));
+ if(!prs_align(ps))
+ return False;
+ if(!prs_uint32("valuesize", ps, depth, &r_u->valuesize))
+ return False;
+ if(!prs_uint16s(False, "value", ps, depth, r_u->value, r_u->valuesize))
+ return False;
+ if(!prs_uint32("realvaluesize", ps, depth, &r_u->realvaluesize))
+ return False;
- prs_uint32("type", ps, depth, &(r_u->type));
+ if(!prs_uint32("type", ps, depth, &r_u->type))
+ return False;
- prs_uint32("datasize", ps, depth, &(r_u->datasize));
- prs_uint8s(False, "data", ps, depth, r_u->data, r_u->datasize);
- prs_uint32("realdatasize", ps, depth, &(r_u->realdatasize));
- prs_uint32("status", ps, depth, &(r_u->status));
+ if(!prs_uint32("datasize", ps, depth, &r_u->datasize))
+ return False;
+ if(!prs_uint8s(False, "data", ps, depth, r_u->data, r_u->datasize))
+ return False;
+ if(!prs_uint32("realdatasize", ps, depth, &r_u->realdatasize))
+ return False;
+ if(!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
return True;
}
@@ -4103,11 +3774,28 @@ BOOL spoolss_io_q_enumprinterdata(char *desc, SPOOL_Q_ENUMPRINTERDATA *q_u, prs_
prs_debug(ps, depth, desc, "spoolss_io_q_enumprinterdata");
depth++;
- prs_align(ps);
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_uint32("index", ps, depth, &(q_u->index));
- prs_uint32("valuesize", ps, depth, &(q_u->valuesize));
- prs_uint32("datasize", ps, depth, &(q_u->datasize));
+ if(!prs_align(ps))
+ return False;
+ if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
+ return False;
+ if(!prs_uint32("index", ps, depth, &q_u->index))
+ return False;
+ if(!prs_uint32("valuesize", ps, depth, &q_u->valuesize))
+ return False;
+ if(!prs_uint32("datasize", ps, depth, &q_u->datasize))
+ return False;
+
+ return True;
+}
+
+/*******************************************************************
+********************************************************************/
+BOOL make_spoolss_q_enumprinterdata(SPOOL_Q_ENUMPRINTERDATA *q_u, POLICY_HND *hnd, uint32 index, uint32 valuelen, uint32 datalen)
+{
+ memcpy(&(q_u->handle), hnd, sizeof(q_u->handle));
+ q_u->index=index;
+ q_u->valuesize=valuelen;
+ q_u->datasize=datalen;
return True;
}
@@ -4193,23 +3881,23 @@ BOOL convert_specific_param(NT_PRINTER_PARAM **param, const UNISTR2 *value,
********************************************************************/
static BOOL spoolss_io_addform(char *desc, FORM *f, uint32 ptr, prs_struct *ps, int depth)
{
- prs_debug(ps, depth, desc, "spoolss_io_addform");
- depth++;
- prs_align(ps);
-
- if (ptr!=0)
- {
- prs_uint32("flags", ps, depth, &(f->flags));
- prs_uint32("name_ptr", ps, depth, &(f->name_ptr));
- prs_uint32("size_x", ps, depth, &(f->size_x));
- prs_uint32("size_y", ps, depth, &(f->size_y));
- prs_uint32("left", ps, depth, &(f->left));
- prs_uint32("top", ps, depth, &(f->top));
- prs_uint32("right", ps, depth, &(f->right));
- prs_uint32("bottom", ps, depth, &(f->bottom));
+ prs_debug(ps, depth, desc, "spoolss_io_addform");
+ depth++;
+ prs_align(ps);
- smb_io_unistr2("", &(f->name), f->name_ptr, ps, depth);
- }
+ if (ptr!=0)
+ {
+ prs_uint32("flags", ps, depth, &(f->flags));
+ prs_uint32("name_ptr", ps, depth, &(f->name_ptr));
+ prs_uint32("size_x", ps, depth, &(f->size_x));
+ prs_uint32("size_y", ps, depth, &(f->size_y));
+ prs_uint32("left", ps, depth, &(f->left));
+ prs_uint32("top", ps, depth, &(f->top));
+ prs_uint32("right", ps, depth, &(f->right));
+ prs_uint32("bottom", ps, depth, &(f->bottom));
+
+ smb_io_unistr2("", &(f->name), f->name_ptr, ps, depth);
+ }
return True;
}
@@ -4218,20 +3906,20 @@ static BOOL spoolss_io_addform(char *desc, FORM *f, uint32 ptr, prs_struct *ps,
********************************************************************/
BOOL spoolss_io_q_addform(char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0;
- prs_debug(ps, depth, desc, "spoolss_io_q_addform");
- depth++;
+ uint32 useless_ptr=0;
+ prs_debug(ps, depth, desc, "spoolss_io_q_addform");
+ depth++;
- prs_align(ps);
- smb_io_pol_hnd("printer handle", &(q_u->handle), ps, depth);
- prs_uint32("level", ps, depth, &(q_u->level));
- prs_uint32("level2", ps, depth, &(q_u->level2));
+ prs_align(ps);
+ smb_io_pol_hnd("printer handle", &(q_u->handle), ps, depth);
+ prs_uint32("level", ps, depth, &(q_u->level));
+ prs_uint32("level2", ps, depth, &(q_u->level2));
- if (q_u->level==1)
- {
- prs_uint32("useless_ptr", ps, depth, &(useless_ptr));
- spoolss_io_addform("", &(q_u->form), useless_ptr, ps, depth);
- }
+ if (q_u->level==1)
+ {
+ prs_uint32("useless_ptr", ps, depth, &(useless_ptr));
+ spoolss_io_addform("", &(q_u->form), useless_ptr, ps, depth);
+ }
return True;
}
@@ -4240,11 +3928,11 @@ BOOL spoolss_io_q_addform(char *desc, SPOOL_Q_ADDFORM *q_u, prs_struct *ps, int
********************************************************************/
BOOL spoolss_io_r_addform(char *desc, SPOOL_R_ADDFORM *r_u, prs_struct *ps, int depth)
{
- prs_debug(ps, depth, desc, "spoolss_io_r_addform");
- depth++;
+ prs_debug(ps, depth, desc, "spoolss_io_r_addform");
+ depth++;
- prs_align(ps);
- prs_uint32("status", ps, depth, &(r_u->status));
+ prs_align(ps);
+ prs_uint32("status", ps, depth, &(r_u->status));
return True;
}
@@ -4289,134 +3977,57 @@ BOOL spoolss_io_r_setform(char *desc, SPOOL_R_SETFORM *r_u, prs_struct *ps, int
}
/*******************************************************************
+ Parse a SPOOL_R_GETJOB structure.
********************************************************************/
BOOL spoolss_io_r_getjob(char *desc, SPOOL_R_GETJOB *r_u, prs_struct *ps, int depth)
{
- uint32 useless_ptr=0xADDE0FF0;
- uint32 start_offset, end_offset, beginning;
- uint32 bufsize_required=0;
-
prs_debug(ps, depth, desc, "spoolss_io_r_getjob");
depth++;
- prs_align(ps);
-
- prs_uint32("pointer", ps, depth, &useless_ptr);
-
- switch (r_u->level)
- {
- case 1:
- {
- JOB_INFO_1 *info;
- info=r_u->ctr.job.job_info_1;
-
- bufsize_required += spoolss_size_job_info_1(info);
- break;
- }
- case 2:
- {
- JOB_INFO_2 *info;
- info=r_u->ctr.job.job_info_2;
-
- bufsize_required += spoolss_size_job_info_2(info);
- break;
- }
- }
-
- DEBUG(4,("spoolss_io_r_getjob, size needed: %d\n",bufsize_required));
- DEBUG(4,("spoolss_io_r_getjob, size offered: %d\n",r_u->offered));
-
- /* check if the buffer is big enough for the datas */
- if (r_u->offered<bufsize_required)
- {
- /* it's too small */
- r_u->status=ERROR_INSUFFICIENT_BUFFER; /* say so */
- r_u->offered=0; /* don't send back the buffer */
+ if (!prs_align(ps))
+ return False;
- DEBUG(4,("spoolss_io_r_getjob, buffer too small\n"));
+ if (!new_spoolss_io_buffer("", ps, depth, r_u->buffer))
+ return False;
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- }
- else
- {
- DEBUG(4,("spoolss_io_r_enumjobs, buffer large enough\n"));
-
- prs_uint32("size of buffer", ps, depth, &(r_u->offered));
- beginning=ps->offset;
- start_offset=ps->offset;
- end_offset=start_offset+r_u->offered;
+ if (!prs_align(ps))
+ return False;
- switch (r_u->level)
- {
- case 1:
- {
- JOB_INFO_1 *info;
- info = r_u->ctr.job.job_info_1;
- smb_io_job_info_1(desc, info, ps, depth, &start_offset, &end_offset);
- break;
- }
- case 2:
- {
- JOB_INFO_2 *info;
- info = r_u->ctr.job.job_info_2;
- smb_io_job_info_2(desc, info, ps, depth, &start_offset, &end_offset);
- break;
- }
+ if (!prs_uint32("needed", ps, depth, &r_u->needed))
+ return False;
- }
- ps->offset=beginning+r_u->offered;
- prs_align(ps);
- }
-
- /*
- * if the buffer was too small, send the minimum required size
- * if it was too large, send the real needed size
- */
-
- prs_uint32("size of buffer needed", ps, depth, &(bufsize_required));
- prs_uint32("status", ps, depth, &(r_u->status));
-
- return True;
-}
+ if (!prs_uint32("status", ps, depth, &r_u->status))
+ return False;
-/****************************************************************************
-****************************************************************************/
-void free_spoolss_r_getjob(SPOOL_R_GETJOB *r_u)
-{
- switch (r_u->level)
- {
- case 1:
- {
- free(r_u->ctr.job.job_info_1);
- break;
- }
- case 2:
- {
- free_job_info_2(r_u->ctr.job.job_info_2);
- break;
- }
- }
+ return True;
}
/*******************************************************************
+ Parse a SPOOL_Q_GETJOB structure.
********************************************************************/
BOOL spoolss_io_q_getjob(char *desc, SPOOL_Q_GETJOB *q_u, prs_struct *ps, int depth)
{
-
prs_debug(ps, depth, desc, "");
depth++;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth);
- prs_uint32("jobid", ps, depth, &(q_u->jobid));
- prs_uint32("level", ps, depth, &(q_u->level));
+ if(!smb_io_pol_hnd("printer handle",&(q_u->handle),ps,depth))
+ return False;
+ if(!prs_uint32("jobid", ps, depth, &q_u->jobid))
+ return False;
+ if(!prs_uint32("level", ps, depth, &q_u->level))
+ return False;
- spoolss_io_read_buffer("", ps, depth, &(q_u->buffer));
+ if(!new_spoolss_io_buffer("", ps, depth, q_u->buffer))
+ return False;
- prs_align(ps);
+ if(!prs_align(ps))
+ return False;
- prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
+ if(!prs_uint32("offered", ps, depth, &q_u->offered))
+ return False;
return True;
}
diff --git a/source/rpc_server/srv_spoolss.c b/source/rpc_server/srv_spoolss.c
index 5f3f56988a7..04bce72ac68 100755
--- a/source/rpc_server/srv_spoolss.c
+++ b/source/rpc_server/srv_spoolss.c
@@ -21,18 +21,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "includes.h"
-#include "rpc_parse.h"
#include "nterr.h"
extern int DEBUGLEVEL;
-
/********************************************************************
- * api_spoolss_open_printer
- *
- * called from the spoolss dispatcher
+ * api_spoolss_open_printer_ex
********************************************************************/
static BOOL api_spoolss_open_printer_ex(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
@@ -40,67 +35,61 @@ static BOOL api_spoolss_open_printer_ex(rpcsrv_struct *p, prs_struct *data, prs_
SPOOL_R_OPEN_PRINTER_EX r_u;
UNISTR2 *printername = NULL;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_open_printer_ex("", &q_u, data, 0))
- {
+ if (!spoolss_io_q_open_printer_ex("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_open_printer_ex: unable to unmarshall SPOOL_Q_OPEN_PRINTER_EX.\n"));
return False;
}
- if (q_u.ptr != 0)
- {
+ if (q_u.printername_ptr != 0)
printername = &q_u.printername;
- }
+
r_u.status = _spoolss_open_printer_ex( printername,
- q_u.unknown0, q_u.cbbuf,
- q_u.devmod, q_u.access_required,
- q_u.unknown1, q_u.unknown2,
- q_u.unknown3, q_u.unknown4,
- q_u.unknown5, q_u.unknown6,
- q_u.unknown7, q_u.unknown8,
- q_u.unknown9, q_u.unknown10,
- &q_u.station, &q_u.username,
+ &q_u.printer_default,
+ q_u.user_switch, q_u.user_ctr,
&r_u.handle);
- ret = spoolss_io_r_open_printer_ex("",&r_u,rdata,0);
- return ret;
-}
+ if (!spoolss_io_r_open_printer_ex("",&r_u,rdata,0)){
+ DEBUG(0,("spoolss_io_r_open_printer_ex: unable to marshall SPOOL_R_OPEN_PRINTER_EX.\n"));
+ return False;
+ }
+
+ return True;
+}
/********************************************************************
* api_spoolss_getprinterdata
*
* called from the spoolss dispatcher
********************************************************************/
-static BOOL api_spoolss_getprinterdata(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_getprinterdata(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_GETPRINTERDATA q_u;
SPOOL_R_GETPRINTERDATA r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
/* read the stream and fill the struct */
- if (!spoolss_io_q_getprinterdata("", &q_u, data, 0))
- {
+ if (!spoolss_io_q_getprinterdata("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_getprinterdata: unable to unmarshall SPOOL_Q_GETPRINTERDATA.\n"));
return False;
}
-
-
- r_u.size = q_u.size;
+
r_u.status = _spoolss_getprinterdata( &q_u.handle, &q_u.valuename,
- &r_u.type, &r_u.size,
- &r_u.data, &r_u.numeric_data,
- &r_u.needed);
+ q_u.size, &r_u.type, &r_u.size,
+ &r_u.data, &r_u.needed);
+
+ if (!spoolss_io_r_getprinterdata("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_getprinterdata: unable to marshall SPOOL_R_GETPRINTERDATA.\n"));
+ return False;
+ }
- ret = spoolss_io_r_getprinterdata("", &r_u, rdata, 0);
safe_free(r_u.data);
- return ret;
+
+ return True;
}
/********************************************************************
@@ -108,54 +97,57 @@ static BOOL api_spoolss_getprinterdata(rpcsrv_struct *p, prs_struct *data,
*
* called from the spoolss dispatcher
********************************************************************/
-static BOOL api_spoolss_closeprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_closeprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_CLOSEPRINTER q_u;
SPOOL_R_CLOSEPRINTER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_closeprinter("", &q_u, data, 0))
- {
+ if (!spoolss_io_q_closeprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_closeprinter: unable to unmarshall SPOOL_Q_CLOSEPRINTER.\n"));
return False;
}
r_u.status = _spoolss_closeprinter(&q_u.handle);
memcpy(&r_u.handle, &q_u.handle, sizeof(r_u.handle));
- ret = spoolss_io_r_closeprinter("",&r_u,rdata,0);
- return ret;
+
+ if (!spoolss_io_r_closeprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_closeprinter: unable to marshall SPOOL_R_CLOSEPRINTER.\n"));
+ return False;
+ }
+
+ return True;
}
/********************************************************************
* api_spoolss_rffpcnex
* ReplyFindFirstPrinterChangeNotifyEx
********************************************************************/
-static BOOL api_spoolss_rffpcnex(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_rffpcnex(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_RFFPCNEX q_u;
SPOOL_R_RFFPCNEX r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_rffpcnex("", &q_u, data, 0))
- {
+ if (!spoolss_io_q_rffpcnex("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_rffpcnex: unable to unmarshall SPOOL_Q_RFFPCNEX.\n"));
return False;
}
-
r_u.status = _spoolss_rffpcnex(&q_u.handle, q_u.flags,
q_u.options, &q_u.localmachine,
- q_u.printerlocal, &q_u.option);
- ret = spoolss_io_r_rffpcnex("",&r_u,rdata,0);
- return ret;
+ q_u.printerlocal, q_u.option);
+
+ if (!spoolss_io_r_rffpcnex("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_rffpcnex: unable to marshall SPOOL_R_RFFPCNEX.\n"));
+ return False;
+ }
+
+ return True;
}
@@ -165,27 +157,33 @@ static BOOL api_spoolss_rffpcnex(rpcsrv_struct *p, prs_struct *data,
* called from the spoolss dispatcher
*
********************************************************************/
-static BOOL api_spoolss_rfnpcnex(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_rfnpcnex(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_RFNPCNEX q_u;
SPOOL_R_RFNPCNEX r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_rfnpcnex("", &q_u, data, 0))
- {
+ if (!spoolss_io_q_rfnpcnex("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_rfnpcnex: unable to unmarshall SPOOL_Q_RFNPCNEX.\n"));
return False;
}
-
r_u.status = _spoolss_rfnpcnex(&q_u.handle, q_u.change,
- &q_u.option, &r_u.count, &r_u.info);
- ret = spoolss_io_r_rfnpcnex("", &r_u, rdata, 0);
- return ret;
+ q_u.option, &r_u.info);
+
+ /* we always have a NOTIFY_INFO struct */
+ r_u.info_ptr=0x1;
+
+ if (!spoolss_io_r_rfnpcnex("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_rfnpcnex: unable to marshall SPOOL_R_RFNPCNEX.\n"));
+ return False;
+ }
+
+ safe_free(r_u.info.data);
+
+ return True;
}
@@ -194,80 +192,74 @@ static BOOL api_spoolss_rfnpcnex(rpcsrv_struct *p, prs_struct *data,
* called from the spoolss dispatcher
*
********************************************************************/
-static BOOL api_spoolss_enumprinters(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumprinters(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMPRINTERS q_u;
SPOOL_R_ENUMPRINTERS r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_enumprinters("", &q_u, data, 0))
- {
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if (!spoolss_io_q_enumprinters("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumprinters: unable to unmarshall SPOOL_Q_ENUMPRINTERS.\n"));
return False;
}
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
- /* lkclXXX DAMN DAMN DAMN! MICROSOFT @#$%S IT UP, AGAIN, AND WE
- HAVE TO DEAL WITH IT! AGH!
- */
- r_u.level = q_u.level;
- r_u.status = _spoolss_enumprinters(
- q_u.flags,
- &q_u.servername,
- q_u.level,
- &q_u.buffer,
- q_u.buf_size,
- &r_u.offered,
- &r_u.needed,
- &r_u.ctr,
- &r_u.returned);
-
- memcpy(r_u.servername.buffer,q_u.servername.buffer,
- 2*q_u.servername.uni_str_len);
- r_u.servername.buffer[q_u.servername.uni_str_len] = 0;
+ r_u.status = _spoolss_enumprinters( q_u.flags, &q_u.servername, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.returned);
- spoolss_io_free_buffer(&(q_u.buffer));
- ret = spoolss_io_r_enumprinters("",&r_u,rdata,0);
- return ret;
-}
+ if (!new_spoolss_io_r_enumprinters("", &r_u, rdata, 0)) {
+ DEBUG(0,("new_spoolss_io_r_enumprinters: unable to marshall SPOOL_R_ENUMPRINTERS.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+ return True;
+}
/********************************************************************
* api_spoolss_getprinter
* called from the spoolss dispatcher
*
********************************************************************/
-static BOOL api_spoolss_getprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_getprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_GETPRINTER q_u;
SPOOL_R_GETPRINTER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_getprinter("", &q_u, data, 0))
- {
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_getprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_getprinter: unable to unmarshall SPOOL_Q_GETPRINTER.\n"));
return False;
}
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
r_u.status = _spoolss_getprinter(&q_u.handle, q_u.level,
- &r_u.ctr, &q_u.offered, &r_u.needed);
+ r_u.buffer, q_u.offered,
+ &r_u.needed);
- memcpy(&r_u.handle, &q_u.handle, sizeof(&r_u.handle));
- r_u.offered = q_u.offered;
- r_u.level = q_u.level;
- safe_free(q_u.buffer);
+ if(!spoolss_io_r_getprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_getprinter: unable to marshall SPOOL_R_GETPRINTER.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
- ret = spoolss_io_r_getprinter("",&r_u,rdata,0);
- return ret;
+ new_spoolss_free_buffer(q_u.buffer);
+ return True;
}
@@ -276,34 +268,36 @@ static BOOL api_spoolss_getprinter(rpcsrv_struct *p, prs_struct *data,
* called from the spoolss dispatcher
*
********************************************************************/
-static BOOL api_spoolss_getprinterdriver2(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_getprinterdriver2(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_GETPRINTERDRIVER2 q_u;
SPOOL_R_GETPRINTERDRIVER2 r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_getprinterdriver2("", &q_u, data, 0))
- {
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_getprinterdriver2("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_getprinterdriver2: unable to unmarshall SPOOL_Q_GETPRINTERDRIVER2.\n"));
return False;
}
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _spoolss_getprinterdriver2(&q_u.handle, &q_u.architecture, q_u.level, q_u.unknown,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.unknown0, &r_u.unknown1);
- r_u.status = _spoolss_getprinterdriver2(&q_u.handle,
- &q_u.architecture, q_u.level,
- &r_u.ctr, &q_u.buf_size,
- &r_u.needed);
+ if(!spoolss_io_r_getprinterdriver2("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_getprinterdriver2: unable to marshall SPOOL_R_GETPRINTERDRIVER2.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- spoolss_io_free_buffer(&(q_u.buffer));
-
- ret = spoolss_io_r_getprinterdriver2("",&r_u,rdata,0);
- return ret;
+ new_spoolss_free_buffer(q_u.buffer);
+ return True;
}
/********************************************************************
@@ -311,25 +305,27 @@ static BOOL api_spoolss_getprinterdriver2(rpcsrv_struct *p, prs_struct *data,
* called from the spoolss dispatcher
*
********************************************************************/
-static BOOL api_spoolss_startpageprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_startpageprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_STARTPAGEPRINTER q_u;
SPOOL_R_STARTPAGEPRINTER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_startpageprinter("", &q_u, data, 0))
- {
+
+ if(!spoolss_io_q_startpageprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_startpageprinter: unable to unmarshall SPOOL_Q_STARTPAGEPRINTER.\n"));
return False;
}
r_u.status = _spoolss_startpageprinter(&q_u.handle);
- ret = spoolss_io_r_startpageprinter("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_startpageprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_startpageprinter: unable to marshall SPOOL_R_STARTPAGEPRINTER.\n"));
+ return False;
+ }
+
+ return True;
}
@@ -338,45 +334,41 @@ static BOOL api_spoolss_startpageprinter(rpcsrv_struct *p, prs_struct *data,
* called from the spoolss dispatcher
*
********************************************************************/
-static BOOL api_spoolss_endpageprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_endpageprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENDPAGEPRINTER q_u;
SPOOL_R_ENDPAGEPRINTER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_endpageprinter("", &q_u, data, 0))
- {
+
+ if(!spoolss_io_q_endpageprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_endpageprinter: unable to unmarshall SPOOL_Q_ENDPAGEPRINTER.\n"));
return False;
}
r_u.status = _spoolss_endpageprinter(&q_u.handle);
- ret = spoolss_io_r_endpageprinter("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_endpageprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_endpageprinter: unable to marshall SPOOL_R_ENDPAGEPRINTER.\n"));
+ return False;
+ }
+
+ return True;
}
/********************************************************************
- * api_spoolss_getprinter
- * called from the spoolss dispatcher
- *
- ********************************************************************/
-static BOOL api_spoolss_startdocprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+********************************************************************/
+static BOOL api_spoolss_startdocprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_STARTDOCPRINTER q_u;
SPOOL_R_STARTDOCPRINTER r_u;
-
- BOOL ret;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_startdocprinter("", &q_u, data, 0))
- {
+
+ if(!spoolss_io_q_startdocprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_startdocprinter: unable to unmarshall SPOOL_Q_STARTDOCPRINTER.\n"));
return False;
}
@@ -384,55 +376,54 @@ static BOOL api_spoolss_startdocprinter(rpcsrv_struct *p, prs_struct *data,
q_u.doc_info_container.level,
&q_u.doc_info_container.docinfo,
&r_u.jobid);
- ret = spoolss_io_r_startdocprinter("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_startdocprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_startdocprinter: unable to marshall SPOOL_R_STARTDOCPRINTER.\n"));
+ return False;
+ }
+
+ return True;
}
+
/********************************************************************
- * api_spoolss_getprinter
- * called from the spoolss dispatcher
- *
- ********************************************************************/
-static BOOL api_spoolss_enddocprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+********************************************************************/
+static BOOL api_spoolss_enddocprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENDDOCPRINTER q_u;
SPOOL_R_ENDDOCPRINTER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_enddocprinter("", &q_u, data, 0))
- {
+
+ if(!spoolss_io_q_enddocprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enddocprinter: unable to unmarshall SPOOL_Q_ENDDOCPRINTER.\n"));
return False;
}
r_u.status = _spoolss_enddocprinter(&q_u.handle);
- ret = spoolss_io_r_enddocprinter("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_enddocprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_enddocprinter: unable to marshall SPOOL_R_ENDDOCPRINTER.\n"));
+ return False;
+ }
+
+ return True;
}
/********************************************************************
- * api_spoolss_getprinter
- * called from the spoolss dispatcher
- *
- ********************************************************************/
-static BOOL api_spoolss_writeprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+********************************************************************/
+static BOOL api_spoolss_writeprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_WRITEPRINTER q_u;
SPOOL_R_WRITEPRINTER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_writeprinter("", &q_u, data, 0))
- {
+
+ if(!spoolss_io_q_writeprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_writeprinter: unable to unmarshall SPOOL_Q_WRITEPRINTER.\n"));
return False;
}
@@ -442,264 +433,302 @@ static BOOL api_spoolss_writeprinter(rpcsrv_struct *p, prs_struct *data,
&q_u.buffer_size2);
r_u.buffer_written = q_u.buffer_size2;
safe_free(q_u.buffer);
- ret = spoolss_io_r_writeprinter("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_writeprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_writeprinter: unable to marshall SPOOL_R_WRITEPRINTER.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
+
****************************************************************************/
-static BOOL api_spoolss_setprinter(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_setprinter(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_SETPRINTER q_u;
SPOOL_R_SETPRINTER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_setprinter("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_setprinter("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_setprinter: unable to unmarshall SPOOL_Q_SETPRINTER.\n"));
+ return False;
+ }
+
+ r_u.status = _spoolss_setprinter(&q_u.handle, q_u.level, &q_u.info,
+ q_u.devmode_ctr, q_u.command);
+
+ /* now, we can free the memory */
+ if (q_u.info.level==2 && q_u.info.info_ptr!=0)
+ safe_free(q_u.info.info_2);
+
+ if (q_u.devmode_ctr.devmode_ptr!=0)
+ safe_free(q_u.devmode_ctr.devmode);
+
+ if(!spoolss_io_r_setprinter("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_setprinter: unable to marshall SPOOL_R_SETPRINTER.\n"));
return False;
}
- DEBUG(0,("api_spoolss_setprinter: typecast sec_des to uint8*!\n"));
- r_u.status = _spoolss_setprinter(&q_u.handle,
- q_u.level, &q_u.info,
- q_u.devmode,
- q_u.security.size_of_buffer,
- (const uint8*)q_u.security.data,
- q_u.command);
- ret = spoolss_io_r_setprinter("",&r_u,rdata,0);
- return ret;
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_fcpn(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_fcpn(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_FCPN q_u;
SPOOL_R_FCPN r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_fcpn("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_fcpn("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_fcpn: unable to unmarshall SPOOL_Q_FCPN.\n"));
return False;
}
r_u.status = _spoolss_fcpn(&q_u.handle);
- ret = spoolss_io_r_fcpn("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_fcpn("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_fcpn: unable to marshall SPOOL_R_FCPN.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_addjob(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_addjob(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ADDJOB q_u;
SPOOL_R_ADDJOB r_u;
-
- BOOL ret;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_addjob("", &q_u, data, 0))
- {
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_addjob("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_addjob: unable to unmarshall SPOOL_Q_ADDJOB.\n"));
return False;
}
+ /* that's only an [in] buffer ! */
r_u.status = _spoolss_addjob(&q_u.handle, q_u.level,
- &q_u.buffer, q_u.buf_size);
-
- spoolss_io_free_buffer(&(q_u.buffer));
- ret = spoolss_io_r_addjob("",&r_u,rdata,0);
- return ret;
+ q_u.buffer, q_u.offered);
+
+ if(!spoolss_io_r_addjob("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_addjob: unable to marshall SPOOL_R_ADDJOB.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_enumjobs(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumjobs(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMJOBS q_u;
SPOOL_R_ENUMJOBS r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_enumjobs("", &q_u, data, 0))
- {
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if (!spoolss_io_q_enumjobs("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumjobs: unable to unmarshall SPOOL_Q_ENUMJOBS.\n"));
+ return False;
+ }
+
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _spoolss_enumjobs(&q_u.handle, q_u.firstjob, q_u.numofjobs, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.returned);
+
+ if (!spoolss_io_r_enumjobs("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_enumjobs: unable to marshall SPOOL_R_ENUMJOBS.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
return False;
}
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_enumjobs(&q_u.handle,
- q_u.firstjob, q_u.numofjobs, q_u.level,
- &r_u.ctr, &r_u.offered, &r_u.numofjobs);
- ret = spoolss_io_free_buffer(&(q_u.buffer));
- spoolss_io_r_enumjobs("",&r_u,rdata,0);
- return ret;
+ new_spoolss_free_buffer(q_u.buffer);
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_schedulejob(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_schedulejob(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_SCHEDULEJOB q_u;
SPOOL_R_SCHEDULEJOB r_u;
-
- BOOL ret;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_schedulejob("", &q_u, data, 0))
- {
+
+ if(!spoolss_io_q_schedulejob("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_schedulejob: unable to unmarshall SPOOL_Q_SCHEDULEJOB.\n"));
return False;
}
r_u.status = _spoolss_schedulejob(&q_u.handle, q_u.jobid);
- ret = spoolss_io_r_schedulejob("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_schedulejob("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_schedulejob: unable to marshall SPOOL_R_SCHEDULEJOB.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_setjob(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_setjob(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_SETJOB q_u;
SPOOL_R_SETJOB r_u;
-
- BOOL ret;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_setjob("", &q_u, data, 0))
- {
+
+ if(!spoolss_io_q_setjob("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_setjob: unable to unmarshall SPOOL_Q_SETJOB.\n"));
return False;
}
r_u.status = _spoolss_setjob(&q_u.handle, q_u.jobid,
q_u.level, &q_u.ctr, q_u.command);
- ret = spoolss_io_r_setjob("",&r_u,rdata,0);
- return ret;
+
+ if(!spoolss_io_r_setjob("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_setjob: unable to marshall SPOOL_R_SETJOB.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_enumprinterdrivers(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumprinterdrivers(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMPRINTERDRIVERS q_u;
SPOOL_R_ENUMPRINTERDRIVERS r_u;
-
- BOOL ret;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_enumprinterdrivers("", &q_u, data, 0))
- {
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if (!spoolss_io_q_enumprinterdrivers("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumprinterdrivers: unable to unmarshall SPOOL_Q_ENUMPRINTERDRIVERS.\n"));
return False;
}
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _spoolss_enumprinterdrivers(&q_u.name, &q_u.environment, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.returned);
+
+ if (!new_spoolss_io_r_enumprinterdrivers("",&r_u,rdata,0)) {
+ DEBUG(0,("new_spoolss_io_r_enumprinterdrivers: unable to marshall SPOOL_R_ENUMPRINTERDRIVERS.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_enumprinterdrivers(&q_u.name,
- &q_u.environment, q_u. level,
- &r_u.ctr, &r_u.offered, &r_u.numofdrivers);
+ new_spoolss_free_buffer(q_u.buffer);
- spoolss_io_free_buffer(&q_u.buffer);
- ret = spoolss_io_r_enumdrivers("",&r_u,rdata,0);
- free_spoolss_r_enumdrivers(&r_u);
- return ret;
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_enumforms(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumforms(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMFORMS q_u;
SPOOL_R_ENUMFORMS r_u;
-
- BOOL ret;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_enumforms("", &q_u, data, 0))
- {
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if (!spoolss_io_q_enumforms("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumforms: unable to unmarshall SPOOL_Q_ENUMFORMS.\n"));
+ return False;
+ }
+
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _new_spoolss_enumforms(&q_u.handle, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.numofforms);
+
+ if (!new_spoolss_io_r_enumforms("",&r_u,rdata,0)) {
+ DEBUG(0,("new_spoolss_io_r_enumforms: unable to marshall SPOOL_R_ENUMFORMS.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
return False;
}
+ new_spoolss_free_buffer(q_u.buffer);
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_enumforms(&q_u.handle,
- q_u.level,
- &r_u.forms_1,
- &r_u.offered,
- &r_u.numofforms);
- spoolss_io_free_buffer(&q_u.buffer);
- ret = spoolss_io_r_enumforms("",&r_u,rdata,0);
- spoolss_free_r_enumforms(&r_u);
- return ret;
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_enumports(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumports(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMPORTS q_u;
SPOOL_R_ENUMPORTS r_u;
-
- BOOL ret;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_enumports("", &q_u, data, 0))
- {
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_enumports("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumports: unable to unmarshall SPOOL_Q_ENUMPORTS.\n"));
return False;
}
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_enumports(&q_u.name,
- q_u.level,
- &r_u.ctr,
- &r_u.offered,
- &r_u.numofports);
-
- spoolss_io_free_buffer(&(q_u.buffer));
- ret = spoolss_io_r_enumports("",&r_u,rdata,0);
- spoolss_free_r_enumports(&r_u);
- return ret;
+ r_u.status = _spoolss_enumports(&q_u.name, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.returned);
+
+ if (!new_spoolss_io_r_enumports("",&r_u,rdata,0)) {
+ DEBUG(0,("new_spoolss_io_r_enumports: unable to marshall SPOOL_R_ENUMPORTS.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+
+ return True;
}
@@ -710,287 +739,338 @@ static BOOL api_spoolss_addprinterex(rpcsrv_struct *p, prs_struct *data, prs_str
SPOOL_Q_ADDPRINTEREX q_u;
SPOOL_R_ADDPRINTEREX r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_addprinterex("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_addprinterex("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_addprinterex: unable to unmarshall SPOOL_Q_ADDPRINTEREX.\n"));
return False;
}
-
+
r_u.status = _spoolss_addprinterex(&q_u.server_name,
q_u.level, &q_u.info,
q_u.unk0, q_u.unk1, q_u.unk2, q_u.unk3,
- q_u.user_level, &q_u.user,
+ q_u.user_switch, &q_u.user_ctr,
&r_u.handle);
- ret = spoolss_io_r_addprinterex("", &r_u, rdata, 0);
- return ret;
+
+ if(!spoolss_io_r_addprinterex("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_addprinterex: unable to marshall SPOOL_R_ADDPRINTEREX.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_addprinterdriver(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_addprinterdriver(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ADDPRINTERDRIVER q_u;
SPOOL_R_ADDPRINTERDRIVER r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_addprinterdriver("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_addprinterdriver("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_addprinterdriver: unable to unmarshall SPOOL_Q_ADDPRINTERDRIVER.\n"));
return False;
}
-
- r_u.status = _spoolss_addprinterdriver(&q_u.server_name,
- q_u.level, &q_u.info);
- ret = spoolss_io_r_addprinterdriver("", &r_u, rdata, 0);
- return ret;
+
+ r_u.status = _spoolss_addprinterdriver(&q_u.server_name, q_u.level, &q_u.info);
+
+ if(!spoolss_io_r_addprinterdriver("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_addprinterdriver: unable to marshall SPOOL_R_ADDPRINTERDRIVER.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_getprinterdriverdirectory(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_getprinterdriverdirectory(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_GETPRINTERDRIVERDIR q_u;
SPOOL_R_GETPRINTERDRIVERDIR r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
-
- if (!spoolss_io_q_getprinterdriverdir("", &q_u, data, 0))
- {
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_getprinterdriverdir("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_getprinterdriverdir: unable to unmarshall SPOOL_Q_GETPRINTERDRIVERDIR.\n"));
return False;
}
-
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_getprinterdriverdirectory(&q_u.name,
- &q_u.environment,
- q_u.level,
- &r_u.ctr,
- &r_u.offered);
- ret = spoolss_io_free_buffer(&q_u.buffer);
- spoolss_io_r_getprinterdriverdir("", &r_u, rdata, 0);
- return ret;
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _spoolss_getprinterdriverdirectory(&q_u.name, &q_u.environment, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed);
+
+ if(!spoolss_io_r_getprinterdriverdir("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_getprinterdriverdir: unable to marshall SPOOL_R_GETPRINTERDRIVERDIR.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_enumprinterdata(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumprinterdata(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMPRINTERDATA q_u;
SPOOL_R_ENUMPRINTERDATA r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_enumprinterdata("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_enumprinterdata("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumprinterdata: unable to unmarshall SPOOL_Q_ENUMPRINTERDATA.\n"));
+ return False;
+ }
+
+ r_u.status = _spoolss_enumprinterdata(&q_u.handle, q_u.index, q_u.valuesize, q_u.datasize,
+ &r_u.valuesize, &r_u.value, &r_u.realvaluesize,
+ &r_u.type,
+ &r_u.datasize, &r_u.data, &r_u.realdatasize);
+
+ if(!spoolss_io_r_enumprinterdata("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_enumprinterdata: unable to marshall SPOOL_R_ENUMPRINTERDATA.\n"));
+ safe_free(r_u.value);
+ safe_free(r_u.data);
return False;
}
- r_u.valuesize = q_u.valuesize;
- r_u.datasize = q_u.datasize;
-
- r_u.status = _spoolss_enumprinterdata(&q_u.handle,
- q_u.index,/* in */
- &r_u.valuesize,/* in out */
- &r_u.value,/* out */
- &r_u.realvaluesize,/* out */
- &r_u.type,/* out */
- &r_u.datasize,/* in out */
- &r_u.data,/* out */
- &r_u.realdatasize);/* out */
- ret = spoolss_io_r_enumprinterdata("", &r_u, rdata, 0);
+ safe_free(r_u.value);
safe_free(r_u.data);
- return ret;
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_setprinterdata(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_setprinterdata(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_SETPRINTERDATA q_u;
SPOOL_R_SETPRINTERDATA r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_setprinterdata("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_setprinterdata("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_setprinterdata: unable to unmarshall SPOOL_Q_SETPRINTERDATA.\n"));
return False;
}
-
+
r_u.status = _spoolss_setprinterdata(&q_u.handle,
&q_u.value, q_u.type, q_u.max_len,
q_u.data, q_u.real_len, q_u.numeric_data);
- ret = spoolss_io_r_setprinterdata("", &r_u, rdata, 0);
- safe_free(q_u.data);
- return ret;
+
+ if(!spoolss_io_r_setprinterdata("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_setprinterdata: unable to marshall SPOOL_R_SETPRINTERDATA.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_addform(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_addform(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ADDFORM q_u;
SPOOL_R_ADDFORM r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_addform("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_addform("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_addform: unable to unmarshall SPOOL_Q_ADDFORM.\n"));
return False;
}
-
+
r_u.status = _spoolss_addform(&q_u.handle, q_u.level, &q_u.form);
- ret = spoolss_io_r_addform("", &r_u, rdata, 0);
- return ret;
+
+ if(!spoolss_io_r_addform("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_addform: unable to marshall SPOOL_R_ADDFORM.\n"));
+ return False;
+ }
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_setform(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_setform(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_SETFORM q_u;
SPOOL_R_SETFORM r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_setform("", &q_u, data, 0))
- {
+ if(!spoolss_io_q_setform("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_setform: unable to unmarshall SPOOL_Q_SETFORM.\n"));
+ return False;
+ }
+
+ r_u.status = _spoolss_setform(&q_u.handle, &q_u.name, q_u.level, &q_u.form);
+
+ if(!spoolss_io_r_setform("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_setform: unable to marshall SPOOL_R_SETFORM.\n"));
return False;
}
- r_u.status = _spoolss_setform(&q_u.handle,
- &q_u.name, q_u.level, &q_u.form);
- ret = spoolss_io_r_setform("", &r_u, rdata, 0);
- return ret;
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_enumprintprocessors(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumprintprocessors(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMPRINTPROCESSORS q_u;
SPOOL_R_ENUMPRINTPROCESSORS r_u;
- BOOL ret;
+ ZERO_STRUCT(q_u);
+ ZERO_STRUCT(r_u);
+
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_enumprintprocessors("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumprintprocessors: unable to unmarshall SPOOL_Q_ENUMPRINTPROCESSORS.\n"));
+ return False;
+ }
+
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _spoolss_enumprintprocessors(&q_u.name, &q_u.environment, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.returned);
+
+ if(!spoolss_io_r_enumprintprocessors("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_enumprintprocessors: unable to marshall SPOOL_R_ENUMPRINTPROCESSORS.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+ return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+static BOOL api_spoolss_enumprintprocdatatypes(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
+{
+ SPOOL_Q_ENUMPRINTPROCDATATYPES q_u;
+ SPOOL_R_ENUMPRINTPROCDATATYPES r_u;
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_enumprintprocessors("", &q_u, data, 0))
- {
- return False;
- }
-
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_enumprintprocessors(&q_u.name,
- &q_u.environment,
- q_u.level,
- &r_u.info_1,
- &r_u.offered,
- &r_u.numofprintprocessors);
- spoolss_io_free_buffer(&q_u.buffer);
- ret = spoolss_io_r_enumprintprocessors("", &r_u, rdata, 0);
- safe_free(r_u.info_1);
- return ret;
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_enumprintprocdatatypes("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumprintprocdatatypes: unable to unmarshall SPOOL_Q_ENUMPRINTPROCDATATYPES.\n"));
+ return False;
+ }
+
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _spoolss_enumprintprocdatatypes(&q_u.name, &q_u.processor, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.returned);
+
+ if(!spoolss_io_r_enumprintprocdatatypes("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_enumprintprocdatatypes: unable to marshall SPOOL_R_ENUMPRINTPROCDATATYPES.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_enumprintmonitors(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_enumprintmonitors(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_ENUMPRINTMONITORS q_u;
SPOOL_R_ENUMPRINTMONITORS r_u;
- BOOL ret;
-
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
- if (!spoolss_io_q_enumprintmonitors("", &q_u, data, 0))
- {
- return False;
- }
-
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_enumprintmonitors(&q_u.name,
- q_u.level,
- &r_u.info_1,
- &r_u.offered,
- &r_u.numofprintmonitors);
- spoolss_io_free_buffer(&q_u.buffer);
- ret = spoolss_io_r_enumprintmonitors("", &r_u, rdata, 0);
- safe_free(r_u.info_1);
- return ret;
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if (!spoolss_io_q_enumprintmonitors("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_enumprintmonitors: unable to unmarshall SPOOL_Q_ENUMPRINTMONITORS.\n"));
+ return False;
+ }
+
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
+
+ r_u.status = _spoolss_enumprintmonitors(&q_u.name, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed, &r_u.returned);
+
+ if (!spoolss_io_r_enumprintmonitors("", &r_u, rdata, 0)) {
+ DEBUG(0,("spoolss_io_r_enumprintmonitors: unable to marshall SPOOL_R_ENUMPRINTMONITORS.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+
+ return True;
}
/****************************************************************************
****************************************************************************/
-static BOOL api_spoolss_getjob(rpcsrv_struct *p, prs_struct *data,
- prs_struct *rdata)
+static BOOL api_spoolss_getjob(rpcsrv_struct *p, prs_struct *data, prs_struct *rdata)
{
SPOOL_Q_GETJOB q_u;
SPOOL_R_GETJOB r_u;
-
- BOOL ret;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
- if (!spoolss_io_q_getjob("", &q_u, data, 0))
- {
+ new_spoolss_allocate_buffer(&q_u.buffer);
+
+ if(!spoolss_io_q_getjob("", &q_u, data, 0)) {
+ DEBUG(0,("spoolss_io_q_getjob: unable to unmarshall SPOOL_Q_GETJOB.\n"));
return False;
}
+ /* that's an [in out] buffer */
+ new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
- r_u.offered = q_u.buf_size;
- r_u.level = q_u.level;
- r_u.status = _spoolss_getjob(&q_u.handle,
- q_u.jobid,
- q_u.level,
- &r_u.ctr,
- &r_u.offered);
- spoolss_io_free_buffer(&(q_u.buffer));
- ret = spoolss_io_r_getjob("",&r_u,rdata,0);
- free_spoolss_r_getjob(&r_u);
- return ret;
+ r_u.status = _spoolss_getjob(&q_u.handle, q_u.jobid, q_u.level,
+ r_u.buffer, q_u.offered,
+ &r_u.needed);
+
+ if(!spoolss_io_r_getjob("",&r_u,rdata,0)) {
+ DEBUG(0,("spoolss_io_r_getjob: unable to marshall SPOOL_R_GETJOB.\n"));
+ new_spoolss_free_buffer(q_u.buffer);
+ return False;
+ }
+
+ new_spoolss_free_buffer(q_u.buffer);
+ return True;
}
/*******************************************************************
\pipe\spoolss commands
********************************************************************/
-static const struct api_struct api_spoolss_cmds[] =
+struct api_struct api_spoolss_cmds[] =
{
{"SPOOLSS_OPENPRINTEREX", SPOOLSS_OPENPRINTEREX, api_spoolss_open_printer_ex },
{"SPOOLSS_GETPRINTERDATA", SPOOLSS_GETPRINTERDATA, api_spoolss_getprinterdata },
@@ -1024,6 +1104,7 @@ static const struct api_struct api_spoolss_cmds[] =
{"SPOOLSS_ENUMPRINTPROCESSORS", SPOOLSS_ENUMPRINTPROCESSORS, api_spoolss_enumprintprocessors },
{"SPOOLSS_ENUMMONITORS", SPOOLSS_ENUMMONITORS, api_spoolss_enumprintmonitors },
{"SPOOLSS_GETJOB", SPOOLSS_GETJOB, api_spoolss_getjob },
+ {"SPOOLSS_ENUMPRINTPROCDATATYPES", SPOOLSS_ENUMPRINTPROCDATATYPES, api_spoolss_enumprintprocdatatypes },
{ NULL, 0, NULL }
};
diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c
index e9003c8c6a8..289fef478ad 100644
--- a/source/rpcclient/cmd_spoolss.c
+++ b/source/rpcclient/cmd_spoolss.c
@@ -36,59 +36,147 @@ extern FILE* out_hnd;
extern struct user_creds *usr_creds;
-/****************************************************************************
-nt spoolss query
-****************************************************************************/
-BOOL msrpc_spoolss_enum_printers( const char* srv_name,
- uint32 level,
- uint32 *num,
- void ***ctr,
- PRINT_INFO_FN(fn))
+static void init_buffer(NEW_BUFFER *buffer, uint32 size)
{
- BOOL res = True;
+ buffer->ptr = (size!=0)? 1:0;
+ buffer->size=size;
+ buffer->string_at_end=size;
+ prs_init(&(buffer->prs), 0, 4, MARSHALL);
+ prs_grow(&(buffer->prs), size - buffer->prs.data_size);
+ buffer->prs.io=MARSHALL;
+ buffer->prs.offset=0;
+}
- if (spoolss_enum_printers( 0x40, srv_name, level, num, ctr) &&
- fn != NULL)
- {
- fn(srv_name, level, *num, *ctr);
- }
+static void decode_printer_info_1(NEW_BUFFER *buffer, uint32 returned, PRINTER_INFO_1 **info)
+{
+ uint32 i;
+ PRINTER_INFO_1 *inf;
- return res;
+ inf=(PRINTER_INFO_1 *)malloc(returned*sizeof(PRINTER_INFO_1));
+
+ buffer->prs.offset=0;
+
+ for (i=0; i<returned; i++) {
+ new_smb_io_printer_info_1("", buffer, &(inf[i]), 0);
+ }
+
+ *info=inf;
}
-static void spool_print_info_ctr(const char* srv_name, uint32 level,
- uint32 num, void *const *const ctr)
+static void decode_printer_info_2(NEW_BUFFER *buffer, uint32 returned, PRINTER_INFO_2 **info)
{
- display_printer_info_ctr(out_hnd, ACTION_HEADER , level, num, ctr);
- display_printer_info_ctr(out_hnd, ACTION_ENUMERATE, level, num, ctr);
- display_printer_info_ctr(out_hnd, ACTION_FOOTER , level, num, ctr);
+ uint32 i;
+ PRINTER_INFO_2 *inf;
+
+ inf=(PRINTER_INFO_2 *)malloc(returned*sizeof(PRINTER_INFO_2));
+
+ buffer->prs.offset=0;
+
+ for (i=0; i<returned; i++) {
+ new_smb_io_printer_info_2("", buffer, &(inf[i]), 0);
+ }
+
+ *info=inf;
+}
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags, uint32 level, PRINTER_INFO_CTR ctr)
+{
+ uint32 status;
+ NEW_BUFFER buffer;
+ uint32 needed;
+ uint32 returned;
+
+ init_buffer(&buffer, 0);
+
+ /* send a NULL buffer first */
+ status=spoolss_enum_printers(flags, srv_name, level, &buffer, 0, &needed, &returned);
+
+ if (status==ERROR_INSUFFICIENT_BUFFER) {
+ init_buffer(&buffer, needed);
+ status=spoolss_enum_printers(flags, srv_name, level, &buffer, needed, &needed, &returned);
+ }
+
+ report(out_hnd, "\tstatus:[%d (%x)]\n", status, status);
+
+ if (status!=NT_STATUS_NO_PROBLEMO)
+ return False;
+
+ switch (level) {
+ case 1:
+ decode_printer_info_1(&buffer, returned, &(ctr.printers_1));
+ break;
+ case 2:
+ decode_printer_info_2(&buffer, returned, &(ctr.printers_2));
+ break;
+ }
+
+ display_printer_info_ctr(out_hnd, ACTION_HEADER , level, returned, ctr);
+ display_printer_info_ctr(out_hnd, ACTION_ENUMERATE, level, returned, ctr);
+ display_printer_info_ctr(out_hnd, ACTION_FOOTER , level, returned, ctr);
+ return True;
}
+
/****************************************************************************
nt spoolss query
****************************************************************************/
void cmd_spoolss_enum_printers(struct client_info *info, int argc, char *argv[])
{
- void **ctr = NULL;
- uint32 num = 0;
+ PRINTER_INFO_CTR ctr;
+
+ uint32 flags;
uint32 level = 1;
fstring srv_name;
fstrcpy(srv_name, "\\\\");
fstrcat(srv_name, info->dest_host);
strupper(srv_name);
+
+ flags=PRINTER_ENUM_LOCAL;
- if (msrpc_spoolss_enum_printers(srv_name, level, &num, &ctr,
- spool_print_info_ctr))
- {
+ if (msrpc_spoolss_enum_printers(srv_name, flags, level, ctr))
DEBUG(5,("cmd_spoolss_enum_printer: query succeeded\n"));
- }
else
- {
report(out_hnd, "FAILED\n");
- }
+
+ flags=PRINTER_ENUM_NAME;
+
+ if (msrpc_spoolss_enum_printers(srv_name, flags, level, ctr))
+ DEBUG(5,("cmd_spoolss_enum_printer: query succeeded\n"));
+ else
+ report(out_hnd, "FAILED\n");
+
+ flags=PRINTER_ENUM_SHARED|PRINTER_ENUM_NAME;
+
+ if (msrpc_spoolss_enum_printers(srv_name, flags, level, ctr))
+ DEBUG(5,("cmd_spoolss_enum_printer: query succeeded\n"));
+ else
+ report(out_hnd, "FAILED\n");
+
+ flags=PRINTER_ENUM_CONNECTIONS;
+
+ if (msrpc_spoolss_enum_printers(srv_name, flags, level, ctr))
+ DEBUG(5,("cmd_spoolss_enum_printer: query succeeded\n"));
+ else
+ report(out_hnd, "FAILED\n");
+
+ flags=PRINTER_ENUM_NETWORK;
- free_void_array(num, ctr, free);
+ if (msrpc_spoolss_enum_printers(srv_name, flags, level, ctr))
+ DEBUG(5,("cmd_spoolss_enum_printer: query succeeded\n"));
+ else
+ report(out_hnd, "FAILED\n");
+
+ flags=PRINTER_ENUM_REMOTE;
+
+ if (msrpc_spoolss_enum_printers(srv_name, flags, level, ctr))
+ DEBUG(5,("cmd_spoolss_enum_printer: query succeeded\n"));
+ else
+ report(out_hnd, "FAILED\n");
+
+
}
/****************************************************************************
@@ -125,14 +213,13 @@ void cmd_spoolss_open_printer_ex(struct client_info *info, int argc, char *argv[
fstrcat(srv_name, printer_name);
printer_name = srv_name;
}
-
+/*
DEBUG(4,("spoolopen - printer: %s server: %s user: %s\n",
printer_name, station, usr_creds->ntc.user_name));
-
- res = res ? spoolss_open_printer_ex( printer_name,
- 0, 0, 0,
- station, usr_creds->ntc.user_name,
- &hnd) : False;
+*/
+
+ res = res ? spoolss_open_printer_ex( printer_name, "", PRINTER_ALL_ACCESS,
+ station, "Administrateur", &hnd) : False;
res = res ? spoolss_closeprinter(&hnd) : False;
@@ -153,49 +240,41 @@ nt spoolss query
BOOL msrpc_spoolss_enum_jobs( const char* printer_name,
const char* station, const char* user_name,
uint32 level,
- uint32 *num,
- void ***ctr,
- JOB_INFO_FN(fn))
+ void ***ctr, JOB_INFO_FN(fn))
{
POLICY_HND hnd;
- uint32 buf_size = 0x0;
- uint32 status = 0x0;
-
- BOOL res = True;
- BOOL res1 = True;
+ uint32 status;
+ NEW_BUFFER buffer;
+ uint32 needed;
+ uint32 returned;
+ uint32 firstjob=0;
+ uint32 numofjobs=0xffff;
DEBUG(4,("spoolopen - printer: %s server: %s user: %s\n",
printer_name, station, user_name));
- res = res ? spoolss_open_printer_ex( printer_name,
- 0, 0, 0,
- station, user_name,
- &hnd) : False;
+ if(!spoolss_open_printer_ex( printer_name, 0, 0, station, user_name, &hnd))
+ return False;
- if (status == 0x0)
- {
- status = spoolss_enum_jobs( &hnd,
- 0, 1000, level, &buf_size,
- num, ctr);
- }
+ init_buffer(&buffer, 0);
+ status = spoolss_enum_jobs(&hnd, firstjob, numofjobs, level, &buffer, 0, &needed, &returned);
if (status == ERROR_INSUFFICIENT_BUFFER)
{
- status = spoolss_enum_jobs( &hnd,
- 0, 1000, level, &buf_size,
- num, ctr);
+ init_buffer(&buffer, needed);
+ status = spoolss_enum_jobs( &hnd, firstjob, numofjobs, level, &buffer, needed, &needed, &returned);
}
- res1 = (status == 0x0);
-
- res = res ? spoolss_closeprinter(&hnd) : False;
-
- if (res1 && fn != NULL)
- {
- fn(printer_name, station, level, *num, *ctr);
+ if (status!=NT_STATUS_NO_PROBLEMO) {
+ if (!spoolss_closeprinter(&hnd))
+ return False;
+ return False;
}
+
+ if (fn != NULL)
+ fn(printer_name, station, level, returned, *ctr);
- return res1;
+ return True;
}
static void spool_job_info_ctr( const char* printer_name,
@@ -221,8 +300,7 @@ void cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[])
uint32 num = 0;
uint32 level = 1;
- if (argc < 2)
- {
+ if (argc < 2) {
report(out_hnd, "spooljobs <printer name>\n");
return;
}
@@ -243,14 +321,13 @@ void cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[])
fstrcat(srv_name, printer_name);
printer_name = srv_name;
}
-
- DEBUG(4,("spoolopen - printer: %s station: %s user: %s\n",
- printer_name, station, usr_creds->ntc.user_name));
-
+/*
+ DEBUG(4,("spoolopen - printer: %s station: %s user: %s\n", printer_name, station, usr_creds->ntc.user_name));
+*/
if (msrpc_spoolss_enum_jobs( printer_name, station,
- usr_creds->ntc.user_name,
- level, &num, &ctr,
- spool_job_info_ctr))
+ "Administrateur",
+ /*usr_creds->ntc.user_name,*/
+ level, &ctr, spool_job_info_ctr))
{
DEBUG(5,("cmd_spoolss_enum_jobs: query succeeded\n"));
}
@@ -259,6 +336,94 @@ void cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[])
report(out_hnd, "FAILED\n");
}
- free_void_array(num, ctr, free);
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+BOOL msrpc_spoolss_enum_printerdata( const char* printer_name, const char* station, const char* user_name )
+{
+ POLICY_HND hnd;
+ uint32 status;
+ uint32 index;
+ uint32 valuelen;
+ uint16 *value;
+ uint32 rvaluelen;
+ uint32 type;
+ uint32 datalen;
+ uint8 *data;
+ uint32 rdatalen;
+
+ DEBUG(4,("spoolenum_printerdata - printer: %s\n", printer_name));
+
+ if(!spoolss_open_printer_ex( printer_name, 0, 0, station, user_name, &hnd))
+ return False;
+
+ status = spoolss_enum_printerdata(&hnd, 0, &valuelen, value, &rvaluelen, &type, &datalen, data, &rdatalen);
+
+ valuelen=rvaluelen;
+ datalen=rdatalen;
+
+ value=(uint16 *)malloc(valuelen*sizeof(uint16));
+ data=(uint8 *)malloc(datalen*sizeof(uint8));
+
+ display_printer_enumdata(out_hnd, ACTION_HEADER, index, valuelen, value, rvaluelen, type, datalen, data, rdatalen);
+
+ do {
+ status = spoolss_enum_printerdata(&hnd, index, &valuelen, value, &rvaluelen, &type, &datalen, data, &rdatalen);
+ display_printer_enumdata(out_hnd, ACTION_ENUMERATE, index, valuelen, value, rvaluelen, type, datalen, data, rdatalen);
+ index++;
+ } while (status != 0x0103); /* NO_MORE_ITEMS */
+ display_printer_enumdata(out_hnd, ACTION_FOOTER, index, valuelen, value, rvaluelen, type, datalen, data, rdatalen);
+
+
+ if (status!=NT_STATUS_NO_PROBLEMO) {
+ if (!spoolss_closeprinter(&hnd))
+ return False;
+ return False;
+ }
+
+ return True;
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+void cmd_spoolss_enum_printerdata(struct client_info *info, int argc, char *argv[])
+{
+ fstring srv_name;
+ fstring station;
+ char *printer_name;
+
+ if (argc < 2) {
+ report(out_hnd, "spoolenumdata <printer name>\n");
+ return;
+ }
+
+ printer_name = argv[1];
+
+ fstrcpy(station, "\\\\");
+ fstrcat(station, info->myhostname);
+ strupper(station);
+
+ fstrcpy(srv_name, "\\\\");
+ fstrcat(srv_name, info->dest_host);
+ strupper(srv_name);
+
+ if (!strnequal("\\\\", printer_name, 2))
+ {
+ fstrcat(srv_name, "\\");
+ fstrcat(srv_name, printer_name);
+ printer_name = srv_name;
+ }
+
+ DEBUG(4,("spoolopen - printer: %s station: %s user: %s\n", printer_name, station, usr_creds->ntc.user_name));
+
+ if (msrpc_spoolss_enum_printerdata( printer_name, station,
+ usr_creds->ntc.user_name))
+ DEBUG(5,("cmd_spoolss_enum_printerdata: query succeeded\n"));
+ else
+ report(out_hnd, "FAILED\n");
+
}
diff --git a/source/rpcclient/display_spool.c b/source/rpcclient/display_spool.c
index 252fc881568..6c9896b1f3d 100644
--- a/source/rpcclient/display_spool.c
+++ b/source/rpcclient/display_spool.c
@@ -23,198 +23,179 @@
#include "includes.h"
/****************************************************************************
-printer info level 0 display function
+printer info level 1 display function
****************************************************************************/
-void display_print_info_0(FILE *out_hnd, enum action_type action,
- PRINTER_INFO_0 *const i0)
+static void display_print_info_1(FILE *out_hnd, PRINTER_INFO_1 *i1)
{
- if (i0 == NULL)
- {
+ fstring desc;
+ fstring name;
+ fstring comm;
+ if (i1 == NULL)
return;
- }
-
- switch (action)
- {
- case ACTION_HEADER:
- {
- report(out_hnd, "Printer Info Level 0:\n");
-
- break;
- }
- case ACTION_ENUMERATE:
- {
- fstring name;
- fstring serv;
- unistr_to_ascii(name, i0->printername.buffer, sizeof(name)-1);
- unistr_to_ascii(serv, i0->servername .buffer, sizeof(serv)-1);
-
- report(out_hnd, "\tprinter name:\t%s\n", name);
- report(out_hnd, "\tserver name:\t%s\n", serv);
- report(out_hnd, "\t[Other info not displayed]\n");
-
- break;
- }
- case ACTION_FOOTER:
- {
- report(out_hnd, "\n");
- break;
- }
- }
+ unistr_to_ascii(desc, i1->description.buffer, sizeof(desc)-1);
+ unistr_to_ascii(name, i1->name .buffer, sizeof(name)-1);
+ unistr_to_ascii(comm, i1->comment .buffer, sizeof(comm)-1);
+ report(out_hnd, "\tflags:[%x]\n", i1->flags);
+ report(out_hnd, "\tname:[%s]\n", name);
+ report(out_hnd, "\tdescription:[%s]\n", desc);
+ report(out_hnd, "\tcomment:[%s]\n\n", comm);
}
/****************************************************************************
-printer info level 1 display function
+printer info level 2 display function
****************************************************************************/
-void display_print_info_1(FILE *out_hnd, enum action_type action,
- PRINTER_INFO_1 *const i1)
+static void display_print_info_2(FILE *out_hnd, PRINTER_INFO_2 *i1)
{
+ fstring servername;
+ fstring printername;
+ fstring sharename;
+ fstring portname;
+ fstring drivername;
+ fstring comment;
+ fstring location;
+ fstring sepfile;
+ fstring printprocessor;
+ fstring datatype;
+ fstring parameters;
+
if (i1 == NULL)
- {
return;
- }
+
+ unistr_to_ascii(servername, i1->servername.buffer, sizeof(servername)-1);
+ unistr_to_ascii(printername, i1->printername.buffer, sizeof(printername)-1);
+ unistr_to_ascii(sharename, i1->sharename.buffer, sizeof(sharename)-1);
+ unistr_to_ascii(portname, i1->portname.buffer, sizeof(portname)-1);
+ unistr_to_ascii(drivername, i1->drivername.buffer, sizeof(drivername)-1);
+ unistr_to_ascii(comment, i1->comment.buffer, sizeof(comment)-1);
+ unistr_to_ascii(location, i1->location.buffer, sizeof(location)-1);
+ unistr_to_ascii(sepfile, i1->sepfile.buffer, sizeof(sepfile)-1);
+ unistr_to_ascii(printprocessor, i1->printprocessor.buffer, sizeof(printprocessor)-1);
+ unistr_to_ascii(datatype, i1->datatype.buffer, sizeof(datatype)-1);
+ unistr_to_ascii(parameters, i1->parameters.buffer, sizeof(parameters)-1);
+
+ report(out_hnd, "\tservername:[%s]\n", servername);
+ report(out_hnd, "\tprintername:[%s]\n", printername);
+ report(out_hnd, "\tsharename:[%s]\n", sharename);
+ report(out_hnd, "\tportname:[%s]\n", portname);
+ report(out_hnd, "\tdrivername:[%s]\n", drivername);
+ report(out_hnd, "\tcomment:[%s]\n", comment);
+ report(out_hnd, "\tlocation:[%s]\n", location);
+ report(out_hnd, "\tsepfile:[%s]\n", sepfile);
+ report(out_hnd, "\tprintprocessor:[%s]\n", printprocessor);
+ report(out_hnd, "\tdatatype:[%s]\n", datatype);
+ report(out_hnd, "\tparameters:[%s]\n", parameters);
+ report(out_hnd, "\tattributes:[%x]\n", i1->attributes);
+ report(out_hnd, "\tpriority:[%x]\n", i1->priority);
+ report(out_hnd, "\tdefaultpriority:[%x]\n", i1->defaultpriority);
+ report(out_hnd, "\tstarttime:[%x]\n", i1->starttime);
+ report(out_hnd, "\tuntiltime:[%x]\n", i1->untiltime);
+ report(out_hnd, "\tstatus:[%x]\n", i1->status);
+ report(out_hnd, "\tcjobs:[%x]\n", i1->cjobs);
+ report(out_hnd, "\taverageppm:[%x]\n\n", i1->averageppm);
+}
+
+/****************************************************************************
+connection info level 1 container display function
+****************************************************************************/
+static void display_printer_info_1_ctr(FILE *out_hnd, enum action_type action, uint32 count, PRINTER_INFO_CTR ctr)
+{
+ int i;
+ PRINTER_INFO_1 *in;
switch (action)
{
case ACTION_HEADER:
- {
report(out_hnd, "Printer Info Level 1:\n");
-
break;
- }
case ACTION_ENUMERATE:
- {
- fstring desc;
- fstring name;
- fstring comm;
-
- unistr_to_ascii(desc, i1->description.buffer, sizeof(desc)-1);
- unistr_to_ascii(name, i1->name .buffer, sizeof(name)-1);
- unistr_to_ascii(comm, i1->comment .buffer, sizeof(comm)-1);
-
- report(out_hnd, "\tflags:\t%d\n", i1->flags);
- report(out_hnd, "\tname:\t%s\n", name);
- report(out_hnd, "\tdescription:\t%s\n", desc);
- report(out_hnd, "\tcomment:\t%s\n", comm);
-
+ for (i = 0; i < count; i++) {
+ in=ctr.printers_1;
+ display_print_info_1(out_hnd, &(in[i]) );
+ }
break;
- }
case ACTION_FOOTER:
- {
report(out_hnd, "\n");
break;
- }
}
-
}
/****************************************************************************
-connection info level 0 container display function
+connection info level 2 container display function
****************************************************************************/
-void display_printer_info_0_ctr(FILE *out_hnd, enum action_type action,
- uint32 count, PRINTER_INFO_0 *const *const ctr)
+static void display_printer_info_2_ctr(FILE *out_hnd, enum action_type action, uint32 count, PRINTER_INFO_CTR ctr)
{
- if (ctr == NULL)
- {
- report(out_hnd, "display_printer_info_0_ctr: unavailable due to an internal error\n");
- return;
- }
+ int i;
+ PRINTER_INFO_2 *in;
switch (action)
{
case ACTION_HEADER:
- {
+ report(out_hnd, "Printer Info Level 2:\n");
break;
- }
case ACTION_ENUMERATE:
- {
- int i;
-
- for (i = 0; i < count; i++)
- {
- display_print_info_0(out_hnd, ACTION_HEADER , ctr[i]);
- display_print_info_0(out_hnd, ACTION_ENUMERATE, ctr[i]);
- display_print_info_0(out_hnd, ACTION_FOOTER , ctr[i]);
+ for (i = 0; i < count; i++) {
+ in=ctr.printers_2;
+ display_print_info_2(out_hnd, &(in[i]) );
}
break;
- }
case ACTION_FOOTER:
- {
+ report(out_hnd, "\n");
break;
- }
}
}
/****************************************************************************
-connection info level 1 container display function
+connection info container display function
****************************************************************************/
-void display_printer_info_1_ctr(FILE *out_hnd, enum action_type action,
- uint32 count, PRINTER_INFO_1 *const *const ctr)
+void display_printer_info_ctr(FILE *out_hnd, enum action_type action, uint32 level,
+ uint32 count, PRINTER_INFO_CTR ctr)
{
- if (ctr == NULL)
- {
- report(out_hnd, "display_printer_info_1_ctr: unavailable due to an internal error\n");
- return;
- }
-
- switch (action)
- {
- case ACTION_HEADER:
- {
+ switch (level) {
+ case 1:
+ display_printer_info_1_ctr(out_hnd, action, count, ctr);
break;
- }
- case ACTION_ENUMERATE:
- {
- int i;
-
- for (i = 0; i < count; i++)
- {
- display_print_info_1(out_hnd, ACTION_HEADER , ctr[i]);
- display_print_info_1(out_hnd, ACTION_ENUMERATE, ctr[i]);
- display_print_info_1(out_hnd, ACTION_FOOTER , ctr[i]);
- }
+ case 2:
+ display_printer_info_2_ctr(out_hnd, action, count, ctr);
break;
- }
- case ACTION_FOOTER:
- {
+ default:
+ report(out_hnd, "display_printer_info_ctr: Unknown Info Level\n");
break;
- }
}
}
/****************************************************************************
connection info container display function
****************************************************************************/
-void display_printer_info_ctr(FILE *out_hnd, enum action_type action,
- uint32 level, uint32 count,
- void *const *const ctr)
+void display_printer_enumdata(FILE *out_hnd, enum action_type action, uint32 index,
+ uint32 valuelen, uint16 *value, uint32 rvaluelen,
+ uint32 type,
+ uint32 datalen, uint8 *data, uint32 rdatalen)
{
- if (ctr == NULL)
- {
- report(out_hnd, "display_printer_info_ctr: unavailable due to an internal error\n");
- return;
- }
-
- switch (level)
+ fstring buffer;
+
+ switch (action)
{
- case 0:
- {
- display_printer_info_0_ctr(out_hnd, action,
- count, (PRINTER_INFO_0*const*const)ctr);
+ case ACTION_HEADER:
+ report(out_hnd, "Printer enum data:\n");
+ report(out_hnd, "\tindex\valuelen\tvalue\trvaluelen");
+ report(out_hnd, "\ttype\tdatalen\tdata\trdatalen\n");
break;
- }
- case 1:
- {
- display_printer_info_1_ctr(out_hnd, action,
- count, (PRINTER_INFO_1*const*const)ctr);
+ case ACTION_ENUMERATE:
+ report(out_hnd, "\t%d", index);
+ report(out_hnd, "\t%d", valuelen);
+ unistr_to_ascii(buffer, value, sizeof(buffer)-1);
+ report(out_hnd, "\t%s", buffer);
+ report(out_hnd, "\t%d", rvaluelen);
+ report(out_hnd, "\t%d", type);
+ report(out_hnd, "\t%d", datalen);
+ report(out_hnd, "\t%s", data);
+ report(out_hnd, "\t%d\n", rdatalen);
break;
- }
- default:
- {
- report(out_hnd, "display_printer_info_ctr: Unknown Info Level\n");
+ case ACTION_FOOTER:
+ report(out_hnd, "\n");
break;
- }
}
}
diff --git a/source/rpcclient/spoolss_cmds.c b/source/rpcclient/spoolss_cmds.c
index 9dca9053141..a8db8d81b61 100644
--- a/source/rpcclient/spoolss_cmds.c
+++ b/source/rpcclient/spoolss_cmds.c
@@ -27,50 +27,6 @@
extern struct client_info cli_info;
-static char *complete_printersenum(char *text, int state)
-{
- static uint32 i = 0;
- static uint32 num = 0;
- static PRINTER_INFO_1 **ctr = NULL;
-
- if (state == 0)
- {
- fstring srv_name;
- fstrcpy(srv_name, "\\\\");
- fstrcat(srv_name, cli_info.dest_host);
- strupper(srv_name);
-
- free_print1_array(num, ctr);
- ctr = NULL;
- num = 0;
-
- /* Iterate all users */
- if (!msrpc_spoolss_enum_printers(srv_name,
- 1, &num, (void ***)&ctr,
- NULL))
- {
- return NULL;
- }
-
- i = 0;
- }
-
- for (; i < num; i++)
- {
- fstring name;
- unistr_to_ascii(name, ctr[i]->name.buffer, sizeof(name) - 1);
-
- if (text == NULL || text[0] == 0 ||
- strnequal(text, name, strlen(text)))
- {
- char *copy = strdup(name);
- i++;
- return copy;
- }
- }
-
- return NULL;
-}
/****************************************************************************
This defines the commands supported by this client
@@ -79,36 +35,14 @@ static const struct command_set spl_commands[] = {
/*
* printer testing
*/
-
- {
- "spoolenum",
- cmd_spoolss_enum_printers,
- "Enumerate Printers",
- {NULL, NULL}
- },
- {
- "spooljobs",
- cmd_spoolss_enum_jobs,
- "<printer name> Enumerate Printer Jobs",
- {complete_printersenum, NULL}
- },
- {
- "spoolopen",
- cmd_spoolss_open_printer_ex,
- "<printer name> Spool Printer Open Test",
- {complete_printersenum, NULL}
- },
-
+ { "spoolenum", cmd_spoolss_enum_printers, "Enumerate Printers", {NULL, NULL} },
+ { "spoolenumdatas", cmd_spoolss_enum_printerdata, "<printer name> Enumerate Printer datas", {NULL, NULL} },
+ { "spooljobs", cmd_spoolss_enum_jobs, "<printer name> Enumerate Printer Jobs", {NULL, NULL} },
+ { "spoolopen", cmd_spoolss_open_printer_ex, "<printer name> Spool Printer Open Test", {NULL, NULL} },
/*
* oop!
*/
-
- {
- "",
- NULL,
- NULL,
- {NULL, NULL}
- }
+ { "", NULL, NULL, {NULL, NULL} }
};
void add_spl_commands(void)
diff --git a/source/spoolssd/srv_spoolss_nt.c b/source/spoolssd/srv_spoolss_nt.c
index 1ccf7914f6e..114326b0dbc 100755
--- a/source/spoolssd/srv_spoolss_nt.c
+++ b/source/spoolssd/srv_spoolss_nt.c
@@ -23,12 +23,14 @@
#include "includes.h"
-#include "rpc_parse.h"
#include "nterr.h"
extern int DEBUGLEVEL;
extern pstring global_myname;
+#define init_unistr2 make_unistr2
+#define init_unistr make_unistr
+
#ifndef MAX_OPEN_PRINTER_EXS
#define MAX_OPEN_PRINTER_EXS 50
#endif
@@ -36,276 +38,254 @@ extern pstring global_myname;
#define PRINTER_HANDLE_IS_PRINTER 0
#define PRINTER_HANDLE_IS_PRINTSERVER 1
-static BOOL convert_printer_info(const SPOOL_PRINTER_INFO_LEVEL *uni,
- NT_PRINTER_INFO_LEVEL *printer,
- uint32 level)
-{
- switch (level)
- {
- case 2:
- {
- uni_2_asc_printer_info_2(uni->info_2,
- &(printer->info_2));
- break;
- }
- default:
- break;
- }
-
-
-
- return True;
-}
+/* structure to store the printer handles */
+/* and a reference to what it's pointing to */
+/* and the notify info asked about */
+/* that's the central struct */
+typedef struct _Printer{
+ ubi_dlNode Next;
+ ubi_dlNode Prev;
+
+ BOOL open;
+ BOOL document_started;
+ BOOL page_started;
+ uint32 current_jobid;
+ uint32 document_fd;
+ uint32 document_lastwritten;
+ pstring document_name;
+ pstring job_name;
+ POLICY_HND printer_hnd;
+ BOOL printer_type;
+ union {
+ fstring printername;
+ fstring printerservername;
+ } dev;
+ uint32 type;
+ uint32 access;
+ struct {
+ uint32 flags;
+ uint32 options;
+ fstring localmachine;
+ uint32 printerlocal;
+ SPOOL_NOTIFY_OPTION *option;
+ } notify;
+ struct {
+ fstring machine;
+ fstring user;
+ } client;
+} Printer_entry;
+
+static ubi_dlList Printer_list;
+
+#define OPEN_HANDLE(pnum) ((pnum!=NULL) && (pnum->open!=False))
-static BOOL convert_printer_driver_info(const SPOOL_PRINTER_DRIVER_INFO_LEVEL *uni,
- NT_PRINTER_DRIVER_INFO_LEVEL *printer,
- uint32 level)
+/****************************************************************************
+ initialise printer handle states...
+****************************************************************************/
+void init_printer_hnd(void)
{
- switch (level)
- {
- case 3:
- {
- printer->info_3=NULL;
- uni_2_asc_printer_driver_3(uni->info_3, &(printer->info_3));
- break;
- }
- default:
- break;
- }
-
-
-
- return True;
+ ubi_dlInitList(&Printer_list);
}
-static BOOL convert_devicemode(DEVICEMODE devmode, NT_DEVICEMODE *nt_devmode)
+/****************************************************************************
+ create a unique printer handle
+****************************************************************************/
+static void create_printer_hnd(POLICY_HND *hnd)
{
- unistr_to_ascii(nt_devmode->devicename,
- devmode.devicename.buffer,
- 31);
-
- unistr_to_ascii(nt_devmode->formname,
- devmode.formname.buffer,
- 31);
-
- nt_devmode->specversion=devmode.specversion;
- nt_devmode->driverversion=devmode.driverversion;
- nt_devmode->size=devmode.size;
- nt_devmode->driverextra=devmode.driverextra;
- nt_devmode->fields=devmode.fields;
- nt_devmode->orientation=devmode.orientation;
- nt_devmode->papersize=devmode.papersize;
- nt_devmode->paperlength=devmode.paperlength;
- nt_devmode->paperwidth=devmode.paperwidth;
- nt_devmode->scale=devmode.scale;
- nt_devmode->copies=devmode.copies;
- nt_devmode->defaultsource=devmode.defaultsource;
- nt_devmode->printquality=devmode.printquality;
- nt_devmode->color=devmode.color;
- nt_devmode->duplex=devmode.duplex;
- nt_devmode->yresolution=devmode.yresolution;
- nt_devmode->ttoption=devmode.ttoption;
- nt_devmode->collate=devmode.collate;
-
- nt_devmode->logpixels=devmode.logpixels;
- nt_devmode->bitsperpel=devmode.bitsperpel;
- nt_devmode->pelswidth=devmode.pelswidth;
- nt_devmode->pelsheight=devmode.pelsheight;
- nt_devmode->displayflags=devmode.displayflags;
- nt_devmode->displayfrequency=devmode.displayfrequency;
- nt_devmode->icmmethod=devmode.icmmethod;
- nt_devmode->icmintent=devmode.icmintent;
- nt_devmode->mediatype=devmode.mediatype;
- nt_devmode->dithertype=devmode.dithertype;
- nt_devmode->reserved1=devmode.reserved1;
- nt_devmode->reserved2=devmode.reserved2;
- nt_devmode->panningwidth=devmode.panningwidth;
- nt_devmode->panningheight=devmode.panningheight;
-
- if (nt_devmode->driverextra != 0)
- {
- /* if we had a previous private delete it and make a new one */
- if (nt_devmode->private != NULL)
- free(nt_devmode->private);
- nt_devmode->private=(uint8 *)malloc(nt_devmode->driverextra * sizeof(uint8));
- memcpy(nt_devmode->private, devmode.private, nt_devmode->driverextra);
- }
-
+ static uint32 pol_hnd_low = 0;
+ NTTIME ntt;
- return True;
-}
+ if (hnd == NULL) return;
+ ZERO_STRUCTP(hnd);
-
-/* structure to store the printer handles */
-/* and a reference to what it's pointing to */
-/* and the notify info asked about */
-/* that's the central struct */
-
-typedef struct print_hnd_info
-{
- BOOL document_started;
- BOOL page_started;
- uint32 current_jobid;
- uint32 document_fd;
- uint32 document_lastwritten;
- pstring document_name;
- pstring job_name;
- BOOL printer_type;
- union
- {
- fstring printername;
- fstring printerservername;
- } dev;
- uint32 type;
- uint32 access;
- uint32 number_of_notify;
- SPOOL_NOTIFY_OPTION_TYPE notify_info[MAX_PRINTER_NOTIFY+MAX_JOB_NOTIFY];
+ pol_hnd_low++;
-} PRINT_HND_INFO;
+ unix_to_nt_time(&ntt, time(NULL));
-#define INVALID_HANDLE(pnum) (pnum == NULL)
+ hnd->ptr = 0;
+ hnd->uuid.time_low = ntt.low;
+ hnd->uuid.time_mid = (ntt.high & 0xffff);
+ hnd->uuid.time_hi_and_version = ((ntt.high >> 16) & 0xffff);
+ SIVAL(hnd->uuid.remaining, 0, getpid());
+ SIVAL(hnd->uuid.remaining, 4, pol_hnd_low);
+}
/****************************************************************************
- set printer handle
+ find printer index by handle
****************************************************************************/
-static BOOL set_printhndinfo(struct policy_cache *cache, POLICY_HND *hnd)
+static Printer_entry *find_printer_index_by_hnd(const POLICY_HND *hnd)
{
- PRINT_HND_INFO *dev;
- dev = malloc(sizeof(*dev));
+ Printer_entry *find_printer;
- DEBUG(3,("Setting policy info\n"));
+ find_printer = (Printer_entry *)ubi_dlFirst(&Printer_list);
- if (dev != NULL)
- {
- ZERO_STRUCTP(dev);
- if (set_policy_state(cache, hnd, NULL, (void*)dev))
+ for(; find_printer; find_printer = (Printer_entry *)ubi_dlNext(find_printer)) {
+
+ if (memcmp(&(find_printer->printer_hnd), hnd, sizeof(*hnd)) == 0)
{
- DEBUG(3,("Service setting policy info\n"));
- return True;
+ DEBUG(4,("Found printer handle \n"));
+ /*dump_data(4, hnd->data, sizeof(hnd->data));*/
+ return find_printer;
}
- free(dev);
- return False;
}
- DEBUG(3,("Error setting policy sid\n"));
- return False;
+
+ DEBUG(3,("Whoops, Printer handle not found: "));
+ /*dump_data(4, hnd->data, sizeof(hnd->data));*/
+ return NULL;
}
/****************************************************************************
- get printer handle
+ clear an handle
****************************************************************************/
-static BOOL get_printhndinfo(struct policy_cache *cache, const POLICY_HND *hnd,
- PRINT_HND_INFO **pnum)
+static void clear_handle(POLICY_HND *hnd)
{
- PRINT_HND_INFO *d = (PRINT_HND_INFO*)get_policy_state_info(cache, hnd);
-
- if (d != NULL)
- {
- (*pnum) = d;
- return True;
- }
-
- DEBUG(3,("Error getting policy print handle\n"));
- return False;
+ ZERO_STRUCTP(hnd);
}
/****************************************************************************
- find first available printer slot. creates a printer handle for you.
- ****************************************************************************/
-static BOOL open_printer_hnd(POLICY_HND *hnd, uint32 access_mask)
+ close printer index by handle
+****************************************************************************/
+static BOOL close_printer_handle(POLICY_HND *hnd)
{
- if (!open_policy_hnd(get_global_hnd_cache(),
- get_sec_ctx(), hnd, access_mask))
+ Printer_entry *Printer = find_printer_index_by_hnd(hnd);
+
+ if (!OPEN_HANDLE(Printer))
{
+ DEBUG(3,("Error closing printer handle\n"));
return False;
}
- return set_printhndinfo(get_global_hnd_cache(), hnd);
-}
+
+ Printer->open=False;
+ Printer->notify.flags=0;
+ Printer->notify.options=0;
+ Printer->notify.localmachine[0]='\0';
+ Printer->notify.printerlocal=0;
+ safe_free(Printer->notify.option);
+ Printer->notify.option=NULL;
+
+ clear_handle(hnd);
+
+ ubi_dlRemThis(&Printer_list, Printer);
+
+ safe_free(Printer);
+
+ return True;
+}
/****************************************************************************
- find printer index by handle
+ return the snum of a printer corresponding to an handle
****************************************************************************/
-static PRINT_HND_INFO *find_printer_index_by_hnd(const POLICY_HND *hnd)
+static BOOL get_printer_snum(const POLICY_HND *hnd, int *number)
{
- PRINT_HND_INFO *pnum = NULL;
+ int snum;
+ Printer_entry *Printer = find_printer_index_by_hnd(hnd);
+ int n_services=lp_numservices();
+
+ if (!OPEN_HANDLE(Printer)) {
+ DEBUG(3,("Error getting printer - take a nap quickly !\n"));
+ return False;
+ }
- if (get_printhndinfo(get_global_hnd_cache(), hnd, &pnum))
- {
- return pnum;
+ switch (Printer->printer_type) {
+ case PRINTER_HANDLE_IS_PRINTER:
+ DEBUG(4,("short name:%s\n", Printer->dev.printername));
+ for (snum=0;snum<n_services; snum++) {
+ if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
+ DEBUG(4,("share:%s\n",lp_servicename(snum)));
+ if ( ( strlen(lp_servicename(snum)) == strlen( Printer->dev.printername ) )
+ && ( !strncasecmp(lp_servicename(snum),
+ Printer->dev.printername,
+ strlen( lp_servicename(snum) ))) ) {
+ DEBUG(4,("Printer found: %s[%x]\n",lp_servicename(snum),snum));
+ *number=snum;
+ return True;
+ break;
+ }
+ }
+ }
+ return False;
+ break;
+ case PRINTER_HANDLE_IS_PRINTSERVER:
+ return False;
+ break;
+ default:
+ return False;
+ break;
}
- return NULL;
}
/****************************************************************************
- close printer index by handle
-****************************************************************************/
-static BOOL close_printer_handle(POLICY_HND *hnd)
+ find first available printer slot. creates a printer handle for you.
+ ****************************************************************************/
+static BOOL open_printer_hnd(POLICY_HND *hnd)
{
- return close_policy_hnd(get_global_hnd_cache(), hnd);
-}
+ Printer_entry *new_printer;
+
+ new_printer=(Printer_entry *)malloc(sizeof(Printer_entry));
+ ZERO_STRUCTP(new_printer);
+
+ new_printer->open = True;
+ new_printer->notify.option=NULL;
+
+ memcpy(&(new_printer->printer_hnd), hnd, sizeof(*hnd));
+
+ ubi_dlAddHead( &Printer_list, (ubi_dlNode *)new_printer);
+
+ return True;
+}
/****************************************************************************
set printer handle type.
****************************************************************************/
static BOOL set_printer_hnd_accesstype(POLICY_HND *hnd, uint32 access_required)
{
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(hnd);
+ Printer_entry *Printer = find_printer_index_by_hnd(hnd);
- if (INVALID_HANDLE(pnum))
- {
- DEBUG(4,("Error setting printer type=%x\n",
- access_required));
+ if (!OPEN_HANDLE(Printer)) {
+ DEBUG(4,("Error setting printer type=%x", access_required));
return False;
}
- else
- {
- DEBUG(4,("Setting printer access=%x\n",
- access_required));
-
-
- pnum->access = access_required;
- return True;
- }
- return False;
+ DEBUG(4,("Setting printer access=%x\n", access_required));
+ Printer->access = access_required;
+ return True;
}
/****************************************************************************
set printer handle type.
+ check if it's \\server or \\server\printer
****************************************************************************/
static BOOL set_printer_hnd_printertype(POLICY_HND *hnd, char *printername)
{
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(hnd);
+ Printer_entry *Printer = find_printer_index_by_hnd(hnd);
- if (INVALID_HANDLE(pnum))
- {
- DEBUGADD(4,("Error setting printer name %s",
- printername));
+ if (!OPEN_HANDLE(Printer)) {
+ DEBUGADD(4,("Error setting printer name %s", printername));
return False;
}
+
DEBUG(3,("Setting printer type=%s\n", printername));
- if ( strlen(printername) < 3 )
- {
+ if ( strlen(printername) < 3 ) {
DEBUGADD(4,("A print server must have at least 1 char ! %s\n", printername));
return False;
}
- /* check if it's \\server or \\server\printer */
- /* +2 is to skip the leading \\ */
- if (!strchr(printername+2, '\\'))
- {
- /* it's a print server */
+ /* it's a print server */
+ if (!strchr(printername+2, '\\')) {
DEBUGADD(4,("Printer is a print server\n"));
- pnum->printer_type = PRINTER_HANDLE_IS_PRINTSERVER;
+ Printer->printer_type = PRINTER_HANDLE_IS_PRINTSERVER;
+ return True;
}
- else
- {
- /* it's a printer */
+ /* it's a printer */
+ else {
DEBUGADD(4,("Printer is a printer\n"));
- pnum->printer_type = PRINTER_HANDLE_IS_PRINTER;
- }
- return True;
+ Printer->printer_type = PRINTER_HANDLE_IS_PRINTER;
+ return True;
+ }
+
+ return False;
}
/****************************************************************************
@@ -313,154 +293,129 @@ static BOOL set_printer_hnd_printertype(POLICY_HND *hnd, char *printername)
****************************************************************************/
static BOOL set_printer_hnd_printername(POLICY_HND *hnd, char *printername)
{
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(hnd);
- char *back;
+ Printer_entry *Printer = find_printer_index_by_hnd(hnd);
NT_PRINTER_INFO_LEVEL printer;
int snum;
int n_services=lp_numservices();
- uint32 marche;
+ char *aprinter;
+ BOOL found=False;
- if (INVALID_HANDLE(pnum))
+ if (!OPEN_HANDLE(Printer))
{
- DEBUG(0,("Error setting printer name=%s\n",
- printername));
+ DEBUG(0,("Error setting printer name=%s\n", printername));
return False;
}
- DEBUG(4,("Setting printer name=%s (len=%d)\n",
- printername,strlen(printername)));
-
- switch (pnum->printer_type)
- {
- case PRINTER_HANDLE_IS_PRINTER:
- back=strchr(printername+2, '\\');
- back=back+1;
- DEBUGADD(5,("searching for %s (len=%d)\n", back,strlen(back)));
- /*
- * store the Samba share name in it
- * in back we have the long printer name
- * need to iterate all the snum and do a
- * get_a_printer each time to find the printer
- * faster to do it here than later.
- */
- for (snum=0;snum<n_services; snum++)
- {
- if (lp_browseable(snum) &&
- lp_snum_ok(snum) &&
- lp_print_ok(snum) )
- {
- DEBUGADD(5,("share:%s\n",lp_servicename(snum)));
-
- marche=get_a_printer(&printer, 2, lp_servicename(snum));
- DEBUGADD(6,("marche:%d\n",marche));
-
- if ( marche==0 && ( strlen(printer.info_2->printername) == strlen(back) )
- && ( !strncasecmp(printer.info_2->printername, back, strlen(back)))
- )
- {
- DEBUGADD(4,("Printer found: %s[%x]\n",lp_servicename(snum),snum));
- ZERO_STRUCT(pnum->dev.printername);
- strncpy(pnum->dev.printername, lp_servicename(snum), strlen(lp_servicename(snum)));
- free_a_printer(printer, 2);
- return True;
- break;
- }
- free_a_printer(printer, 2);
- }
- }
+ DEBUG(4,("Setting printer name=%s (len=%d)\n", printername, strlen(printername)));
- return False;
- break;
- case PRINTER_HANDLE_IS_PRINTSERVER:
- ZERO_STRUCT(pnum->dev.printerservername);
- strncpy(pnum->dev.printerservername, printername, strlen(printername));
+ if (Printer->printer_type==PRINTER_HANDLE_IS_PRINTSERVER) {
+ ZERO_STRUCT(Printer->dev.printerservername);
+ strncpy(Printer->dev.printerservername, printername, strlen(printername));
return True;
- break;
- default:
+ }
+
+ if (Printer->printer_type!=PRINTER_HANDLE_IS_PRINTER)
return False;
- break;
- }
-}
+
+ aprinter=strchr(printername+2, '\\');
+ aprinter++;
-/****************************************************************************
- return the snum of a printer corresponding to an handle
-****************************************************************************/
-static BOOL get_printer_snum(const POLICY_HND *hnd, int *number)
-{
- int snum;
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(hnd);
- int n_services=lp_numservices();
+ DEBUGADD(5,("searching for [%s] (len=%d)\n", aprinter, strlen(aprinter)));
+ /*
+ * store the Samba share name in it
+ * in back we have the long printer name
+ * need to iterate all the snum and do a
+ * get_a_printer each time to find the printer
+ * faster to do it here than later.
+ */
+
+ for (snum=0;snum<n_services && found==False;snum++) {
+
+ if ( !(lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) )
+ continue;
- if (INVALID_HANDLE(pnum))
+ DEBUGADD(5,("share:%s\n",lp_servicename(snum)));
+
+ if (get_a_printer(&printer, 2, lp_servicename(snum))!=0)
+ continue;
+
+ if ( strlen(printer.info_2->printername) != strlen(aprinter) ) {
+ free_a_printer(printer, 2);
+ continue;
+ }
+
+ if ( strncasecmp(printer.info_2->printername, aprinter, strlen(aprinter))) {
+ free_a_printer(printer, 2);
+ continue;
+ }
+
+ found=True;
+ }
+
+ if (found==False)
{
- DEBUG(3,("Error getting printer - take a nap quickly !\n"));
+ DEBUGADD(4,("Printer not found\n"));
return False;
}
- switch (pnum->printer_type)
- {
- case PRINTER_HANDLE_IS_PRINTER:
- DEBUG(4,("short name:%s\n", pnum->dev.printername));
- for (snum=0;snum<n_services; snum++)
- {
- if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
- {
- DEBUG(4,("share:%s\n",lp_servicename(snum)));
- if ( ( strlen(lp_servicename(snum)) == strlen( pnum->dev.printername ) )
- && ( !strncasecmp(lp_servicename(snum),
- pnum->dev.printername,
- strlen( lp_servicename(snum) )))
- )
- {
- DEBUG(4,("Printer found: %s[%x]\n",lp_servicename(snum),snum));
- *number=snum;
- return True;
- break;
- }
- }
- }
- return False;
- break;
- case PRINTER_HANDLE_IS_PRINTSERVER:
- return False;
- break;
- default:
- return False;
- break;
- }
+
+ snum--;
+ DEBUGADD(4,("Printer found: %s[%x]\n",lp_servicename(snum),snum));
+ ZERO_STRUCT(Printer->dev.printername);
+ strncpy(Printer->dev.printername, lp_servicename(snum), strlen(lp_servicename(snum)));
+ free_a_printer(printer, 2);
+
+ return True;
}
/********************************************************************
+ Return True is the handle is a print server.
********************************************************************/
static BOOL handle_is_printserver(const POLICY_HND *handle)
{
- PRINT_HND_INFO *pnum=find_printer_index_by_hnd(handle);
+ Printer_entry *Printer=find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(pnum))
- {
+ if (!OPEN_HANDLE(Printer))
return False;
- }
- switch (pnum->printer_type)
- {
- case PRINTER_HANDLE_IS_PRINTSERVER:
- {
- return True;
- }
- case PRINTER_HANDLE_IS_PRINTER:
- {
- return False;
- }
- }
- return False;
+
+ if (Printer->printer_type != PRINTER_HANDLE_IS_PRINTSERVER)
+ return False;
+
+ return True;
}
-/********************************************************************
- ********************************************************************/
-/*
-static BOOL handle_is_printer(POLICY_HND *handle)
+/****************************************************************************
+ allocate more memory for a BUFFER.
+****************************************************************************/
+static BOOL alloc_buffer_size(NEW_BUFFER *buffer, uint32 buffer_size)
{
- return (!handle_is_printserver(handle));
+ prs_struct *ps;
+ uint32 extra_space;
+ uint32 old_offset;
+
+ ps=&(buffer->prs);
+
+ /* damn, I'm doing the reverse operation of prs_grow() :) */
+ if (buffer_size < ps->data_size)
+ extra_space=0;
+ else
+ extra_space = buffer_size - ps->data_size;
+
+ /*
+ * save the offset and move to the end of the buffer
+ * prs_grow() checks the extra_space against the offset
+ */
+ old_offset=prs_offset(ps);
+ prs_set_offset(ps, ps->data_size);
+
+ if (!prs_grow(ps, extra_space))
+ return False;
+
+ prs_set_offset(ps, old_offset);
+
+ buffer->string_at_end=ps->data_size;
+
+ return True;
}
-*/
/********************************************************************
* spoolss_open_printer
@@ -468,24 +423,16 @@ static BOOL handle_is_printer(POLICY_HND *handle)
* called from the spoolss dispatcher
********************************************************************/
uint32 _spoolss_open_printer_ex( const UNISTR2 *printername,
-
- uint32 unknown0, uint32 cbbuf,
- uint32 devmod, uint32 access_required,
- uint32 unknown1, uint32 unknown2,
- uint32 unknown3, uint32 unknown4,
- uint32 unknown5, uint32 unknown6,
- uint32 unknown7, uint32 unknown8,
- uint32 unknown9, uint32 unknown10,
- const UNISTR2 *station, const UNISTR2 *username,
- POLICY_HND *handle)
+ const PRINTER_DEFAULT *printer_default,
+ uint32 user_switch, SPOOL_USER_CTR user_ctr,
+ POLICY_HND *handle)
{
- BOOL printer_open = False;
fstring name;
-
+
+ clear_handle(handle);
+
if (printername == NULL)
- {
return NT_STATUS_ACCESS_DENIED;
- }
/* some sanity check because you can open a printer or a print server */
/* aka: \\server\printer or \\server */
@@ -493,23 +440,118 @@ uint32 _spoolss_open_printer_ex( const UNISTR2 *printername,
DEBUGADD(3,("checking name: %s\n",name));
- printer_open = open_printer_hnd(handle, access_required);
- set_printer_hnd_printertype(handle, name);
+ create_printer_hnd(handle);
+
+ open_printer_hnd(handle);
- if ( !set_printer_hnd_printername(handle, name) )
- {
- if (close_printer_handle(handle))
- {
- return NT_STATUS_ACCESS_DENIED;
- }
- return NT_STATUS_INVALID_HANDLE;
+ if (!set_printer_hnd_printertype(handle, name)) {
+ close_printer_handle(handle);
+ return NT_STATUS_ACCESS_DENIED;
}
- set_printer_hnd_accesstype(handle, access_required);
+ if (!set_printer_hnd_printername(handle, name)) {
+ close_printer_handle(handle);
+ return NT_STATUS_ACCESS_DENIED;
+ }
- /* if there is a error free the printer entry */
+/*
+ if (printer_default->datatype_ptr != NULL)
+ {
+ unistr2_to_ascii(datatype, printer_default->datatype, sizeof(datatype)-1);
+ set_printer_hnd_datatype(handle, datatype);
+ }
+ else
+ set_printer_hnd_datatype(handle, "");
+*/
- return NT_STATUS_NOPROBLEMO;
+ if (!set_printer_hnd_accesstype(handle, printer_default->access_required)) {
+ close_printer_handle(handle);
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+****************************************************************************/
+static BOOL convert_printer_info(const SPOOL_PRINTER_INFO_LEVEL *uni,
+ NT_PRINTER_INFO_LEVEL *printer, uint32 level)
+{
+ switch (level) {
+ case 2:
+ uni_2_asc_printer_info_2(uni->info_2, &(printer->info_2));
+ break;
+ default:
+ break;
+ }
+
+ return True;
+}
+
+static BOOL convert_printer_driver_info(const SPOOL_PRINTER_DRIVER_INFO_LEVEL *uni,
+ NT_PRINTER_DRIVER_INFO_LEVEL *printer, uint32 level)
+{
+ switch (level) {
+ case 3:
+ printer->info_3=NULL;
+ uni_2_asc_printer_driver_3(uni->info_3, &(printer->info_3));
+ break;
+ default:
+ break;
+ }
+
+ return True;
+}
+
+static BOOL convert_devicemode(DEVICEMODE devmode, NT_DEVICEMODE *nt_devmode)
+{
+ unistr_to_ascii(nt_devmode->devicename, devmode.devicename.buffer, 31);
+ unistr_to_ascii(nt_devmode->formname, devmode.formname.buffer, 31);
+
+ nt_devmode->specversion=devmode.specversion;
+ nt_devmode->driverversion=devmode.driverversion;
+ nt_devmode->size=devmode.size;
+ nt_devmode->driverextra=devmode.driverextra;
+ nt_devmode->fields=devmode.fields;
+ nt_devmode->orientation=devmode.orientation;
+ nt_devmode->papersize=devmode.papersize;
+ nt_devmode->paperlength=devmode.paperlength;
+ nt_devmode->paperwidth=devmode.paperwidth;
+ nt_devmode->scale=devmode.scale;
+ nt_devmode->copies=devmode.copies;
+ nt_devmode->defaultsource=devmode.defaultsource;
+ nt_devmode->printquality=devmode.printquality;
+ nt_devmode->color=devmode.color;
+ nt_devmode->duplex=devmode.duplex;
+ nt_devmode->yresolution=devmode.yresolution;
+ nt_devmode->ttoption=devmode.ttoption;
+ nt_devmode->collate=devmode.collate;
+
+ nt_devmode->logpixels=devmode.logpixels;
+ nt_devmode->bitsperpel=devmode.bitsperpel;
+ nt_devmode->pelswidth=devmode.pelswidth;
+ nt_devmode->pelsheight=devmode.pelsheight;
+ nt_devmode->displayflags=devmode.displayflags;
+ nt_devmode->displayfrequency=devmode.displayfrequency;
+ nt_devmode->icmmethod=devmode.icmmethod;
+ nt_devmode->icmintent=devmode.icmintent;
+ nt_devmode->mediatype=devmode.mediatype;
+ nt_devmode->dithertype=devmode.dithertype;
+ nt_devmode->reserved1=devmode.reserved1;
+ nt_devmode->reserved2=devmode.reserved2;
+ nt_devmode->panningwidth=devmode.panningwidth;
+ nt_devmode->panningheight=devmode.panningheight;
+
+ if (nt_devmode->driverextra != 0)
+ {
+ /* if we had a previous private delete it and make a new one */
+ if (nt_devmode->private != NULL)
+ free(nt_devmode->private);
+ nt_devmode->private=(uint8 *)malloc(nt_devmode->driverextra * sizeof(uint8));
+ memcpy(nt_devmode->private, devmode.private, nt_devmode->driverextra);
+ }
+
+ return True;
}
/********************************************************************
@@ -517,104 +559,86 @@ uint32 _spoolss_open_printer_ex( const UNISTR2 *printername,
********************************************************************/
uint32 _spoolss_closeprinter(POLICY_HND *handle)
{
- if (close_printer_handle(handle))
- {
- return NT_STATUS_NOPROBLEMO;
- }
- return NT_STATUS_INVALID_HANDLE;
+ if (!close_printer_handle(handle))
+ return NT_STATUS_INVALID_HANDLE;
+
+ return NT_STATUS_NO_PROBLEMO;
}
/********************************************************************
- ********************************************************************/
-static BOOL getprinterdata_printer_server(fstring value, uint32 size, uint32 *type,
- uint32 *numeric_data, uint8 **data, uint32 *needed)
+ GetPrinterData on a printer server Handle.
+********************************************************************/
+static BOOL getprinterdata_printer_server(fstring value, uint32 *type, uint8 **data, uint32 *needed, uint32 in_size)
{
int i;
+
+ DEBUG(8,("getprinterdata_printer_server:%s\n", value));
if (!strcmp(value, "BeepEnabled"))
{
- *type = 0x4;
- *data = (uint8 *)malloc( 4*sizeof(uint8) );
- ZERO_STRUCTP(*data);
- (*data)[0]=0x01;
- (*data)[1]=0x00;
- (*data)[2]=0x00;
- (*data)[3]=0x00;
- *numeric_data = 0x1; /* beep enabled */
- *needed = 0x4;
+ *type = 0x4;
+ *data = (uint8 *)malloc( 4*sizeof(uint8) );
+ SIVAL(*data, 0, 0x01);
+ *needed = 0x4;
return True;
}
if (!strcmp(value, "EventLog"))
{
- *type = 0x4;
- *data = (uint8 *)malloc( 4*sizeof(uint8) );
- ZERO_STRUCTP(*data);
- (*data)[0]=0x1B;
- (*data)[1]=0x00;
- (*data)[2]=0x00;
- (*data)[3]=0x00;
- *numeric_data = 0x1B; /* Don't know ??? */
- *needed = 0x4;
+ *type = 0x4;
+ *data = (uint8 *)malloc( 4*sizeof(uint8) );
+ SIVAL(*data, 0, 0x1B);
+ *needed = 0x4;
return True;
}
if (!strcmp(value, "NetPopup"))
{
- *type = 0x4;
- *data = (uint8 *)malloc( 4*sizeof(uint8) );
- ZERO_STRUCTP(*data);
- (*data)[0]=0x01;
- (*data)[1]=0x00;
- (*data)[2]=0x00;
- (*data)[3]=0x00;
- *numeric_data = 0x1; /* popup enabled */
- *needed = 0x4;
+ *type = 0x4;
+ *data = (uint8 *)malloc( 4*sizeof(uint8) );
+ SIVAL(*data, 0, 0x01);
+ *needed = 0x4;
return True;
}
if (!strcmp(value, "MajorVersion"))
{
- *type = 0x4;
- *data = (uint8 *)malloc( 4*sizeof(uint8) );
- (*data)[0]=0x02;
- (*data)[1]=0x00;
- (*data)[2]=0x00;
- (*data)[3]=0x00;
- *numeric_data = 0x2; /* it's 2, period. */
- *needed = 0x4;
+ *type = 0x4;
+ *data = (uint8 *)malloc( 4*sizeof(uint8) );
+ SIVAL(*data, 0, 0x02);
+ *needed = 0x4;
return True;
}
if (!strcmp(value, "DefaultSpoolDirectory"))
{
- pstring directory="You are using a Samba server";
+ pstring string="You are using a Samba server";
*type = 0x1;
- *data = (uint8 *)malloc( size*sizeof(uint8) );
- ZERO_STRUCTP(*data);
+ *needed = 2*(strlen(string)+1);
+ *data = (uint8 *)malloc( ((*needed > in_size) ? *needed:in_size) *sizeof(uint8));
+ memset(*data, 0, (*needed > in_size) ? *needed:in_size);
/* it's done by hand ready to go on the wire */
- for (i=0; i<strlen(directory); i++)
+ for (i=0; i<strlen(string); i++)
{
- (*data)[2*i]=directory[i];
+ (*data)[2*i]=string[i];
(*data)[2*i+1]='\0';
}
- *needed = 2*(strlen(directory)+1);
return True;
}
if (!strcmp(value, "Architecture"))
{
- pstring directory="Windows NT x86";
+ pstring string="Windows NT x86";
*type = 0x1;
- *data = (uint8 *)malloc( size*sizeof(uint8) );
- ZERO_STRUCTP(*data);
- for (i=0; i<strlen(directory); i++)
+ *needed = 2*(strlen(string)+1);
+ *data = (uint8 *)malloc( ((*needed > in_size) ? *needed:in_size) *sizeof(uint8));
+ memset(*data, 0, (*needed > in_size) ? *needed:in_size);
+ for (i=0; i<strlen(string); i++)
{
- (*data)[2*i]=directory[i];
+ (*data)[2*i]=string[i];
(*data)[2*i+1]='\0';
}
- *needed = 2*(strlen(directory)+1);
return True;
}
@@ -622,118 +646,93 @@ static BOOL getprinterdata_printer_server(fstring value, uint32 size, uint32 *ty
}
/********************************************************************
- ********************************************************************/
+ GetPrinterData on a printer Handle.
+********************************************************************/
static BOOL getprinterdata_printer(const POLICY_HND *handle,
- fstring value, uint32 size, uint32 *type,
- uint32 *numeric_data, uint8 **data,
- uint32 *needed )
+ fstring value, uint32 *type,
+ uint8 **data, uint32 *needed, uint32 in_size )
{
NT_PRINTER_INFO_LEVEL printer;
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(handle);
int snum=0;
uint8 *idata=NULL;
uint32 len;
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
DEBUG(5,("getprinterdata_printer\n"));
- if (INVALID_HANDLE(pnum))
- {
- return (False);
- }
-
- get_printer_snum(handle, &snum);
- get_a_printer(&printer, 2, lp_servicename(snum));
-
- if (get_specific_param(printer, 2, value, &idata, type, &len))
+ if (OPEN_HANDLE(Printer))
{
- /*switch (*type)
+ get_printer_snum(handle, &snum);
+ get_a_printer(&printer, 2, lp_servicename(snum));
+
+ if (get_specific_param(printer, 2, value, &idata, type, &len))
{
- case 1:
- case 3:
- case 4:*/
- *data = (uint8 *)malloc( size*sizeof(uint8) );
- bzero(*data, sizeof(uint8)*size);
- memcpy(*data, idata, len>size?size:len);
- *needed = len;
- if (idata) free(idata);
- /*break;*/
- /*case 4:
- *numeric_data=atoi(idata);
- break;*/
- /*}*/
- return (True);
+ *data = (uint8 *)malloc( (len>in_size)?len:in_size *sizeof(uint8) );
+ memset(*data, 0, sizeof(uint8)*len);
+ memcpy(*data, idata, (len>in_size)?len:in_size);
+ *needed = len;
+
+ if (idata) free(idata);
+ return (True);
+ }
+ free_a_printer(printer, 2);
}
- free_a_printer(printer, 2);
- return False;
+ return (False);
}
/********************************************************************
* spoolss_getprinterdata
********************************************************************/
uint32 _spoolss_getprinterdata(const POLICY_HND *handle, UNISTR2 *valuename,
+ uint32 in_size,
uint32 *type,
- uint32 *size,
+ uint32 *out_size,
uint8 **data,
- uint32 *numeric_data,
uint32 *needed)
{
fstring value;
- BOOL found;
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(handle);
+ BOOL found=False;
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
/*
* Reminder: when it's a string, the length is in BYTES
* even if UNICODE is negociated.
*
- * type is the kind of data
- * 1 is a string
- * 4 is a uint32
- *
- * I think it's documented in MSDN somewhere in
- * the registry data type (yep it's linked ...)
- *
* JFM, 4/19/1999
*/
- if (INVALID_HANDLE(pnum))
- {
+ *out_size=in_size;
+
+ /* in case of problem, return some default values */
+ *needed=0;
+ *type=0;
+
+ DEBUG(4,("_spoolss_getprinterdata\n"));
+
+ if (!OPEN_HANDLE(Printer)) {
+ *data=(uint8 *)malloc(4*sizeof(uint8));
return NT_STATUS_INVALID_HANDLE;
}
-
- (*type) = 0x4;
- (*needed) = 0x0;
- (*data) = NULL;
- (*numeric_data) =0x0;
unistr2_to_ascii(value, valuename, sizeof(value)-1);
if (handle_is_printserver(handle))
- {
- found=getprinterdata_printer_server(value, *size,
- type, numeric_data,
- data, needed);
- }
+ found=getprinterdata_printer_server(value, type, data, needed, *out_size);
else
- {
- found=getprinterdata_printer(handle, value, *size,
- type, numeric_data,
- data, needed);
- }
+ found=getprinterdata_printer(handle, value, type, data, needed, *out_size);
- if (found==False)
- {
- safe_free(data);
+ if (found==False) {
/* reply this param doesn't exist */
- (*type) = 0x4;
- (*size) = 0x0;
- (*data) = NULL;
- (*numeric_data)=0x0;
- (*needed) = 0x0;
+ *data=(uint8 *)malloc(4*sizeof(uint8));
+ memset(*data, 0x0, 4);
return ERROR_INVALID_PARAMETER;
}
-
- return NT_STATUS_NOPROBLEMO;
+
+ if (*needed > *out_size)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
}
/********************************************************************
@@ -747,43 +746,24 @@ uint32 _spoolss_getprinterdata(const POLICY_HND *handle, UNISTR2 *valuename,
* in fact ReplyOpenPrinter is the changenotify equivalent on the spoolss pipe
* called from api_spoolss_rffpcnex
********************************************************************/
-uint32 _spoolss_rffpcnex(const POLICY_HND *handle,
- uint32 flags, uint32 options,
- const UNISTR2 *localmachine,
- uint32 printerlocal,
- SPOOL_NOTIFY_OPTION *option)
+uint32 _spoolss_rffpcnex(const POLICY_HND *handle, uint32 flags, uint32 options,
+ const UNISTR2 *localmachine, uint32 printerlocal,
+ SPOOL_NOTIFY_OPTION *option)
{
- PRINT_HND_INFO *i;
- int j, k;
-
/* store the notify value in the printer struct */
- i=find_printer_index_by_hnd(handle);
+ Printer_entry *Printer=find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(i))
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
-
- i->number_of_notify=option->count;
-
- DEBUG(3,("Copying %x notify option info\n",i->number_of_notify));
- for (j=0;j<i->number_of_notify;j++)
- {
- i->notify_info[j].count=option->type[j].count;
- i->notify_info[j].type=option->type[j].type ;
-
- DEBUG(4,("Copying %x info fields of type %x\n",
- i->notify_info[j].count,
- i->notify_info[j].type));
- for(k=0;k<i->notify_info[j].count;k++)
- {
- i->notify_info[j].fields[k]=option->type[j].fields[k];
- }
- }
+ Printer->notify.flags=flags;
+ Printer->notify.options=options;
+ Printer->notify.printerlocal=printerlocal;
+ Printer->notify.option=option;
+ unistr2_to_ascii(Printer->notify.localmachine, localmachine, sizeof(Printer->notify.localmachine)-1);
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_NO_PROBLEMO;
}
/*******************************************************************
@@ -996,10 +976,8 @@ static void spoolss_notify_status(int snum, SPOOL_NOTIFY_INFO_DATA *data, print_
print_queue_struct *q=NULL;
print_status_struct status;
- bzero(&status,sizeof(status));
-
+ memset(&status, 0, sizeof(status));
count=get_printqueue(snum, NULL, UID_FIELD_INVALID, &q, &status);
-
data->notify_data.value[0]=(uint32) status.status;
if (q) free(q);
}
@@ -1012,8 +990,7 @@ static void spoolss_notify_cjobs(int snum, SPOOL_NOTIFY_INFO_DATA *data, print_q
print_queue_struct *q=NULL;
print_status_struct status;
- bzero(&status,sizeof(status));
-
+ memset(&status, 0, sizeof(status));
data->notify_data.value[0]=get_printqueue(snum, NULL, UID_FIELD_INVALID, &q, &status);
if (q) free(q);
}
@@ -1198,40 +1175,30 @@ static int search_notify(uint16 type, uint16 field, int *value)
int j;
BOOL found;
- DEBUG(4,("\tsearch_notify: in\n"));
for (j=0, found=False; found==False && notify_info_data_table[j].type != END ; j++)
{
if ( (notify_info_data_table[j].type == type ) &&
(notify_info_data_table[j].field == field ) )
- {
found=True;
- }
}
*value=--j;
if ( found && (notify_info_data_table[j].fn != NULL) )
- {
- DEBUG(4,("\tsearch_notify: out TRUE\n"));
- return (True);
- }
+ return True;
else
- {
- DEBUG(4,("\tsearch_notify: out FALSE\n"));
- return (False);
- }
+ return False;
}
/****************************************************************************
****************************************************************************/
static void construct_info_data(SPOOL_NOTIFY_INFO_DATA *info_data, uint16 type, uint16 field, int id)
{
- DEBUG(4,("\tconstruct_info_data: in\n"));
info_data->type = type;
info_data->field = field;
+ info_data->reserved = 0;
info_data->id = id;
info_data->size = size_of_notify_info_data(type, field);
info_data->enc_type = type_of_notify_info_data(type, field);
- DEBUG(4,("\tconstruct_info_data: out\n"));
}
@@ -1240,49 +1207,48 @@ static void construct_info_data(SPOOL_NOTIFY_INFO_DATA *info_data, uint16 type,
* fill a notify_info struct with info asked
*
********************************************************************/
-static void construct_notify_printer_info(SPOOL_NOTIFY_INFO *info, PRINT_HND_INFO *pnum,
- int snum, int i, uint32 id)
+static BOOL construct_notify_printer_info(SPOOL_NOTIFY_INFO *info, int snum, SPOOL_NOTIFY_OPTION_TYPE *option_type, uint32 id)
{
-
- int k,j;
+ int field_num,j;
uint16 type;
uint16 field;
- SPOOL_NOTIFY_INFO_DATA *info_data;
- print_queue_struct *queue=NULL;
+ SPOOL_NOTIFY_INFO_DATA *current_data;
NT_PRINTER_INFO_LEVEL printer;
+ print_queue_struct *queue=NULL;
DEBUG(4,("construct_notify_printer_info\n"));
- info_data=&(info->data[info->count]);
-
- type = pnum->notify_info[i].type;
+ type=option_type->type;
- DEBUGADD(4,("Notify number %d -> number of notify info: %d\n",i,pnum->notify_info[i].count));
+ DEBUGADD(4,("Notify type: [%s], number of notify info: [%d] on printer: [%s]\n",
+ (option_type->type==PRINTER_NOTIFY_TYPE?"PRINTER_NOTIFY_TYPE":"JOB_NOTIFY_TYPE"),
+ option_type->count, lp_servicename(snum)));
- if (!get_a_printer(&printer, 2, lp_servicename(snum)))
+ if (get_a_printer(&printer, 2, lp_servicename(snum))!=0)
+ {
+ return False;
+ }
+
+ for(field_num=0; field_num<option_type->count; field_num++)
{
+ field = option_type->fields[field_num];
+ DEBUGADD(4,("notify [%d]: type [%x], field [%x]\n", field_num, type, field));
+
+ if (!search_notify(type, field, &j) )
+ continue;
- for(k=0; k<pnum->notify_info[i].count; k++)
- {
- field = pnum->notify_info[i].fields[k];
- DEBUGADD(4,("notify [%d]: type [%x], field [%x]\n", k, type, field));
+ info->data=Realloc(info->data, (info->count+1)*sizeof(SPOOL_NOTIFY_INFO_DATA));
+ current_data=&(info->data[info->count]);
- if (search_notify(type, field, &j) )
- {
- DEBUGADD(4,("j=[%d]:%s\n", j, notify_info_data_table[j].name));
- construct_info_data(info_data, type, field, id);
-
- DEBUGADD(4,("notify_info_data_table: in\n"));
- notify_info_data_table[j].fn(snum, info_data, queue, &printer);
- DEBUGADD(4,("notify_info_data_table: out\n"));
- info->count++;
- info_data=&(info->data[info->count]);
- }
- }
-
- free_a_printer(printer, 2);
+ construct_info_data(current_data, type, field, id);
+ notify_info_data_table[j].fn(snum, current_data, queue, &printer);
+
+ info->count++;
}
+
+ free_a_printer(printer, 2);
+ return True;
}
/*******************************************************************
@@ -1290,46 +1256,72 @@ static void construct_notify_printer_info(SPOOL_NOTIFY_INFO *info, PRINT_HND_INF
* fill a notify_info struct with info asked
*
********************************************************************/
-static void construct_notify_jobs_info(print_queue_struct *queue, SPOOL_NOTIFY_INFO *info,
- PRINT_HND_INFO *pnum, int snum, int i, uint32 id)
+static BOOL construct_notify_jobs_info(print_queue_struct *queue, SPOOL_NOTIFY_INFO *info, int snum, SPOOL_NOTIFY_OPTION_TYPE *option_type, uint32 id)
{
-
- int k,j;
+ int field_num,j;
uint16 type;
uint16 field;
- SPOOL_NOTIFY_INFO_DATA *info_data;
+ SPOOL_NOTIFY_INFO_DATA *current_data;
NT_PRINTER_INFO_LEVEL printer;
DEBUG(4,("construct_notify_jobs_info\n"));
- info_data=&(info->data[info->count]);
- type = pnum->notify_info[i].type;
+ type = option_type->type;
- DEBUGADD(4,("Notify number %d -> number of notify info: %d\n",i,pnum->notify_info[i].count));
+ DEBUGADD(4,("Notify type: [%s], number of notify info: [%d]\n",
+ (option_type->type==PRINTER_NOTIFY_TYPE?"PRINTER_NOTIFY_TYPE":"JOB_NOTIFY_TYPE"),
+ option_type->count));
- if (!get_a_printer(&printer, 2, lp_servicename(snum)))
+ if (get_a_printer(&printer, 2, lp_servicename(snum))!=0)
{
- for(k=0; k<pnum->notify_info[i].count; k++)
- {
- field = pnum->notify_info[i].fields[k];
- DEBUGADD(4,("notify [%d]: type [%x], field [%x]\n",k, type, field));
+ return False;
+ }
+
+ for(field_num=0; field_num<option_type->count; field_num++)
+ {
+ field = option_type->fields[field_num];
- if (search_notify(type, field, &j) )
- {
- DEBUGADD(4,("j=[%d]:%s\n", j, notify_info_data_table[j].name));
- construct_info_data(info_data, type, field, id);
- DEBUGADD(4,("notify_info_data_table: in\n"));
- notify_info_data_table[j].fn(snum, info_data, queue, &printer);
- DEBUGADD(4,("notify_info_data_table: out\n"));
- info->count++;
- info_data=&(info->data[info->count]);
- }
- }
- free_a_printer(printer, 2);
+ if (!search_notify(type, field, &j) )
+ continue;
+
+ info->data=Realloc(info->data, (info->count+1)*sizeof(SPOOL_NOTIFY_INFO_DATA));
+ current_data=&(info->data[info->count]);
+
+ construct_info_data(current_data, type, field, id);
+ notify_info_data_table[j].fn(snum, current_data, queue, &printer);
+ info->count++;
}
+
+ free_a_printer(printer, 2);
+
+ return True;
}
+/*
+ * JFM: The enumeration is not that simple, it's even non obvious.
+ *
+ * let's take an example: I want to monitor the PRINTER SERVER for
+ * the printer's name and the number of jobs currently queued.
+ * So in the NOTIFY_OPTION, I have one NOTIFY_OPTION_TYPE structure.
+ * Its type is PRINTER_NOTIFY_TYPE and it has 2 fields NAME and CJOBS.
+ *
+ * I have 3 printers on the back of my server.
+ *
+ * Now the response is a NOTIFY_INFO structure, with 6 NOTIFY_INFO_DATA
+ * structures.
+ * Number Data Id
+ * 1 printer 1 name 1
+ * 2 printer 1 cjob 1
+ * 3 printer 2 name 2
+ * 4 printer 2 cjob 2
+ * 5 printer 3 name 3
+ * 6 printer 3 name 3
+ *
+ * that's the print server case, the printer case is even worse.
+ */
+
+
/*******************************************************************
*
@@ -1337,40 +1329,54 @@ static void construct_notify_jobs_info(print_queue_struct *queue, SPOOL_NOTIFY_I
* fill a notify_info struct with info asked
*
********************************************************************/
-static uint32 printserver_notify_info(const POLICY_HND *hnd,
- SPOOL_NOTIFY_INFO *info)
+static uint32 printserver_notify_info(const POLICY_HND *hnd, SPOOL_NOTIFY_INFO *info)
{
int snum;
- PRINT_HND_INFO *pnum=find_printer_index_by_hnd(hnd);
+ Printer_entry *Printer=find_printer_index_by_hnd(hnd);
int n_services=lp_numservices();
- int i=0;
- uint32 id=1;
+ int i;
+ uint32 id;
+ SPOOL_NOTIFY_OPTION *option;
+ SPOOL_NOTIFY_OPTION_TYPE *option_type;
+
+ DEBUG(4,("printserver_notify_info\n"));
+
+ option=Printer->notify.option;
+ id=1;
+ info->version=2;
+ info->data=NULL;
info->count=0;
- if (INVALID_HANDLE(pnum))
+ for (i=0; i<option->count; i++)
{
- return NT_STATUS_INVALID_HANDLE;
+ option_type=&(option->ctr.type[i]);
+
+ if (option_type->type!=PRINTER_NOTIFY_TYPE)
+ continue;
+
+ for (snum=0; snum<n_services; snum++)
+ if ( lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
+ if (construct_notify_printer_info(info, snum, option_type, id))
+ id++;
}
-
- DEBUG(4,("Enumerating printers\n"));
-
- for (i=0; i<pnum->number_of_notify; i++)
+
+ /*
+ * Debugging information, don't delete.
+ */
+ /*
+ DEBUG(1,("dumping the NOTIFY_INFO\n"));
+ DEBUGADD(1,("info->version:[%d], info->flags:[%d], info->count:[%d]\n", info->version, info->flags, info->count));
+ DEBUGADD(1,("num\ttype\tfield\tres\tid\tsize\tenc_type\n"));
+
+ for (i=0; i<info->count; i++)
{
- if ( pnum->notify_info[i].type == PRINTER_NOTIFY_TYPE )
- {
- for (snum=0; snum<n_services; snum++)
- {
- if ( lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
- {
- construct_notify_printer_info(info, pnum, snum, i, id);
- id++;
- }
- }
- }
+ DEBUGADD(1,("[%d]\t[%d]\t[%d]\t[%d]\t[%d]\t[%d]\t[%d]\n",
+ i, info->data[i].type, info->data[i].field, info->data[i].reserved,
+ info->data[i].id, info->data[i].size, info->data[i].enc_type));
}
- DEBUG(4,("All printers enumerated\n"));
-
- return NT_STATUS_NOPROBLEMO;
+ */
+
+ return NT_STATUS_NO_PROBLEMO;
}
/*******************************************************************
@@ -1378,82 +1384,104 @@ static uint32 printserver_notify_info(const POLICY_HND *hnd,
* fill a notify_info struct with info asked
*
********************************************************************/
-static uint32 printer_notify_info(const POLICY_HND *hnd,
- SPOOL_NOTIFY_INFO *info)
+static uint32 printer_notify_info(const POLICY_HND *hnd, SPOOL_NOTIFY_INFO *info)
{
int snum;
- PRINT_HND_INFO *pnum=find_printer_index_by_hnd(hnd);
- int i=0, j;
- uint32 id=0xFFFF;
+ Printer_entry *Printer=find_printer_index_by_hnd(hnd);
+ int i;
+ uint32 id;
+ SPOOL_NOTIFY_OPTION *option;
+ SPOOL_NOTIFY_OPTION_TYPE *option_type;
+ int count,j;
+ print_queue_struct *queue=NULL;
+ print_status_struct status;
+ DEBUG(4,("printer_notify_info\n"));
+
+ option=Printer->notify.option;
+ id=1;
+ info->version=2;
+ info->data=NULL;
info->count=0;
- if (INVALID_HANDLE(pnum) || !get_printer_snum(hnd, &snum) )
- {
- return NT_STATUS_INVALID_HANDLE;
- }
+ get_printer_snum(hnd, &snum);
- for (i=0; i<pnum->number_of_notify; i++)
+ for (i=0; i<option->count; i++)
{
- switch ( pnum->notify_info[i].type )
- {
- case PRINTER_NOTIFY_TYPE:
- {
- construct_notify_printer_info(info, pnum, snum, i, id);
- id--;
- break;
- }
- case JOB_NOTIFY_TYPE:
- {
- int count;
- print_queue_struct *queue=NULL;
- print_status_struct status;
- bzero(&status, sizeof(status));
- count=get_printqueue(snum, NULL, UID_FIELD_INVALID, &queue, &status);
- for (j=0; j<count; j++)
- {
- construct_notify_jobs_info(&(queue[j]), info, pnum, snum, i, queue[j].job);
+ option_type=&(option->ctr.type[i]);
+
+ switch ( option_type->type ) {
+ case PRINTER_NOTIFY_TYPE:
+ if(construct_notify_printer_info(info, snum, option_type, id))
+ id++;
+ break;
+
+ case JOB_NOTIFY_TYPE:
+ memset(&status, 0, sizeof(status));
+ count=get_printqueue(snum, NULL, UID_FIELD_INVALID, &queue, &status);
+ for (j=0; j<count; j++)
+ if (construct_notify_jobs_info(&(queue[j]), info, snum, option_type, id))
+ id++;
+ safe_free(queue);
+ break;
}
- safe_free(queue);
- break;
- }
- }
}
-
- return NT_STATUS_NOPROBLEMO;
+
+ /*
+ * Debugging information, don't delete.
+ */
+ /*
+ DEBUG(1,("dumping the NOTIFY_INFO\n"));
+ DEBUGADD(1,("info->version:[%d], info->flags:[%d], info->count:[%d]\n", info->version, info->flags, info->count));
+ DEBUGADD(1,("num\ttype\tfield\tres\tid\tsize\tenc_type\n"));
+
+ for (i=0; i<info->count; i++)
+ {
+ DEBUGADD(1,("[%d]\t[%d]\t[%d]\t[%d]\t[%d]\t[%d]\t[%d]\n",
+ i, info->data[i].type, info->data[i].field, info->data[i].reserved,
+ info->data[i].id, info->data[i].size, info->data[i].enc_type));
+ }
+ */
+ return NT_STATUS_NO_PROBLEMO;
}
/********************************************************************
* spoolss_rfnpcnex
********************************************************************/
-uint32 _spoolss_rfnpcnex( const POLICY_HND *handle,
- uint32 change,
- const SPOOL_NOTIFY_OPTION *option,
- uint32 *count,
- SPOOL_NOTIFY_INFO *info)
+uint32 _spoolss_rfnpcnex( const POLICY_HND *handle, uint32 change,
+ SPOOL_NOTIFY_OPTION *option, SPOOL_NOTIFY_INFO *info)
{
- PRINT_HND_INFO *pnum=find_printer_index_by_hnd(handle);
+ Printer_entry *Printer=find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(pnum))
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
- DEBUG(4,("Printer of type %x\n",pnum->printer_type));
+ DEBUG(4,("Printer type %x\n",Printer->printer_type));
+
+ /* jfm: the change value isn't used right now.
+ * we will honour it when
+ * a) we'll be able to send notification to the client
+ * b) we'll have a way to communicate between the spoolss process.
+ *
+ * same thing for option->flags
+ * I should check for PRINTER_NOTIFY_OPTIONS_REFRESH but as
+ * I don't have a global notification system, I'm sending back all the
+ * informations even when _NOTHING_ has changed.
+ */
- /* lkxlXXXX - jfm, is this right? put a warning in for you to review! */
- DEBUG(0,("_spoolss_rfnpcnex: change, option and count ignored\n"));
+ /* just discard the SPOOL_NOTIFY_OPTION */
+ if (option!=NULL)
+ safe_free(option->ctr.type);
+
+ safe_free(option);
- switch (pnum->printer_type)
- {
+ switch (Printer->printer_type) {
case PRINTER_HANDLE_IS_PRINTSERVER:
- {
return printserver_notify_info(handle, info);
- }
+ break;
case PRINTER_HANDLE_IS_PRINTER:
- {
return printer_notify_info(handle, info);
- }
+ break;
}
return NT_STATUS_INVALID_INFO_CLASS;
@@ -1471,7 +1499,7 @@ static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer,int snum, pstring s
print_queue_struct *queue=NULL;
print_status_struct status;
- bzero(&status,sizeof(status));
+ memset(&status, 0, sizeof(status));
if (get_a_printer(&ntprinter, 2, lp_servicename(snum)) != 0)
{
@@ -1483,10 +1511,10 @@ static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer,int snum, pstring s
/* the description and the name are of the form \\server\share */
slprintf(chaine,sizeof(chaine)-1,"\\\\%s\\%s",servername, ntprinter.info_2->printername);
- make_unistr(&(printer->printername), chaine);
+ init_unistr(&(printer->printername), chaine);
slprintf(chaine,sizeof(chaine)-1,"\\\\%s", servername);
- make_unistr(&(printer->servername), chaine);
+ init_unistr(&(printer->servername), chaine);
printer->cjobs = count;
printer->attributes = PRINTER_ATTRIBUTE_SHARED \
@@ -1511,7 +1539,7 @@ static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer,int snum, pstring s
printer->unknown14 = 0x1;
printer->unknown15 = 0x024a; /*586 Pentium ? */
printer->unknown16 = 0x0;
- printer->unknown17 = 0x423ed444;
+ printer->unknown17 = 0x423ed444; /* CacheChangeID */
printer->unknown18 = 0x0;
printer->status = status.status;
printer->unknown20 = 0x0;
@@ -1529,9 +1557,10 @@ static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer,int snum, pstring s
* construct_printer_info_1
* fill a printer_info_1 struct
********************************************************************/
-static BOOL construct_printer_info_1(PRINTER_INFO_1 *printer,int snum, pstring servername)
+static BOOL construct_printer_info_1(PRINTER_INFO_1 *printer, int snum, pstring servername)
{
pstring chaine;
+ pstring chaine2;
NT_PRINTER_INFO_LEVEL ntprinter;
if (get_a_printer(&ntprinter, 2, lp_servicename(snum)) != 0)
@@ -1539,21 +1568,23 @@ static BOOL construct_printer_info_1(PRINTER_INFO_1 *printer,int snum, pstring s
return (False);
}
- printer->flags=PRINTER_ENUM_NAME;
+ printer->flags=PRINTER_ENUM_ICON8;
/* the description and the name are of the form \\server\share */
- slprintf(chaine,sizeof(chaine)-1,"\\\\%s\\%s,%s,%s",servername,
+
+ snprintf(chaine,sizeof(chaine)-1,"\\\\%s\\%s,%s,%s",servername,
ntprinter.info_2->printername,
ntprinter.info_2->drivername,
lp_comment(snum));
- make_unistr(&(printer->description), chaine);
+ init_unistr(&(printer->description), chaine);
- slprintf(chaine,sizeof(chaine)-1,"\\\\%s\\%s", servername, ntprinter.info_2->printername);
- make_unistr(&(printer->name), chaine);
+ snprintf(chaine2,sizeof(chaine)-1,"\\\\%s\\%s", servername, ntprinter.info_2->printername);
+ init_unistr(&(printer->name), chaine2);
- make_unistr(&(printer->comment), lp_comment(snum));
+ init_unistr(&(printer->comment), lp_comment(snum));
free_a_printer(ntprinter, 2);
+
return (True);
}
@@ -1568,8 +1599,8 @@ static void construct_dev_mode(DEVICEMODE *devmode, int snum, char *servername)
DEBUG(7,("construct_dev_mode\n"));
- bzero(&(devmode->devicename), 2*sizeof(adevice));
- bzero(&(devmode->formname), 2*sizeof(aform));
+ memset(&(devmode->devicename), 0, 2*sizeof(adevice));
+ memset(&(devmode->formname), 0, 2*sizeof(aform));
DEBUGADD(8,("getting printer characteristics\n"));
@@ -1579,10 +1610,10 @@ static void construct_dev_mode(DEVICEMODE *devmode, int snum, char *servername)
DEBUGADD(8,("loading DEVICEMODE\n"));
snprintf(adevice, sizeof(adevice), "\\\\%s\\%s", global_myname,
printer.info_2->printername);
- make_unistr(&(devmode->devicename), adevice);
+ init_unistr(&(devmode->devicename), adevice);
snprintf(aform, sizeof(aform), ntdevmode->formname);
- make_unistr(&(devmode->formname), aform);
+ init_unistr(&(devmode->formname), aform);
devmode->specversion = ntdevmode->specversion;
devmode->driverversion = ntdevmode->driverversion;
@@ -1630,7 +1661,7 @@ static BOOL construct_printer_info_2(PRINTER_INFO_2 *printer, int snum, pstring
print_queue_struct *queue=NULL;
print_status_struct status;
- bzero(&status, sizeof(status));
+ memset(&status, 0, sizeof(status));
count=get_printqueue(snum, NULL, UID_FIELD_INVALID, &queue, &status);
if (get_a_printer(&ntprinter, 2, lp_servicename(snum)) !=0 )
@@ -1639,22 +1670,22 @@ static BOOL construct_printer_info_2(PRINTER_INFO_2 *printer, int snum, pstring
}
snprintf(chaine, sizeof(chaine)-1, "\\\\%s", servername);
- make_unistr(&(printer->servername), chaine); /* servername*/
+ init_unistr(&(printer->servername), chaine); /* servername*/
snprintf(chaine, sizeof(chaine)-1, "\\\\%s\\%s", servername, ntprinter.info_2->printername);
- make_unistr(&(printer->printername), chaine); /* printername*/
+ init_unistr(&(printer->printername), chaine); /* printername*/
- make_unistr(&(printer->sharename), lp_servicename(snum)); /* sharename */
+ init_unistr(&(printer->sharename), lp_servicename(snum)); /* sharename */
- make_unistr(&(printer->portname), lp_servicename(snum)); /* port */
- make_unistr(&(printer->drivername), ntprinter.info_2->drivername); /* drivername */
+ init_unistr(&(printer->portname), lp_servicename(snum)); /* port */
+ init_unistr(&(printer->drivername), ntprinter.info_2->drivername); /* drivername */
- make_unistr(&(printer->comment), ntprinter.info_2->comment); /* comment */
- make_unistr(&(printer->location), ntprinter.info_2->location); /* location */
- make_unistr(&(printer->sepfile), ntprinter.info_2->sepfile); /* separator file */
- make_unistr(&(printer->printprocessor), ntprinter.info_2->printprocessor);/* print processor */
- make_unistr(&(printer->datatype), ntprinter.info_2->datatype); /* datatype */
- make_unistr(&(printer->parameters), ntprinter.info_2->parameters); /* parameters (of print processor) */
+ init_unistr(&(printer->comment), ntprinter.info_2->comment); /* comment */
+ init_unistr(&(printer->location), ntprinter.info_2->location); /* location */
+ init_unistr(&(printer->sepfile), ntprinter.info_2->sepfile); /* separator file */
+ init_unistr(&(printer->printprocessor), ntprinter.info_2->printprocessor);/* print processor */
+ init_unistr(&(printer->datatype), ntprinter.info_2->datatype); /* datatype */
+ init_unistr(&(printer->parameters), ntprinter.info_2->parameters); /* parameters (of print processor) */
printer->attributes = PRINTER_ATTRIBUTE_SHARED \
| PRINTER_ATTRIBUTE_NETWORK \
@@ -1682,29 +1713,26 @@ static BOOL construct_printer_info_2(PRINTER_INFO_2 *printer, int snum, pstring
* enum_printer_info_1
* glue between spoolss_enumprinters and construct_printer_info_1
********************************************************************/
-static BOOL enum_printer_info_1(PRINTER_INFO_1 **printer, int snum, int number)
+static BOOL get_printer_info_1(PRINTER_INFO_1 **printer, int snum, int number)
{
pstring servername;
*printer=(PRINTER_INFO_1 *)malloc(sizeof(PRINTER_INFO_1));
DEBUG(4,("Allocated memory for ONE PRINTER_INFO_1 at [%p]\n", *printer));
pstrcpy(servername, global_myname);
- if (!construct_printer_info_1(*printer, snum, servername))
- {
+ if (!construct_printer_info_1(*printer, snum, servername)) {
free(*printer);
- return (False);
+ return False;
}
else
- {
- return (True);
- }
+ return True;
}
/********************************************************************
* enum_printer_info_2
* glue between spoolss_enumprinters and construct_printer_info_2
********************************************************************/
-static BOOL enum_printer_info_2(PRINTER_INFO_2 **printer, int snum, int number)
+static BOOL get_printer_info_2(PRINTER_INFO_2 **printer, int snum, int number)
{
pstring servername;
@@ -1727,26 +1755,100 @@ static BOOL enum_printer_info_2(PRINTER_INFO_2 **printer, int snum, int number)
*
* called from api_spoolss_enumprinters (see this to understand)
********************************************************************/
-static void enum_all_printers_info_1(PRINTER_INFO_1 ***printers, uint32 *number)
+static BOOL enum_printer_info_1(fstring name, NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ int snum;
+ int i;
+ int n_services=lp_numservices();
+ PRINTER_INFO_1 *printer=NULL;
+DEBUG(1,("enum_printer_info_1\n"));
+ for (snum=0; snum<n_services; snum++) {
+ if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
+ DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", lp_servicename(snum), snum));
+
+ /*
+ JFM: here we should check the name
+
+ */
+
+ if (get_printer_info_1(&printer , snum, *returned) )
+ (*returned)++;
+ }
+ }
+
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ (*needed) += spoolss_size_printer_info_1(printer);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+
+ for (i=0; i<*returned; i++)
+ new_smb_io_printer_info_1("", buffer, printer, 0);
+
+ /* clear memory */
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/********************************************************************
+ Spoolss_enumprinters.
+********************************************************************/
+static BOOL enum_all_printers_info_1(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
{
int snum;
+ int i;
int n_services=lp_numservices();
- *printers=NULL;
- *number=0;
+ PRINTER_INFO_1 *printers=NULL;
+ PRINTER_INFO_1 current_prt;
+ pstring servername;
+
+ DEBUG(4,("enum_all_printers_info_1\n"));
+
+ pstrcpy(servername, global_myname);
- for (snum=0;snum<n_services; snum++)
- {
- if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
- {
- DEBUG(4,("Found a printer: %s[%x]\n",lp_servicename(snum),snum));
- *printers=Realloc(*printers, (*number+1)*sizeof(PRINTER_INFO_1 *));
- DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_1 pointers at [%p]\n", *number+1, *printers));
- if (enum_printer_info_1( &((*printers)[*number]), snum, *number) )
- {
- (*number)++;
+ for (snum=0; snum<n_services; snum++) {
+ if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
+ DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", lp_servicename(snum), snum));
+
+ if (construct_printer_info_1(&current_prt, snum, servername))
+ {
+ printers=Realloc(printers, (*returned +1)*sizeof(PRINTER_INFO_1));
+ DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_1\n", *returned));
+ memcpy(&(printers[*returned]), &current_prt, sizeof(PRINTER_INFO_1));
+ (*returned)++;
}
}
}
+
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ (*needed) += spoolss_size_printer_info_1(&(printers[i]));
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+
+ /* fill the buffer with the structures */
+
+ for (i=0; i<*returned; i++)
+ new_smb_io_printer_info_1("", buffer, &(printers[i]), 0);
+
+ /* clear memory */
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
}
/********************************************************************
@@ -1754,26 +1856,92 @@ static void enum_all_printers_info_1(PRINTER_INFO_1 ***printers, uint32 *number)
*
* called from api_spoolss_enumprinters (see this to understand)
********************************************************************/
-static void enum_all_printers_info_2(PRINTER_INFO_2 ***printers, uint32 *number)
+static BOOL enum_all_printers_info_2(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
{
int snum;
+ int i;
int n_services=lp_numservices();
- *printers=NULL;
- *number=0;
+ PRINTER_INFO_2 **printers=NULL;
- for (snum=0;snum<n_services; snum++)
- {
- if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
- {
- DEBUG(4,("Found a printer: %s[%x]\n",lp_servicename(snum),snum));
- *printers=Realloc(*printers, (*number+1)*sizeof(PRINTER_INFO_2 *));
- DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_2 pointers at [%p]\n", *number+1, *printers));
- if (enum_printer_info_2( &((*printers)[*number]), snum, *number) )
- {
- (*number)++;
- }
+ for (snum=0; snum<n_services; snum++) {
+ if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
+
+ DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", lp_servicename(snum), snum));
+
+ printers=Realloc(printers, ((*returned)+1)*sizeof(PRINTER_INFO_2 *));
+
+ DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_2 pointers\n", (*returned)+1));
+
+ if (get_printer_info_2( &(printers[*returned]), snum, *returned) )
+ (*returned)++;
}
}
+
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ (*needed) += spoolss_size_printer_info_2(printers[i]);
+
+ DEBUG(4,("we need [%d] bytes\n", *needed));
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ for (i=0; i<*returned; i++)
+ new_smb_io_printer_info_2("", buffer, printers[i], 0);
+
+ /* clear memory */
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/********************************************************************
+ * handle enumeration of printers at level 1
+ ********************************************************************/
+static uint32 enumprinters_level1( uint32 flags, fstring name,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+ if (flags && PRINTER_ENUM_NETWORK)
+ return enum_all_printers_info_1(buffer, offered, needed, returned);
+
+ if (flags && PRINTER_ENUM_NAME) {
+ if (*name=='\0')
+ return enum_all_printers_info_1(buffer, offered, needed, returned);
+ else
+ return enum_printer_info_1(name, buffer, offered, needed, returned);
+ }
+
+ if (flags && PRINTER_ENUM_REMOTE)
+ return enum_all_printers_info_1(buffer, offered, needed, returned);
+
+ return NT_STATUS_INVALID_LEVEL;
+}
+
+/********************************************************************
+ * handle enumeration of printers at level 2
+ ********************************************************************/
+static uint32 enumprinters_level2( uint32 flags, fstring servername,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+ return enum_all_printers_info_2(buffer, offered, needed, returned);
+}
+
+/********************************************************************
+ * handle enumeration of printers at level 5
+ ********************************************************************/
+static uint32 enumprinters_level5( uint32 flags, fstring servername,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+/* return enum_all_printers_info_5(buffer, offered, needed, returned);*/
+ return NT_STATUS_NO_PROBLEMO;
}
/********************************************************************
@@ -1781,118 +1949,167 @@ static void enum_all_printers_info_2(PRINTER_INFO_2 ***printers, uint32 *number)
*
* called from api_spoolss_enumprinters (see this to understand)
********************************************************************/
-uint32 _spoolss_enumprinters(
- uint32 flags,
- const UNISTR2 *servername,
- uint32 level,
- const BUFFER *buffer,
- uint32 buf_size,
- uint32 *offered,
- uint32 *needed,
- PRINTER_INFO_CTR *ctr,
- uint32 *returned)
+uint32 _spoolss_enumprinters( uint32 flags, const UNISTR2 *servername, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
{
- DEBUG(4,("Enumerating printers\n"));
+ fstring name;
+
+ DEBUG(4,("_spoolss_enumprinters\n"));
- (*returned)=0;
+ *needed=0;
+ *returned=0;
+
+ /*
+ * Level 1:
+ * flags==PRINTER_ENUM_NAME
+ * if name=="" then enumerates all printers
+ * if name!="" then enumerate the printer
+ * flags==PRINTER_ENUM_REMOTE
+ * name is NULL, enumerate printers
+ * Level 2: name!="" enumerates printers, name can't be NULL
+ * Level 3: doesn't exist
+ * Level 4: does a local registry lookup
+ * Level 5: same as Level 2
+ */
- switch (level)
- {
- case 1:
- if (flags == PRINTER_ENUM_NAME ||
- flags == PRINTER_ENUM_NETWORK )
- {
- /*if (is_a_printerserver(servername))*/
- enum_all_printers_info_1(&ctr->printer.printers_1, returned );
- /*else
- enum_one_printer_info_1(&r_u);*/
- break;
- }
- case 2:
- if (flags == PRINTER_ENUM_NAME ||
- flags == PRINTER_ENUM_NETWORK )
- {
- /*if (is_a_printerserver(servername))*/
- enum_all_printers_info_2(&ctr->printer.printers_2, returned );
- /*else
- enum_one_printer_info_2(&r_u);*/
- break;
- }
- case 3: /* doesn't exist */
- return NT_STATUS_INVALID_INFO_CLASS;
- case 4: /* can't, always on local machine */
- break;
- case 5:
- return NT_STATUS_INVALID_INFO_CLASS;
-
- }
- DEBUG(4,("%d printers enumerated\n", *returned));
- (*offered) = buffer->size;
+ unistr2_to_ascii(name, servername, sizeof(name)-1);
- return NT_STATUS_NOPROBLEMO;
+ switch (level) {
+ case 1:
+ return enumprinters_level1(flags, name, buffer, offered, needed, returned);
+ break;
+ case 2:
+ return enumprinters_level2(flags, name, buffer, offered, needed, returned);
+ break;
+ case 5:
+ return enumprinters_level5(flags, name, buffer, offered, needed, returned);
+ break;
+ case 3:
+ case 4:
+ default:
+ return NT_STATUS_INVALID_LEVEL;
+ break;
+ }
}
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_getprinter( POLICY_HND *handle,
- uint32 level,
- PRINTER_INFO *ctr,
- uint32 *offered,
- uint32 *needed)
+static uint32 getprinter_level_0(pstring servername, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
{
- int snum;
- pstring servername;
+ PRINTER_INFO_0 *printer=NULL;
+
+ printer=(PRINTER_INFO_0*)malloc(sizeof(PRINTER_INFO_0));
+ construct_printer_info_0(printer, snum, servername);
- pstrcpy(servername, global_myname);
+ /* check the required size. */
+ *needed += spoolss_size_printer_info_0(printer);
- if (!get_printer_snum(handle,&snum))
- {
- return NT_STATUS_INVALID_HANDLE;
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ new_smb_io_printer_info_0("", buffer, printer, 0);
+
+ /* clear memory */
+ safe_free(printer);
+
+ if (*needed > offered) {
+ return ERROR_INSUFFICIENT_BUFFER;
}
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
- DEBUG(0,("_spoolss_getprinter: offered and needed params ignored\n"));
+/****************************************************************************
+****************************************************************************/
+static uint32 getprinter_level_1(pstring servername, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ PRINTER_INFO_1 *printer=NULL;
- switch (level)
- {
- case 0:
- {
- PRINTER_INFO_0 *printer;
-
- printer=(PRINTER_INFO_0*)malloc(sizeof(PRINTER_INFO_0));
- construct_printer_info_0(printer, snum, servername);
- ctr->printer.info0=printer;
-
- return NT_STATUS_NOPROBLEMO;
- }
- case 1:
- {
- PRINTER_INFO_1 *printer;
-
- printer=(PRINTER_INFO_1*)malloc(sizeof(PRINTER_INFO_1));
- construct_printer_info_1(printer, snum, servername);
- ctr->printer.info1=printer;
+ printer=(PRINTER_INFO_1*)malloc(sizeof(PRINTER_INFO_1));
+ construct_printer_info_1(printer, snum, servername);
+
+ /* check the required size. */
+ *needed += spoolss_size_printer_info_1(printer);
- return NT_STATUS_NOPROBLEMO;
- }
- case 2:
- {
- PRINTER_INFO_2 *printer;
-
- printer=(PRINTER_INFO_2*)malloc(sizeof(PRINTER_INFO_2));
- construct_printer_info_2(printer, snum, servername);
- ctr->printer.info2=printer;
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
- return NT_STATUS_NOPROBLEMO;
- }
- default:
- {
- break;
- }
+ /* fill the buffer with the structures */
+ new_smb_io_printer_info_1("", buffer, printer, 0);
+
+ /* clear memory */
+ safe_free(printer);
+
+ if (*needed > offered) {
+ return ERROR_INSUFFICIENT_BUFFER;
}
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
- return NT_STATUS_INVALID_INFO_CLASS;
+/****************************************************************************
+****************************************************************************/
+static uint32 getprinter_level_2(pstring servername, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ PRINTER_INFO_2 *printer=NULL;
+
+ printer=(PRINTER_INFO_2*)malloc(sizeof(PRINTER_INFO_2));
+ construct_printer_info_2(printer, snum, servername);
+
+ /* check the required size. */
+ *needed += spoolss_size_printer_info_2(printer);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ new_smb_io_printer_info_2("", buffer, printer, 0);
+
+ /* clear memory */
+ safe_free(printer);
+
+ if (*needed > offered) {
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
}
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_getprinter(POLICY_HND *handle, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ int snum;
+ pstring servername;
+
+ *needed=0;
+
+ pstrcpy(servername, global_myname);
+
+ if (!get_printer_snum(handle, &snum))
+ {
+ return NT_STATUS_INVALID_HANDLE;
+ }
+
+ switch (level) {
+ case 0:
+ return getprinter_level_0(servername, snum, buffer, offered, needed);
+ break;
+ case 1:
+ return getprinter_level_1(servername,snum, buffer, offered, needed);
+ break;
+ case 2:
+ return getprinter_level_2(servername,snum, buffer, offered, needed);
+ break;
+ default:
+ return NT_STATUS_INVALID_LEVEL;
+ break;
+ }
+}
+
/********************************************************************
* construct_printer_driver_info_1
* fill a construct_printer_driver_info_1 struct
@@ -1901,7 +2118,7 @@ static void fill_printer_driver_info_1(DRIVER_INFO_1 *info,
NT_PRINTER_DRIVER_INFO_LEVEL driver,
pstring servername, fstring architecture)
{
- make_unistr( &(info->name), driver.info_3->name);
+ init_unistr( &(info->name), driver.info_3->name);
}
static void construct_printer_driver_info_1(DRIVER_INFO_1 *info, int snum,
@@ -1939,20 +2156,20 @@ static void fill_printer_driver_info_2(DRIVER_INFO_2 *info,
info->version=driver.info_3->cversion;
- make_unistr( &(info->name), driver.info_3->name );
- make_unistr( &(info->architecture), architecture );
+ init_unistr( &(info->name), driver.info_3->name );
+ init_unistr( &(info->architecture), architecture );
snprintf(temp_driverpath, sizeof(temp_driverpath)-1, "%s%s", where,
driver.info_3->driverpath);
- make_unistr( &(info->driverpath), temp_driverpath );
+ init_unistr( &(info->driverpath), temp_driverpath );
snprintf(temp_datafile, sizeof(temp_datafile)-1, "%s%s", where,
driver.info_3->datafile);
- make_unistr( &(info->datafile), temp_datafile );
+ init_unistr( &(info->datafile), temp_datafile );
snprintf(temp_configfile, sizeof(temp_configfile)-1, "%s%s", where,
driver.info_3->configfile);
- make_unistr( &(info->configfile), temp_configfile );
+ init_unistr( &(info->configfile), temp_configfile );
}
/********************************************************************
@@ -1977,13 +2194,13 @@ static void construct_printer_driver_info_2(DRIVER_INFO_2 *info, int snum,
/********************************************************************
* copy a strings array and convert to UNICODE
********************************************************************/
-static void make_unistr_array(UNISTR ***uni_array, char **char_array, char *where)
+static void init_unistr_array(UNISTR ***uni_array, char **char_array, char *where)
{
int i=0;
char *v;
pstring line;
- DEBUG(6,("make_unistr_array\n"));
+ DEBUG(6,("init_unistr_array\n"));
for (v=char_array[i]; *v!='\0'; v=char_array[i])
{
@@ -1997,7 +2214,7 @@ static void make_unistr_array(UNISTR ***uni_array, char **char_array, char *wher
DEBUGADD(7,("alloc:[%p],", (*uni_array)[i]));
snprintf(line, sizeof(line)-1, "%s%s", where, v);
- make_unistr( (*uni_array)[i], line );
+ init_unistr( (*uni_array)[i], line );
DEBUGADD(7,("copy\n"));
i++;
@@ -2030,26 +2247,26 @@ static void fill_printer_driver_info_3(DRIVER_INFO_3 *info,
info->version=driver.info_3->cversion;
- make_unistr( &(info->name), driver.info_3->name );
- make_unistr( &(info->architecture), architecture );
+ init_unistr( &(info->name), driver.info_3->name );
+ init_unistr( &(info->architecture), architecture );
snprintf(temp_driverpath, sizeof(temp_driverpath)-1, "%s%s", where, driver.info_3->driverpath);
- make_unistr( &(info->driverpath), temp_driverpath );
+ init_unistr( &(info->driverpath), temp_driverpath );
snprintf(temp_datafile, sizeof(temp_datafile)-1, "%s%s", where, driver.info_3->datafile);
- make_unistr( &(info->datafile), temp_datafile );
+ init_unistr( &(info->datafile), temp_datafile );
snprintf(temp_configfile, sizeof(temp_configfile)-1, "%s%s", where, driver.info_3->configfile);
- make_unistr( &(info->configfile), temp_configfile );
+ init_unistr( &(info->configfile), temp_configfile );
snprintf(temp_helpfile, sizeof(temp_helpfile)-1, "%s%s", where, driver.info_3->helpfile);
- make_unistr( &(info->helpfile), temp_helpfile );
+ init_unistr( &(info->helpfile), temp_helpfile );
- make_unistr( &(info->monitorname), driver.info_3->monitorname );
- make_unistr( &(info->defaultdatatype), driver.info_3->defaultdatatype );
+ init_unistr( &(info->monitorname), driver.info_3->monitorname );
+ init_unistr( &(info->defaultdatatype), driver.info_3->defaultdatatype );
info->dependentfiles=NULL;
- make_unistr_array(&(info->dependentfiles), driver.info_3->dependentfiles, where);
+ init_unistr_array(&(info->dependentfiles), driver.info_3->dependentfiles, where);
}
/********************************************************************
@@ -2073,95 +2290,162 @@ static void construct_printer_driver_info_3(DRIVER_INFO_3 *info, int snum,
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_getprinterdriver2( const POLICY_HND *handle,
- const UNISTR2 *uni_arch,
- uint32 level,
- DRIVER_INFO *ctr,
- uint32 *offered,
- uint32 *needed)
+static uint32 getprinterdriver2_level1(pstring servername, pstring architecture, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ DRIVER_INFO_1 *info=NULL;
+
+ info=(DRIVER_INFO_1 *)malloc(sizeof(DRIVER_INFO_1));
+
+ construct_printer_driver_info_1(info, snum, servername, architecture);
+
+ /* check the required size. */
+ *needed += spoolss_size_printer_driver_info_1(info);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ new_smb_io_printer_driver_info_1("", buffer, info, 0);
+
+ /* clear memory */
+ safe_free(info);
+
+ if (*needed > offered) {
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+****************************************************************************/
+static uint32 getprinterdriver2_level2(pstring servername, pstring architecture, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ DRIVER_INFO_2 *info=NULL;
+
+ info=(DRIVER_INFO_2 *)malloc(sizeof(DRIVER_INFO_2));
+
+ construct_printer_driver_info_2(info, snum, servername, architecture);
+
+ /* check the required size. */
+ *needed += spoolss_size_printer_driver_info_2(info);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ new_smb_io_printer_driver_info_2("", buffer, info, 0);
+
+ /* clear memory */
+ safe_free(info);
+
+ if (*needed > offered) {
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+****************************************************************************/
+static uint32 getprinterdriver2_level3(pstring servername, pstring architecture, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ DRIVER_INFO_3 *info=NULL;
+
+ info=(DRIVER_INFO_3 *)malloc(sizeof(DRIVER_INFO_3));
+
+ construct_printer_driver_info_3(info, snum, servername, architecture);
+
+ /* check the required size. */
+ *needed += spoolss_size_printer_driver_info_3(info);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ new_smb_io_printer_driver_info_3("", buffer, info, 0);
+
+ /* clear memory */
+ safe_free(info);
+
+ if (*needed > offered) {
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_getprinterdriver2(const POLICY_HND *handle, const UNISTR2 *uni_arch, uint32 level, uint32 unknown,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *unknown0, uint32 *unknown1)
{
pstring servername;
fstring architecture;
int snum;
- DRIVER_INFO_1 *info1=NULL;
- DRIVER_INFO_2 *info2=NULL;
- DRIVER_INFO_3 *info3=NULL;
+
+ DEBUG(4,("_spoolss_getprinterdriver2\n"));
+
+ *needed=0;
+ *unknown0=0;
+ *unknown1=0;
pstrcpy(servername, global_myname);
+ unistr2_to_ascii(architecture, uni_arch, sizeof(architecture)-1);
- if (!get_printer_snum(handle,&snum))
+ if (!get_printer_snum(handle, &snum))
{
return NT_STATUS_INVALID_HANDLE;
}
- unistr2_to_ascii(architecture, uni_arch, sizeof(architecture) );
-
- DEBUG(1,("spoolss_getprinterdriver2:[%d]\n", level));
-
- switch (level)
- {
- case 1:
- {
- info1=(DRIVER_INFO_1 *)malloc(sizeof(DRIVER_INFO_1));
- construct_printer_driver_info_1(info1, snum, servername, architecture);
- ctr->driver.info1=info1;
-
- return NT_STATUS_NOPROBLEMO;
- }
- case 2:
- {
- info2=(DRIVER_INFO_2 *)malloc(sizeof(DRIVER_INFO_2));
- construct_printer_driver_info_2(info2, snum, servername, architecture);
- ctr->driver.info2=info2;
-
- return NT_STATUS_NOPROBLEMO;
- }
- case 3:
- {
- info3=(DRIVER_INFO_3 *)malloc(sizeof(DRIVER_INFO_3));
- construct_printer_driver_info_3(info3, snum, servername, architecture);
- ctr->driver.info3=info3;
-
- return NT_STATUS_NOPROBLEMO;
- }
- default:
- {
- break;
- }
+ switch (level) {
+ case 1:
+ return getprinterdriver2_level1(servername, architecture, snum, buffer, offered, needed);
+ break;
+ case 2:
+ return getprinterdriver2_level2(servername, architecture, snum, buffer, offered, needed);
+ break;
+ case 3:
+ return getprinterdriver2_level3(servername, architecture, snum, buffer, offered, needed);
+ break;
+ default:
+ return NT_STATUS_INVALID_LEVEL;
+ break;
}
- return NT_STATUS_INVALID_INFO_CLASS;
}
/****************************************************************************
****************************************************************************/
uint32 _spoolss_startpageprinter(const POLICY_HND *handle)
{
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(handle);
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(pnum))
+ if (OPEN_HANDLE(Printer))
{
- DEBUG(3,("Error in startpageprinter printer handle\n"));
- return NT_STATUS_INVALID_HANDLE;
+ Printer->page_started=True;
+ return 0x0;
}
- pnum->page_started=True;
- return NT_STATUS_NOPROBLEMO;
+ DEBUG(3,("Error in startpageprinter printer handle\n"));
+ return NT_STATUS_INVALID_HANDLE;
}
/****************************************************************************
****************************************************************************/
uint32 _spoolss_endpageprinter(const POLICY_HND *handle)
{
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(handle);
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(pnum))
+ if (!OPEN_HANDLE(Printer))
{
DEBUG(3,("Error in endpageprinter printer handle\n"));
return NT_STATUS_INVALID_HANDLE;
}
+
+ Printer->page_started=False;
- pnum->page_started=False;
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_NO_PROBLEMO;
}
@@ -2180,11 +2464,9 @@ uint32 _spoolss_startdocprinter( const POLICY_HND *handle, uint32 level,
pstring datatype;
int fd = -1;
int snum;
- PRINT_HND_INFO *pnum;
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
- pnum = find_printer_index_by_hnd(handle);
-
- if (INVALID_HANDLE(pnum))
+ if (!OPEN_HANDLE(Printer))
{
return NT_STATUS_INVALID_HANDLE;
}
@@ -2227,18 +2509,16 @@ uint32 _spoolss_startdocprinter( const POLICY_HND *handle, uint32 level,
fd=open(fname, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR );
DEBUG(4,("Temp spool file created: [%s]\n", fname));
- pnum->current_jobid=fd;
- pstrcpy(pnum->document_name,fname);
+ Printer->current_jobid=fd;
+ pstrcpy(Printer->document_name, fname);
- unistr2_to_ascii(pnum->job_name,
- &info_1->docname,
- sizeof(pnum->job_name));
+ unistr2_to_ascii(Printer->job_name, &info_1->docname, sizeof(Printer->job_name));
- pnum->document_fd=fd;
- pnum->document_started=True;
- (*jobid) = pnum->current_jobid;
+ Printer->document_fd=fd;
+ Printer->document_started=True;
+ (*jobid) = Printer->current_jobid;
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
/********************************************************************
@@ -2248,29 +2528,28 @@ uint32 _spoolss_startdocprinter( const POLICY_HND *handle, uint32 level,
********************************************************************/
uint32 _spoolss_enddocprinter(const POLICY_HND *handle)
{
- PRINT_HND_INFO *pnum;
int snum;
pstring filename;
pstring filename1;
pstring job_name;
pstring syscmd;
char *tstr;
+ Printer_entry *Printer=find_printer_index_by_hnd(handle);
*syscmd=0;
- pnum = find_printer_index_by_hnd(handle);
-
- if (INVALID_HANDLE(pnum))
+ if (!OPEN_HANDLE(Printer))
{
DEBUG(3,("Error in enddocprinter handle\n"));
return NT_STATUS_INVALID_HANDLE;
}
- pnum->document_started=False;
- close(pnum->document_fd);
+
+ Printer->document_started=False;
+ close(Printer->document_fd);
DEBUG(4,("Temp spool file closed, printing now ...\n"));
- pstrcpy(filename1, pnum->document_name);
- pstrcpy(job_name, pnum->job_name);
+ pstrcpy(filename1, Printer->document_name);
+ pstrcpy(job_name, Printer->job_name);
if (!get_printer_snum(handle,&snum))
{
@@ -2330,7 +2609,7 @@ uint32 _spoolss_enddocprinter(const POLICY_HND *handle)
lpq_reset(snum);
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
/****************************************************************************
@@ -2340,22 +2619,20 @@ uint32 _spoolss_writeprinter( const POLICY_HND *handle,
const uint8 *buffer,
uint32 *buffer_written)
{
- PRINT_HND_INFO *pnum;
int fd;
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
- pnum = find_printer_index_by_hnd(handle);
-
- if (INVALID_HANDLE(pnum))
+ if (!OPEN_HANDLE(Printer))
{
DEBUG(3,("Error in writeprinter handle\n"));
return NT_STATUS_INVALID_HANDLE;
}
- fd = pnum->document_fd;
+ fd = Printer->document_fd;
(*buffer_written) = write(fd, buffer, buffer_size);
- pnum->document_lastwritten = (*buffer_written);
+ Printer->document_lastwritten = (*buffer_written);
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
/********************************************************************
@@ -2365,27 +2642,36 @@ uint32 _spoolss_writeprinter( const POLICY_HND *handle,
********************************************************************/
static uint32 control_printer(const POLICY_HND *handle, uint32 command)
{
- PRINT_HND_INFO *pnum;
int snum;
- pnum = find_printer_index_by_hnd(handle);
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
- if ( INVALID_HANDLE(pnum) || !get_printer_snum(handle, &snum) )
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
- switch (command)
- {
+ if (!get_printer_snum(handle, &snum) )
+ return NT_STATUS_INVALID_HANDLE;
+
+ switch (command) {
case PRINTER_CONTROL_PAUSE:
/* pause the printer here */
- return status_printqueue(NULL, UID_FIELD_INVALID, snum, LPSTAT_STOPPED);
-
+ status_printqueue(NULL, UID_FIELD_INVALID, snum, LPSTAT_STOPPED);
+ return 0x0;
+ break;
case PRINTER_CONTROL_RESUME:
case PRINTER_CONTROL_UNPAUSE:
/* UN-pause the printer here */
- return status_printqueue(NULL, UID_FIELD_INVALID, snum, LPSTAT_OK);
+ status_printqueue(NULL, UID_FIELD_INVALID, snum, LPSTAT_OK);
+ return 0x0;
+ break;
case PRINTER_CONTROL_PURGE:
- /* Envoi des dragées FUCA dans l'imprimante */
+ /*
+ * It's not handled by samba
+ * we need a smb.conf param to do
+ * lprm -P%p - on BSD
+ * lprm -P%p all on LPRNG
+ * I don't know on SysV
+ * we could do it by looping in the job's list...
+ */
break;
}
@@ -2400,35 +2686,33 @@ static uint32 update_printer(const POLICY_HND *handle, uint32 level,
const SPOOL_PRINTER_INFO_LEVEL *info,
const DEVICEMODE *devmode)
{
- PRINT_HND_INFO *pnum;
int snum;
NT_PRINTER_INFO_LEVEL printer;
NT_DEVICEMODE *nt_devmode;
- uint32 status = NT_STATUS_NOPROBLEMO;
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
nt_devmode=NULL;
DEBUG(8,("update_printer\n"));
- if (level!=2)
- {
- DEBUG(0,("Send a mail to samba-bugs@samba.org\n"));
+ if (level!=2) {
+ DEBUG(0,("Send a mail to jfm@samba.org\n"));
DEBUGADD(0,("with the following message: update_printer: level!=2\n"));
return NT_STATUS_INVALID_INFO_CLASS;
}
- pnum = find_printer_index_by_hnd(handle);
- if ( INVALID_HANDLE(pnum) || !get_printer_snum(handle, &snum) )
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
- get_a_printer(&printer, level, lp_servicename(snum));
+
+ if (!get_printer_snum(handle, &snum) )
+ return NT_STATUS_INVALID_HANDLE;
+
+ get_a_printer(&printer, 2, lp_servicename(snum));
DEBUGADD(8,("Converting info_2 struct\n"));
convert_printer_info(info, &printer, level);
- if ((info->info_2)->devmode_ptr != 0)
- {
+ if ((info->info_2)->devmode_ptr != 0) {
/* we have a valid devmode
convert it and link it*/
@@ -2444,48 +2728,44 @@ static uint32 update_printer(const POLICY_HND *handle, uint32 level,
convert_devicemode(*devmode, nt_devmode);
}
- else
- {
+ else {
if (printer.info_2->devmode != NULL)
- {
free(printer.info_2->devmode);
- }
printer.info_2->devmode=NULL;
}
- if (status == 0x0)
- {
- status = add_a_printer(printer, level);
- }
- if (status == 0x0)
- {
- status = free_a_printer(printer, level);
+ if (add_a_printer(printer, 2)!=0) {
+ free_a_printer(printer, 2);
+
+ /* I don't really know what to return here !!! */
+ return NT_STATUS_INVALID_INFO_CLASS;
}
- return status;
+ free_a_printer(printer, 2);
+
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_setprinter( const POLICY_HND *handle,
- uint32 level,
- const SPOOL_PRINTER_INFO_LEVEL *info,
- const DEVICEMODE *devmode,
- uint32 sec_buf_size,
- const char *sec_buf,
- uint32 command)
+uint32 _spoolss_setprinter(const POLICY_HND *handle, uint32 level,
+ const SPOOL_PRINTER_INFO_LEVEL *info,
+ const DEVMODE_CTR devmode_ctr,
+ uint32 command)
{
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(handle);
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(pnum))
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
+
/* check the level */
- switch (level)
- {
- case 0: return control_printer(handle, command);
- case 2: return update_printer(handle, level, info, devmode);
+ switch (level) {
+ case 0:
+ return control_printer(handle, command);
+ break;
+ case 2:
+ return update_printer(handle, level, info, devmode_ctr.devmode);
+ break;
}
return NT_STATUS_INVALID_INFO_CLASS;
@@ -2493,18 +2773,29 @@ uint32 _spoolss_setprinter( const POLICY_HND *handle,
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_fcpn( const POLICY_HND *handle)
+uint32 _spoolss_fcpn(const POLICY_HND *handle)
{
- return NT_STATUS_NOPROBLEMO;
+ Printer_entry *Printer= find_printer_index_by_hnd(handle);
+
+ if (!OPEN_HANDLE(Printer))
+ return NT_STATUS_INVALID_HANDLE;
+
+ Printer->notify.flags=0;
+ Printer->notify.options=0;
+ Printer->notify.localmachine[0]='\0';
+ Printer->notify.printerlocal=0;
+ safe_free(Printer->notify.option);
+ Printer->notify.option=NULL;
+
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_addjob( const POLICY_HND *handle, uint32 level,
- const BUFFER *buffer,
- uint32 buf_size)
+uint32 _spoolss_addjob(const POLICY_HND *handle, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered)
{
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
@@ -2521,12 +2812,12 @@ static void fill_job_info_1(JOB_INFO_1 *job_info, print_queue_struct *queue,
snprintf(temp_name, sizeof(temp_name), "\\\\%s", global_myname);
job_info->jobid=queue->job;
- make_unistr(&(job_info->printername), lp_servicename(snum));
- make_unistr(&(job_info->machinename), temp_name);
- make_unistr(&(job_info->username), queue->user);
- make_unistr(&(job_info->document), queue->file);
- make_unistr(&(job_info->datatype), "RAW");
- make_unistr(&(job_info->text_status), "");
+ init_unistr(&(job_info->printername), lp_servicename(snum));
+ init_unistr(&(job_info->machinename), temp_name);
+ init_unistr(&(job_info->username), queue->user);
+ init_unistr(&(job_info->document), queue->file);
+ init_unistr(&(job_info->datatype), "RAW");
+ init_unistr(&(job_info->text_status), "");
job_info->status=queue->status;
job_info->priority=queue->priority;
job_info->position=position;
@@ -2560,16 +2851,16 @@ static BOOL fill_job_info_2(JOB_INFO_2 *job_info, print_queue_struct *queue,
job_info->jobid=queue->job;
snprintf(chaine, sizeof(chaine)-1, "\\\\%s\\%s", global_myname, ntprinter.info_2->printername);
- make_unistr(&(job_info->printername), chaine);
+ init_unistr(&(job_info->printername), chaine);
- make_unistr(&(job_info->machinename), temp_name);
- make_unistr(&(job_info->username), queue->user);
- make_unistr(&(job_info->document), queue->file);
- make_unistr(&(job_info->notifyname), queue->user);
- make_unistr(&(job_info->datatype), "RAW");
- make_unistr(&(job_info->printprocessor), "winprint");
- make_unistr(&(job_info->parameters), "");
- make_unistr(&(job_info->text_status), "");
+ init_unistr(&(job_info->machinename), temp_name);
+ init_unistr(&(job_info->username), queue->user);
+ init_unistr(&(job_info->document), queue->file);
+ init_unistr(&(job_info->notifyname), queue->user);
+ init_unistr(&(job_info->datatype), "RAW");
+ init_unistr(&(job_info->printprocessor), "winprint");
+ init_unistr(&(job_info->parameters), "");
+ init_unistr(&(job_info->text_status), "");
/* and here the security descriptor */
@@ -2594,82 +2885,131 @@ static BOOL fill_job_info_2(JOB_INFO_2 *job_info, print_queue_struct *queue,
}
/****************************************************************************
+ Enumjobs at level 1.
****************************************************************************/
-uint32 _spoolss_enumjobs( const POLICY_HND *handle,
- uint32 reqfirstjob,
- uint32 reqnumofjobs,
- uint32 level,
- JOB_INFO_CTR *ctr,
- uint32 *buf_size,
- uint32 *numofjobs)
+static uint32 enumjobs_level1(print_queue_struct *queue, int snum,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
{
- int snum;
- int count;
+ JOB_INFO_1 *info;
+ int i;
+
+ info=(JOB_INFO_1 *)malloc(*returned*sizeof(JOB_INFO_1));
+
+ for (i=0; i<*returned; i++)
+ {
+ fill_job_info_1(&(info[i]), &(queue[i]), i, snum);
+ }
+
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ (*needed) += spoolss_size_job_info_1(&(info[i]));
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ for (i=0; i<*returned; i++)
+ new_smb_io_job_info_1("", buffer, &(info[i]), 0);
+
+ /* clear memory */
+ safe_free(queue);
+ safe_free(info);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+ Enumjobs at level 2.
+****************************************************************************/
+static uint32 enumjobs_level2(print_queue_struct *queue, int snum,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+ JOB_INFO_2 *info;
int i;
+
+ info=(JOB_INFO_2 *)malloc(*returned*sizeof(JOB_INFO_2));
+
+ for (i=0; i<*returned; i++)
+ {
+ fill_job_info_2(&(info[i]), &(queue[i]), i, snum);
+ }
+
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ (*needed) += spoolss_size_job_info_2(&(info[i]));
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the structures */
+ for (i=0; i<*returned; i++)
+ new_smb_io_job_info_2("", buffer, &(info[i]), 0);
+
+ /* clear memory */
+ safe_free(queue);
+ safe_free(info);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+ Enumjobs.
+****************************************************************************/
+uint32 _spoolss_enumjobs( POLICY_HND *handle, uint32 firstjob, uint32 numofjobs, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+ int snum;
print_queue_struct *queue=NULL;
print_status_struct prt_status;
- DEBUG(4,("spoolss_enumjobs\n"));
-
+ DEBUG(4,("_spoolss_enumjobs\n"));
+
ZERO_STRUCT(prt_status);
+ *needed=0;
+ *returned=0;
+
if (!get_printer_snum(handle, &snum))
{
return NT_STATUS_INVALID_HANDLE;
}
- count = get_printqueue(snum, NULL, UID_FIELD_INVALID, &queue, &prt_status);
- (*numofjobs) = 0;
-
- DEBUG(4,("count:[%d], status:[%d], [%s]\n",
- count, prt_status.status, prt_status.message));
-
- switch (level)
- {
- case 1:
- {
- for (i=0; i<count; i++)
- {
- JOB_INFO_1 *job_info_1;
- job_info_1=(JOB_INFO_1 *)malloc(sizeof(JOB_INFO_1));
- add_job1_to_array(numofjobs,
- &ctr->job.job_info_1,
- job_info_1);
-
- fill_job_info_1(ctr->job.job_info_1[i],
- &(queue[i]), i, snum);
- }
- safe_free(queue);
- return NT_STATUS_NOPROBLEMO;
- }
- case 2:
- {
- for (i=0; i<count; i++)
- {
- JOB_INFO_2 *job_info_2;
- job_info_2=(JOB_INFO_2 *)malloc(sizeof(JOB_INFO_2));
- add_job2_to_array(numofjobs,
- &ctr->job.job_info_2,
- job_info_2);
-
- fill_job_info_2(ctr->job.job_info_2[i],
- &(queue[i]), i, snum);
- }
- safe_free(queue);
- return NT_STATUS_NOPROBLEMO;
- }
+ *returned = get_printqueue(snum, NULL, UID_FIELD_INVALID, &queue, &prt_status);
+ DEBUGADD(4,("count:[%d], status:[%d], [%s]\n", *returned, prt_status.status, prt_status.message));
+
+ switch (level) {
+ case 1:
+ return enumjobs_level1(queue, snum, buffer, offered, needed, returned);
+ break;
+ case 2:
+ return enumjobs_level2(queue, snum, buffer, offered, needed, returned);
+ break;
+ default:
+ return NT_STATUS_INVALID_LEVEL;
+ break;
}
+}
- safe_free(queue);
- return NT_STATUS_INVALID_INFO_CLASS;
-}
/****************************************************************************
****************************************************************************/
uint32 _spoolss_schedulejob( const POLICY_HND *handle, uint32 jobid)
{
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
/****************************************************************************
@@ -2688,7 +3028,7 @@ uint32 _spoolss_setjob( const POLICY_HND *handle,
BOOL found=False;
int count;
- bzero(&prt_status,sizeof(prt_status));
+ memset(&prt_status, 0, sizeof(prt_status));
if (!get_printer_snum(handle, &snum))
{
@@ -2715,19 +3055,19 @@ uint32 _spoolss_setjob( const POLICY_HND *handle,
{
del_printqueue(NULL, UID_FIELD_INVALID, snum, jobid);
safe_free(queue);
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
case JOB_CONTROL_PAUSE:
{
status_printjob(NULL, UID_FIELD_INVALID, snum, jobid, LPQ_PAUSED);
safe_free(queue);
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
case JOB_CONTROL_RESUME:
{
status_printjob(NULL, UID_FIELD_INVALID, snum, jobid, LPQ_QUEUED);
safe_free(queue);
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
}
}
@@ -2737,86 +3077,166 @@ uint32 _spoolss_setjob( const POLICY_HND *handle,
}
/****************************************************************************
+ Enumerates all printer drivers at level 1.
****************************************************************************/
-uint32 _spoolss_enumprinterdrivers( const UNISTR2 *name,
- const UNISTR2 *environment,
- uint32 level,
- DRIVER_INFO *ctr,
- uint32 *offered,
- uint32 *numofdrivers)
+static uint32 enumprinterdrivers_level1(fstring *list, fstring servername, fstring architecture, NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
{
- NT_PRINTER_DRIVER_INFO_LEVEL driver;
- int count;
int i;
- fstring *list;
- fstring servername;
- fstring architecture;
+ NT_PRINTER_DRIVER_INFO_LEVEL driver;
+ DRIVER_INFO_1 *driver_info_1=NULL;
+ driver_info_1=(DRIVER_INFO_1 *)malloc(*returned * sizeof(DRIVER_INFO_1));
- DEBUG(4,("spoolss_enumdrivers\n"));
- fstrcpy(servername, global_myname);
+ for (i=0; i<*returned; i++) {
+ get_a_printer_driver(&driver, 3, list[i], architecture);
+ fill_printer_driver_info_1(&(driver_info_1[i]), driver, servername, architecture );
+ free_a_printer_driver(driver, 3);
+ }
+
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ {
+ DEBUGADD(6,("adding driver [%d]'s size\n",i));
+ *needed += spoolss_size_printer_driver_info_1(&(driver_info_1[i]));
+ }
- unistr2_to_ascii(architecture, environment, sizeof(architecture));
- count=get_ntdrivers(&list, architecture);
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
- DEBUGADD(4,("we have: [%d] drivers on archi [%s]\n",count, architecture));
- for (i=0; i<count; i++)
+ /* fill the buffer with the form structures */
+ for (i=0; i<*returned; i++)
{
- DEBUGADD(5,("driver [%s]\n",list[i]));
+ DEBUGADD(6,("adding driver [%d] to buffer\n",i));
+ new_smb_io_printer_driver_info_1("", buffer, &(driver_info_1[i]), 0);
+ }
+
+ safe_free(list);
+
+ if (*needed > offered)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+ Enumerates all printer drivers at level 2.
+****************************************************************************/
+static uint32 enumprinterdrivers_level2(fstring *list, fstring servername, fstring architecture, NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ int i;
+ NT_PRINTER_DRIVER_INFO_LEVEL driver;
+ DRIVER_INFO_2 *driver_info_2=NULL;
+ driver_info_2=(DRIVER_INFO_2 *)malloc(*returned * sizeof(DRIVER_INFO_2));
+
+ for (i=0; i<*returned; i++) {
+ get_a_printer_driver(&driver, 3, list[i], architecture);
+ fill_printer_driver_info_2(&(driver_info_2[i]), driver, servername, architecture );
+ free_a_printer_driver(driver, 3);
}
- (*numofdrivers)=count;
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ {
+ DEBUGADD(6,("adding driver [%d]'s size\n",i));
+ *needed += spoolss_size_printer_driver_info_2(&(driver_info_2[i]));
+ }
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the form structures */
+ for (i=0; i<*returned; i++)
+ {
+ DEBUGADD(6,("adding driver [%d] to buffer\n",i));
+ new_smb_io_printer_driver_info_2("", buffer, &(driver_info_2[i]), 0);
+ }
+
+ safe_free(list);
+
+ if (*needed > offered)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+ Enumerates all printer drivers at level 3.
+****************************************************************************/
+static uint32 enumprinterdrivers_level3(fstring *list, fstring servername, fstring architecture, NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ int i;
+ NT_PRINTER_DRIVER_INFO_LEVEL driver;
+ DRIVER_INFO_3 *driver_info_3=NULL;
+ driver_info_3=(DRIVER_INFO_3 *)malloc((*returned)*sizeof(DRIVER_INFO_3));
+
+ for (i=0; i<*returned; i++) {
+ get_a_printer_driver(&driver, 3, list[i], architecture);
+ fill_printer_driver_info_3(&(driver_info_3[i]), driver, servername, architecture );
+ free_a_printer_driver(driver, 3);
+ }
- switch (level)
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
{
- case 1:
- {
- DRIVER_INFO_1 *driver_info_1=NULL;
- driver_info_1=(DRIVER_INFO_1 *)malloc(count*sizeof(DRIVER_INFO_1));
+ DEBUGADD(6,("adding driver [%d]'s size\n",i));
+ *needed += spoolss_size_printer_driver_info_3(&(driver_info_3[i]));
+ }
- for (i=0; i<count; i++)
- {
- get_a_printer_driver(&driver, 3, list[i], architecture);
- fill_printer_driver_info_1(&(driver_info_1[i]), driver, servername, architecture );
- free_a_printer_driver(driver, 3);
- }
- ctr->driver.info1=driver_info_1;
- break;
- }
- case 2:
- {
- DRIVER_INFO_2 *driver_info_2=NULL;
- driver_info_2=(DRIVER_INFO_2 *)malloc(count*sizeof(DRIVER_INFO_2));
-
- for (i=0; i<count; i++)
- {
- get_a_printer_driver(&driver, 3, list[i], architecture);
- fill_printer_driver_info_2(&(driver_info_2[i]), driver, servername, architecture );
- free_a_printer_driver(driver, 3);
- }
- ctr->driver.info2=driver_info_2;
- break;
- }
- case 3:
- {
- DRIVER_INFO_3 *driver_info_3=NULL;
- driver_info_3=(DRIVER_INFO_3 *)malloc(count*sizeof(DRIVER_INFO_3));
-
- for (i=0; i<count; i++)
- {
- get_a_printer_driver(&driver, 3, list[i], architecture);
- fill_printer_driver_info_3(&(driver_info_3[i]), driver, servername, architecture );
- free_a_printer_driver(driver, 3);
- }
- ctr->driver.info3=driver_info_3;
- break;
- }
- default:
- {
- return NT_STATUS_INVALID_INFO_CLASS;
- }
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the form structures */
+ for (i=0; i<*returned; i++)
+ {
+ DEBUGADD(6,("adding form [%d] to buffer\n",i));
+ new_smb_io_printer_driver_info_3("", buffer, &(driver_info_3[i]), 0);
}
- return NT_STATUS_NOPROBLEMO;
+ safe_free(list);
+
+ if (*needed > offered)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+ Enumerates all printer drivers.
+****************************************************************************/
+uint32 _spoolss_enumprinterdrivers( UNISTR2 *name, UNISTR2 *environment, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+ int i;
+ fstring *list;
+ fstring servername;
+ fstring architecture;
+
+ DEBUG(4,("_spoolss_enumprinterdrivers\n"));
+ fstrcpy(servername, global_myname);
+ *needed=0;
+ *returned=0;
+
+ unistr2_to_ascii(architecture, environment, sizeof(architecture)-1);
+ *returned=get_ntdrivers(&list, architecture);
+
+ DEBUGADD(4,("we have: [%d] drivers in environment [%s]\n", *returned, architecture));
+ for (i=0; i<*returned; i++)
+ DEBUGADD(5,("driver: [%s]\n", list[i]));
+
+ switch (level) {
+ case 1:
+ return enumprinterdrivers_level1(list, servername, architecture, buffer, offered, needed, returned);
+ break;
+ case 2:
+ return enumprinterdrivers_level2(list, servername, architecture, buffer, offered, needed, returned);
+ break;
+ case 3:
+ return enumprinterdrivers_level3(list, servername, architecture, buffer, offered, needed, returned);
+ break;
+ default:
+ return NT_STATUS_INVALID_INFO_CLASS;
+ break;
+ }
}
/****************************************************************************
@@ -2824,7 +3244,7 @@ uint32 _spoolss_enumprinterdrivers( const UNISTR2 *name,
static void fill_form_1(FORM_1 *form, nt_forms_struct *list, int position)
{
form->flag=list->flag;
- make_unistr(&(form->name), list->name);
+ init_unistr(&(form->name), list->name);
form->width=list->width;
form->length=list->length;
form->left=list->left;
@@ -2832,129 +3252,239 @@ static void fill_form_1(FORM_1 *form, nt_forms_struct *list, int position)
form->right=list->right;
form->bottom=list->bottom;
}
-
+
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_enumforms( const POLICY_HND *handle,
- uint32 level,
- FORM_1 **forms_1,
- uint32 *offered,
- uint32 *numofforms)
+uint32 _new_spoolss_enumforms( const POLICY_HND *handle, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *numofforms)
{
- int count;
- int i;
nt_forms_struct *list=NULL;
- (*forms_1)=NULL;
+ FORM_1 *forms_1;
+ int buffer_size=0;
+ int i;
- DEBUG(4,("spoolss_enumforms\n"));
-
- count = get_ntforms(&list);
- (*numofforms) = count;
+ DEBUG(4,("_new_spoolss_enumforms\n"));
+ DEBUGADD(5,("Offered buffer size [%d]\n", offered));
+ DEBUGADD(5,("Info level [%d]\n", level));
- DEBUGADD(5,("Offered buffer size [%d]\n", *offered));
+ *numofforms = get_ntforms(&list);
DEBUGADD(5,("Number of forms [%d]\n", *numofforms));
- DEBUGADD(5,("Info level [%d]\n", level));
+
+ switch (level) {
+ case 1:
+ forms_1=(FORM_1 *)malloc(*numofforms * sizeof(FORM_1));
+
+ /* construct the list of form structures */
+ for (i=0; i<*numofforms; i++)
+ {
+ DEBUGADD(6,("Filling form number [%d]\n",i));
+ fill_form_1(&(forms_1[i]), &(list[i]), i);
+ }
+
+ /* check the required size. */
+ for (i=0; i<*numofforms; i++)
+ {
+ DEBUGADD(6,("adding form [%d]'s size\n",i));
+ buffer_size += spoolss_size_form_1(&(forms_1[i]));
+ }
+
+ *needed=buffer_size;
- switch (level)
- {
- case 1:
+ if (!alloc_buffer_size(buffer, buffer_size))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the form structures */
+ for (i=0; i<*numofforms; i++)
{
- (*forms_1)=(FORM_1 *)malloc(count*sizeof(FORM_1));
- for (i=0; i<count; i++)
- {
- DEBUGADD(6,("Filling form number [%d]\n",i));
- fill_form_1(&((*forms_1)[i]), &(list[i]), i);
- }
- safe_free(list);
- return NT_STATUS_NOPROBLEMO;
- }
+ DEBUGADD(6,("adding form [%d] to buffer\n",i));
+ new_smb_io_form_1("", buffer, &(forms_1[i]), 0);
+ }
+
+ safe_free(list);
+
+ if (*needed > offered)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
+
+ default:
+ safe_free(list);
+ return NT_STATUS_INVALID_INFO_CLASS;
}
- safe_free(list);
- return NT_STATUS_INVALID_INFO_CLASS;
+}
+
+/****************************************************************************
+****************************************************************************/
+static void fill_port_1(PORT_INFO_1 *port, char *name)
+{
+ init_unistr(&(port->port_name), name);
}
/****************************************************************************
****************************************************************************/
static void fill_port_2(PORT_INFO_2 *port, char *name)
{
- make_unistr(&(port->port_name), name);
- make_unistr(&(port->monitor_name), "Moniteur Local");
- make_unistr(&(port->description), "Local Port");
+ init_unistr(&(port->port_name), name);
+ init_unistr(&(port->monitor_name), "Moniteur Local");
+ init_unistr(&(port->description), "Local Port");
#define PORT_TYPE_WRITE 1
port->port_type=PORT_TYPE_WRITE;
port->reserved=0x0;
}
/****************************************************************************
+ enumports level 1.
****************************************************************************/
-uint32 _spoolss_enumports( const UNISTR2 *name,
- uint32 level,
- PORT_INFO_CTR *ctr,
- uint32 *offered,
- uint32 *numofports)
+static uint32 enumports_level_1(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
{
int n_services=lp_numservices();
int snum;
+ int i=0;
+
+ PORT_INFO_1 *ports=NULL;
+
+ for (snum=0; snum<n_services; snum++)
+ if ( lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
+ (*returned)++;
- DEBUG(4,("spoolss_enumports\n"));
+ ports=(PORT_INFO_1 *)malloc( (*returned+1) * sizeof(PORT_INFO_1) );
- (*numofports) = 0;
+ for (snum=0; snum<n_services; snum++)
+ {
+ if ( lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
+ DEBUGADD(6,("Filling port number [%d]\n", i));
+ fill_port_1(&(ports[i]), lp_servicename(snum));
+ i++;
+ }
+ }
- switch (level)
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
{
- case 2:
- {
- PORT_INFO_2 *ports_2=NULL;
- ports_2=(PORT_INFO_2 *)malloc(n_services*sizeof(PORT_INFO_2));
- for (snum=0; snum<n_services; snum++)
- {
- if ( lp_browseable(snum) &&
- lp_snum_ok(snum) &&
- lp_print_ok(snum) )
- {
- DEBUGADD(6,("Filling port no [%d]\n",
- (*numofports)));
- fill_port_2(&(ports_2[(*numofports)]),
- lp_servicename(snum));
- (*numofports)++;
- }
- }
- ctr->port.info_2=ports_2;
- return NT_STATUS_NOPROBLEMO;
- }
+ DEBUGADD(6,("adding port [%d]'s size\n", i));
+ *needed += spoolss_size_port_info_1(&(ports[i]));
}
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
- return NT_STATUS_INVALID_INFO_CLASS;
+ /* fill the buffer with the ports structures */
+ for (i=0; i<*returned; i++)
+ {
+ DEBUGADD(6,("adding port [%d] to buffer\n", i));
+ new_smb_io_port_1("", buffer, &(ports[i]), 0);
+ }
+
+ safe_free(ports);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
}
+
/****************************************************************************
+ enumports level 2.
****************************************************************************/
-uint32 _spoolss_addprinterex( const UNISTR2 *uni_srv_name,
- uint32 level,
+static uint32 enumports_level_2(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ int n_services=lp_numservices();
+ int snum;
+ int i=0;
+
+ PORT_INFO_2 *ports=NULL;
+
+ for (snum=0; snum<n_services; snum++)
+ if ( lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
+ (*returned)++;
+
+ ports=(PORT_INFO_2 *)malloc( (*returned+1) * sizeof(PORT_INFO_2) );
+
+ for (snum=0; snum<n_services; snum++)
+ {
+ if ( lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
+ DEBUGADD(6,("Filling port number [%d]\n", i));
+ fill_port_2(&(ports[i]), lp_servicename(snum));
+ i++;
+ }
+ }
+
+ /* check the required size. */
+ for (i=0; i<*returned; i++)
+ {
+ DEBUGADD(6,("adding port [%d]'s size\n", i));
+ *needed += spoolss_size_port_info_2(&(ports[i]));
+ }
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ /* fill the buffer with the ports structures */
+ for (i=0; i<*returned; i++)
+ {
+ DEBUGADD(6,("adding port [%d] to buffer\n", i));
+ new_smb_io_port_2("", buffer, &(ports[i]), 0);
+ }
+
+ safe_free(ports);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+ enumports.
+****************************************************************************/
+uint32 _spoolss_enumports( UNISTR2 *name, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+ DEBUG(4,("_spoolss_enumports\n"));
+
+ *returned=0;
+ *needed=0;
+
+ switch (level) {
+ case 1:
+ return enumports_level_1(buffer, offered, needed, returned);
+ break;
+ case 2:
+ return enumports_level_2(buffer, offered, needed, returned);
+ break;
+ default:
+ return NT_STATUS_INVALID_INFO_CLASS;
+ break;
+ }
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_addprinterex( const UNISTR2 *uni_srv_name, uint32 level,
const SPOOL_PRINTER_INFO_LEVEL *info,
- uint32 unk0,
- uint32 unk1,
- uint32 unk2,
- uint32 unk3,
- uint32 user_level,
- const SPOOL_USER_LEVEL *user,
+ uint32 unk0, uint32 unk1, uint32 unk2, uint32 unk3,
+ uint32 user_switch, const SPOOL_USER_CTR *user,
POLICY_HND *handle)
{
NT_PRINTER_INFO_LEVEL printer;
- fstring ascii_name;
- fstring server_name;
+ fstring name;
fstring share_name;
- UNISTR2 *portname;
- SPOOL_PRINTER_INFO_LEVEL_2 *info2;
- uint32 status = NT_STATUS_NOPROBLEMO;
-
- DEBUG(0,("spoolss_addprinterex: unknown access mask parameter\n"));
- if (!open_printer_hnd(handle, unk0))
- {
- return NT_STATUS_ACCESS_DENIED;
- }
+ clear_handle(handle);
+
+/*
+ * FIX: JFM: we need to check the user here !!!!
+ *
+ * as the code is running as root, anybody can add printers to the server
+ */
/* NULLify info_2 here */
/* don't put it in convert_printer_info as it's used also with non-NULL values */
printer.info_2=NULL;
@@ -2962,31 +3492,31 @@ uint32 _spoolss_addprinterex( const UNISTR2 *uni_srv_name,
/* convert from UNICODE to ASCII */
convert_printer_info(info, &printer, level);
- /* write the ASCII on disk */
- status = add_a_printer(printer, level);
- if (status != 0x0)
- {
- close_printer_handle(handle);
- return status;
- }
+ unistr2_to_ascii(share_name, &((info->info_2)->portname), sizeof(share_name)-1);
+
+ slprintf(name, sizeof(name)-1, "\\\\%s\\%s", global_myname, share_name);
- info2=info->info_2;
- portname=&(info2->portname);
+ create_printer_hnd(handle);
- StrnCpy(server_name, global_myname, strlen(global_myname) );
- unistr2_to_ascii(share_name, portname, sizeof(share_name)-1);
+ open_printer_hnd(handle);
+
+ if (!set_printer_hnd_printertype(handle, name)) {
+ close_printer_handle(handle);
+ return NT_STATUS_ACCESS_DENIED;
+ }
- slprintf(ascii_name, sizeof(ascii_name)-1, "\\\\%s\\%s",
- server_name, share_name);
-
- if (!set_printer_hnd_printertype(handle, ascii_name) ||
- !set_printer_hnd_printername(handle, ascii_name))
- {
+ if (!set_printer_hnd_printername(handle, name)) {
close_printer_handle(handle);
return NT_STATUS_ACCESS_DENIED;
}
- return NT_STATUS_NOPROBLEMO;
+ /* write the ASCII on disk */
+ if (add_a_printer(printer, level) != 0x0) {
+ close_printer_handle(handle);
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
@@ -2996,46 +3526,84 @@ uint32 _spoolss_addprinterdriver( const UNISTR2 *server_name,
const SPOOL_PRINTER_DRIVER_INFO_LEVEL *info)
{
NT_PRINTER_DRIVER_INFO_LEVEL driver;
+
convert_printer_driver_info(info, &driver, level);
- return add_a_printer_driver(driver, level);
+
+ if (add_a_printer_driver(driver, level)!=0)
+ return NT_STATUS_ACCESS_DENIED;
+
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_getprinterdriverdirectory( const UNISTR2 *name,
- const UNISTR2 *uni_environment,
- uint32 level,
- DRIVER_DIRECTORY_CTR *ctr,
- uint32 *offered)
+static void fill_driverdir_1(DRIVER_DIRECTORY_1 *info, char *name)
+{
+ init_unistr(&(info->name), name);
+}
+
+/****************************************************************************
+****************************************************************************/
+static uint32 getprinterdriverdir_level_1(UNISTR2 *name, UNISTR2 *uni_environment, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
{
pstring chaine;
pstring long_archi;
- pstring archi;
-
+ pstring short_archi;
+ DRIVER_DIRECTORY_1 *info=NULL;
+
+ info=(DRIVER_DIRECTORY_1 *)malloc(sizeof(DRIVER_DIRECTORY_1));
+
unistr2_to_ascii(long_archi, uni_environment, sizeof(long_archi)-1);
- get_short_archi(archi, long_archi);
+ get_short_archi(short_archi, long_archi);
- slprintf(chaine,sizeof(chaine)-1,"\\\\%s\\print$\\%s",
- global_myname, archi);
+ slprintf(chaine, sizeof(chaine)-1, "\\\\%s\\print$\\%s", global_myname, short_archi);
DEBUG(4,("printer driver directory: [%s]\n", chaine));
-
- make_unistr(&(ctr->driver.info_1.name), chaine);
- return NT_STATUS_NOPROBLEMO;
+ fill_driverdir_1(info, chaine);
+
+ *needed += spoolss_size_driverdir_info_1(info);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ new_smb_io_driverdir_1("", buffer, info, 0);
+
+ safe_free(info);
+
+ if (*needed > offered)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_enumprinterdata(const POLICY_HND *handle,
- uint32 idx,
- uint32 *valuesize,
- UNISTR *uni_value,
- uint32 *realvaluesize,
- uint32 *type,
- uint32 *datasize,
- uint8 **data,
- uint32 *realdatasize)
+uint32 _spoolss_getprinterdriverdirectory(UNISTR2 *name, UNISTR2 *uni_environment, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed)
+{
+ DEBUG(4,("_spoolss_getprinterdriverdirectory\n"));
+
+ *needed=0;
+
+ switch(level) {
+ case 1:
+ return getprinterdriverdir_level_1(name, uni_environment, buffer, offered, needed);
+ break;
+ default:
+ return NT_STATUS_INVALID_INFO_CLASS;
+ break;
+ }
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_enumprinterdata(const POLICY_HND *handle, uint32 index,
+ uint32 in_value_len, uint32 in_data_len,
+ uint32 *out_max_value_len, uint16 **out_value, uint32 *out_value_len,
+ uint32 *out_type,
+ uint32 *out_max_data_len, uint8 **out_data, uint32 *out_data_len)
{
NT_PRINTER_INFO_LEVEL printer;
@@ -3045,94 +3613,102 @@ uint32 _spoolss_enumprinterdata(const POLICY_HND *handle,
uint32 biggest_valuesize;
uint32 biggest_datasize;
uint32 data_len;
- uint32 status = NT_STATUS_NOPROBLEMO;
-
- PRINT_HND_INFO *pnum = find_printer_index_by_hnd(handle);
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
int snum;
+ uint8 *data=NULL;
+ uint32 type;
ZERO_STRUCT(printer);
- (*data)=NULL;
+
+ *out_max_value_len=0;
+ *out_value=NULL;
+ *out_value_len=0;
+
+ *out_type=0;
+
+ *out_max_data_len=0;
+ *out_data=NULL;
+ *out_data_len=0;
DEBUG(5,("spoolss_enumprinterdata\n"));
- if (INVALID_HANDLE(pnum))
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
+
if (!get_printer_snum(handle, &snum))
- {
return NT_STATUS_INVALID_HANDLE;
- }
- status = get_a_printer(&printer, 2, lp_servicename(snum));
-
- if (status != 0x0)
- {
- return status;
- }
+
+ if (get_a_printer(&printer, 2, lp_servicename(snum)) != 0x0)
+ return NT_STATUS_INVALID_HANDLE;
- /* The NT machine wants to know the biggest size of value and data */
- if ( ((*valuesize)==0) && ((*datasize)==0) )
- {
+ /*
+ * The NT machine wants to know the biggest size of value and data
+ *
+ * cf: MSDN EnumPrinterData remark section
+ */
+ if ( (in_value_len==0) && (in_data_len==0) ) {
DEBUGADD(6,("Activating NT mega-hack to find sizes\n"));
- (*valuesize)=0;
- (*realvaluesize)=0;
- (*type)=0;
- (*datasize)=0;
- (*realdatasize)=0;
- status=0;
-
param_index=0;
biggest_valuesize=0;
biggest_datasize=0;
- while (get_specific_param_by_index(printer, 2, param_index, value, data, type, &data_len))
- {
+ while (get_specific_param_by_index(printer, 2, param_index, value, &data, &type, &data_len)) {
if (strlen(value) > biggest_valuesize) biggest_valuesize=strlen(value);
- if (data_len > biggest_datasize) biggest_datasize=data_len;
+ if (data_len > biggest_datasize) biggest_datasize=data_len;
+
+ DEBUG(6,("current values: [%d], [%d]\n", biggest_valuesize, biggest_datasize));
+ safe_free(data);
param_index++;
}
-
- /* I wrote it, I didn't designed the protocol */
- if (biggest_valuesize!=0)
- {
- SIVAL(&(value),0, 2*(biggest_valuesize+1) );
- }
- (*data)=(uint8 *)malloc(4*sizeof(uint8));
- SIVAL((*data), 0, biggest_datasize );
+
+ /* the value is an UNICODE string but realvaluesize is the length in bytes including the leading 0 */
+ *out_value_len=2*(1+biggest_valuesize);
+ *out_data_len=biggest_datasize;
+
+ DEBUG(6,("final values: [%d], [%d]\n", *out_value_len, *out_data_len));
+
+ free_a_printer(printer, 2);
+ return NT_STATUS_NO_PROBLEMO;
}
- else
- {
- /*
- * the value len is wrong in NT sp3
- * that's the number of bytes not the number of unicode chars
- */
-
- if (get_specific_param_by_index(printer, 2, idx, value, data, type, &data_len))
- {
- make_unistr(uni_value, value);
-
- /* the length are in bytes including leading NULL */
- (*realvaluesize)=2*(strlen(value)+1);
- (*realdatasize)=data_len;
-
- status=0;
- }
- else
- {
- (*valuesize)=0;
- (*realvaluesize)=0;
- (*datasize)=0;
- (*realdatasize)=0;
- (*type)=0;
- status=0x0103; /* ERROR_NO_MORE_ITEMS */
- }
+
+ /*
+ * the value len is wrong in NT sp3
+ * that's the number of bytes not the number of unicode chars
+ */
+
+ if (!get_specific_param_by_index(printer, 2, index, value, &data, &type, &data_len)) {
+ free_a_printer(printer, 2);
+ return 0x0103; /* ERROR_NO_MORE_ITEMS */
}
+
+ /*
+ * the value is:
+ * - counted in bytes in the request
+ * - counted in UNICODE chars in the max reply
+ * - counted in bytes in the real size
+ *
+ * take a pause *before* coding not *during* coding
+ */
+
+ *out_max_value_len=in_value_len/2;
+ *out_value=(uint16 *)malloc(in_value_len*sizeof(uint8));
+ ascii_to_unistr(*out_value, value, *out_max_value_len);
+ *out_value_len=2*(1+strlen(value));
+
+ *out_type=type;
+
+ /* the data is counted in bytes */
+ *out_max_data_len=in_data_len;
+ *out_data=(uint8 *)malloc(in_data_len*sizeof(uint8));
+ memcpy(*out_data, data, data_len);
+ *out_data_len=data_len;
+
+ safe_free(data);
free_a_printer(printer, 2);
-
- return status;
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
@@ -3148,28 +3724,22 @@ uint32 _spoolss_setprinterdata( const POLICY_HND *handle,
NT_PRINTER_INFO_LEVEL printer;
NT_PRINTER_PARAM *param = NULL;
- PRINT_HND_INFO *pnum=0;
int snum=0;
- uint32 status = NT_STATUS_NOPROBLEMO;
+ uint32 status = 0x0;
+ Printer_entry *Printer=find_printer_index_by_hnd(handle);
DEBUG(5,("spoolss_setprinterdata\n"));
- pnum = find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(pnum))
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
+
if (!get_printer_snum(handle, &snum))
- {
return NT_STATUS_INVALID_HANDLE;
- }
status = get_a_printer(&printer, 2, lp_servicename(snum));
if (status != 0x0)
- {
return status;
- }
convert_specific_param(&param, value , type, data, real_len);
unlink_specific_param_if_exist(printer.info_2, param);
@@ -3193,18 +3763,14 @@ uint32 _spoolss_addform( const POLICY_HND *handle,
uint32 level,
const FORM *form)
{
- PRINT_HND_INFO *pnum=0;
int count=0;
nt_forms_struct *list=NULL;
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
DEBUG(5,("spoolss_addform\n"));
- pnum = find_printer_index_by_hnd(handle);
-
- if (INVALID_HANDLE(pnum))
- {
+ if (!OPEN_HANDLE(Printer))
return NT_STATUS_INVALID_HANDLE;
- }
count=get_ntforms(&list);
add_a_form(&list, form, &count);
@@ -3212,7 +3778,7 @@ uint32 _spoolss_addform( const POLICY_HND *handle,
safe_free(list);
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
/****************************************************************************
@@ -3222,14 +3788,13 @@ uint32 _spoolss_setform( const POLICY_HND *handle,
uint32 level,
const FORM *form)
{
- PRINT_HND_INFO *pnum=NULL;
int count=0;
nt_forms_struct *list=NULL;
+ Printer_entry *Printer = find_printer_index_by_hnd(handle);
DEBUG(5,("spoolss_setform\n"));
- pnum = find_printer_index_by_hnd(handle);
- if (INVALID_HANDLE(pnum))
+ if (!OPEN_HANDLE(Printer))
{
return NT_STATUS_INVALID_HANDLE;
}
@@ -3239,17 +3804,43 @@ uint32 _spoolss_setform( const POLICY_HND *handle,
safe_free(list);
- return NT_STATUS_NOPROBLEMO;
+ return 0x0;
}
/****************************************************************************
+ enumprintprocessors level 1.
****************************************************************************/
-uint32 _spoolss_enumprintprocessors(const UNISTR2 *name,
- const UNISTR2 *environment,
- uint32 level,
- PRINTPROCESSOR_1 **info_1,
- uint32 *offered,
- uint32 *numofprintprocessors)
+static uint32 enumprintprocessors_level_1(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ PRINTPROCESSOR_1 *info_1=NULL;
+
+ info_1 = (PRINTPROCESSOR_1 *)malloc(sizeof(PRINTPROCESSOR_1));
+ (*returned) = 0x1;
+
+ init_unistr(&(info_1->name), "winprint");
+
+ *needed += spoolss_size_printprocessor_info_1(info_1);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ smb_io_printprocessor_info_1("", buffer, info_1, 0);
+
+ safe_free(info_1);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_enumprintprocessors(UNISTR2 *name, UNISTR2 *environment, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
{
DEBUG(5,("spoolss_enumprintprocessors\n"));
@@ -3260,26 +3851,134 @@ uint32 _spoolss_enumprintprocessors(const UNISTR2 *name,
* and I can use my nice printer checker.
*/
- (*numofprintprocessors) = 0x1;
- (*info_1) = (PRINTPROCESSOR_1 *)malloc(sizeof(PRINTPROCESSOR_1));
+ *returned=0;
+ *needed=0;
- if ((*info_1) == NULL)
- {
- return NT_STATUS_NO_MEMORY;
+ switch (level) {
+ case 1:
+ return enumprintprocessors_level_1(buffer, offered, needed, returned);
+ break;
+ default:
+ return NT_STATUS_INVALID_INFO_CLASS;
+ break;
}
+}
- make_unistr(&((*info_1)->name), "winprint");
+/****************************************************************************
+ enumprintprocdatatypes level 1.
+****************************************************************************/
+static uint32 enumprintprocdatatypes_level_1(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ PRINTPROCDATATYPE_1 *info_1=NULL;
+
+ info_1 = (PRINTPROCDATATYPE_1 *)malloc(sizeof(PRINTPROCDATATYPE_1));
+ (*returned) = 0x1;
+
+ init_unistr(&(info_1->name), "RAW");
+
+ *needed += spoolss_size_printprocdatatype_info_1(info_1);
- return NT_STATUS_NOPROBLEMO;
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ smb_io_printprocdatatype_info_1("", buffer, info_1, 0);
+
+ safe_free(info_1);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
}
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_enumprintmonitors( const UNISTR2 *name,
- uint32 level,
- PRINTMONITOR_1 **info_1,
- uint32 *offered,
- uint32 *numofprintmonitors)
+uint32 _spoolss_enumprintprocdatatypes(UNISTR2 *name, UNISTR2 *processor, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
+{
+ DEBUG(5,("_spoolss_enumprintprocdatatypes\n"));
+
+ *returned=0;
+ *needed=0;
+
+ switch (level) {
+ case 1:
+ return enumprintprocdatatypes_level_1(buffer, offered, needed, returned);
+ break;
+ default:
+ return NT_STATUS_INVALID_INFO_CLASS;
+ break;
+ }
+}
+
+/****************************************************************************
+ enumprintmonitors level 1.
+****************************************************************************/
+static uint32 enumprintmonitors_level_1(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ PRINTMONITOR_1 *info_1=NULL;
+
+ info_1 = (PRINTMONITOR_1 *)malloc(sizeof(PRINTMONITOR_1));
+ (*returned) = 0x1;
+
+ init_unistr(&(info_1->name), "Local Port");
+
+ *needed += spoolss_size_printmonitor_info_1(info_1);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ smb_io_printmonitor_info_1("", buffer, info_1, 0);
+
+ safe_free(info_1);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+ enumprintmonitors level 2.
+****************************************************************************/
+static uint32 enumprintmonitors_level_2(NEW_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+{
+ PRINTMONITOR_2 *info_2=NULL;
+
+ info_2 = (PRINTMONITOR_2 *)malloc(sizeof(PRINTMONITOR_2));
+ (*returned) = 0x1;
+
+ init_unistr(&(info_2->name), "Local Port");
+ init_unistr(&(info_2->environment), "Windows NT X86");
+ init_unistr(&(info_2->dll_name), "localmon.dll");
+
+ *needed += spoolss_size_printmonitor_info_2(info_2);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ smb_io_printmonitor_info_2("", buffer, info_2, 0);
+
+ safe_free(info_2);
+
+ if (*needed > offered) {
+ *returned=0;
+ return ERROR_INSUFFICIENT_BUFFER;
+ }
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_enumprintmonitors(UNISTR2 *name,uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed, uint32 *returned)
{
DEBUG(5,("spoolss_enumprintmonitors\n"));
@@ -3290,98 +3989,145 @@ uint32 _spoolss_enumprintmonitors( const UNISTR2 *name,
* and I can use my nice printer checker.
*/
- (*numofprintmonitors) = 0x1;
- (*info_1) = (PRINTMONITOR_1 *)malloc(sizeof(PRINTMONITOR_1));
- if ((*info_1) == NULL)
- {
+ *returned=0;
+ *needed=0;
+
+ switch (level) {
+ case 1:
+ return enumprintmonitors_level_1(buffer, offered, needed, returned);
+ break;
+ case 2:
+ return enumprintmonitors_level_2(buffer, offered, needed, returned);
+ break;
+ default:
+ return NT_STATUS_INVALID_INFO_CLASS;
+ break;
+ }
+}
+
+/****************************************************************************
+****************************************************************************/
+static uint32 getjob_level_1(print_queue_struct *queue, int count, int snum, uint32 jobid, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ int i=0;
+ BOOL found=False;
+ JOB_INFO_1 *info_1=NULL;
+ info_1=(JOB_INFO_1 *)malloc(sizeof(JOB_INFO_1));
+
+ if (info_1 == NULL) {
+ safe_free(queue);
return NT_STATUS_NO_MEMORY;
}
+
+ for (i=0; i<count && found==False; i++) {
+ if (queue[i].job==(int)jobid)
+ found=True;
+ }
+
+ if (found==False) {
+ safe_free(queue);
+ /* I shoud reply something else ... I can't find the good one */
+ return NT_STATUS_NO_PROBLEMO;
+ }
+
+ fill_job_info_1(info_1, &(queue[i]), i, snum);
- make_unistr(&((*info_1)->name), "Local Port");
+ *needed += spoolss_size_job_info_1(info_1);
- return NT_STATUS_NOPROBLEMO;
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ new_smb_io_job_info_1("", buffer, info_1, 0);
+
+ safe_free(info_1);
+
+ if (*needed > offered)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
}
+
/****************************************************************************
****************************************************************************/
-uint32 _spoolss_getjob( const POLICY_HND *handle,
- uint32 jobid,
- uint32 level,
- PJOB_INFO *ctr,
- uint32 *offered)
+static uint32 getjob_level_2(print_queue_struct *queue, int count, int snum, uint32 jobid, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+{
+ int i=0;
+ BOOL found=False;
+ JOB_INFO_2 *info_2=NULL;
+ info_2=(JOB_INFO_2 *)malloc(sizeof(JOB_INFO_2));
+
+ if (info_2 == NULL) {
+ safe_free(queue);
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ for (i=0; i<count && found==False; i++) {
+ if (queue[i].job==(int)jobid)
+ found=True;
+ }
+
+ if (found==False) {
+ safe_free(queue);
+ /* I shoud reply something else ... I can't find the good one */
+ return NT_STATUS_NO_PROBLEMO;
+ }
+
+ fill_job_info_2(info_2, &(queue[i]), i, snum);
+
+ *needed += spoolss_size_job_info_2(info_2);
+
+ if (!alloc_buffer_size(buffer, *needed))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ new_smb_io_job_info_2("", buffer, info_2, 0);
+
+ safe_free(info_2);
+
+ if (*needed > offered)
+ return ERROR_INSUFFICIENT_BUFFER;
+ else
+ return NT_STATUS_NO_PROBLEMO;
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 _spoolss_getjob( POLICY_HND *handle, uint32 jobid, uint32 level,
+ NEW_BUFFER *buffer, uint32 offered,
+ uint32 *needed)
{
int snum;
int count;
- int i;
print_queue_struct *queue=NULL;
print_status_struct prt_status;
- DEBUG(4,("spoolss_getjob\n"));
+ DEBUG(5,("spoolss_getjob\n"));
- bzero(&prt_status,sizeof(prt_status));
+ memset(&prt_status, 0, sizeof(prt_status));
+ *needed=0;
+
if (!get_printer_snum(handle, &snum))
{
return NT_STATUS_INVALID_HANDLE;
}
+
count=get_printqueue(snum, NULL, UID_FIELD_INVALID, &queue, &prt_status);
DEBUGADD(4,("count:[%d], prt_status:[%d], [%s]\n",
count, prt_status.status, prt_status.message));
-
- switch (level)
- {
- case 1:
- {
- JOB_INFO_1 *job_info_1=NULL;
- job_info_1=(JOB_INFO_1 *)malloc(sizeof(JOB_INFO_1));
-
- if (job_info_1 == NULL)
- {
- safe_free(queue);
- return NT_STATUS_NO_MEMORY;
- }
-
- for (i=0; i<count; i++)
- {
- if (queue[i].job==(int)jobid)
- {
- fill_job_info_1(job_info_1,
- &(queue[i]), i, snum);
- }
- }
- ctr->job.job_info_1=job_info_1;
- break;
- }
- case 2:
- {
- JOB_INFO_2 *job_info_2=NULL;
- job_info_2=(JOB_INFO_2 *)malloc(sizeof(JOB_INFO_2));
-
- if (job_info_2 == NULL)
- {
- safe_free(queue);
- return NT_STATUS_NO_MEMORY;
- }
-
- for (i=0; i<count; i++)
- {
- if (queue[i].job==(int)jobid)
- {
- fill_job_info_2(job_info_2,
- &(queue[i]), i, snum);
- }
- }
- ctr->job.job_info_2=job_info_2;
- break;
- }
- default:
- {
- safe_free(queue);
- return NT_STATUS_INVALID_INFO_CLASS;
- }
+
+ switch (level) {
+ case 1:
+ return getjob_level_1(queue, count, snum, jobid, buffer, offered, needed);
+ break;
+ case 2:
+ return getjob_level_1(queue, count, snum, jobid, buffer, offered, needed);
+ break;
+ default:
+ safe_free(queue);
+ return NT_STATUS_INVALID_INFO_CLASS;
+ break;
}
-
- safe_free(queue);
- return NT_STATUS_NOPROBLEMO;
}
+
View Lorry Controller Status