diff options
| author | Jean-François Micouleau <jfm@samba.org> | 2000-03-06 11:13:40 +0000 |
|---|---|---|
| committer | Jean-François Micouleau <jfm@samba.org> | 2000-03-06 11:13:40 +0000 |
| commit | 78d7ba5ca021518ec5c088eb492b36710e556c31 (patch) | |
| tree | 6e1181444ca5220bb185861bb8f68376d30670a9 /source3/include/rpc_spoolss.h | |
| parent | 5eae8c7b0225aa4f4818edc1becbf399bb4cd42e (diff) | |
| download | samba-78d7ba5ca021518ec5c088eb492b36710e556c31.tar.gz samba-78d7ba5ca021518ec5c088eb492b36710e556c31.tar.bz2 samba-78d7ba5ca021518ec5c088eb492b36710e556c31.zip | |
changed prs_unistr to parse empty and non-empty strings the same way.
fixed typo in SPOOLSS_SYNT
some cleanup of unused functions
wrote make_spoolss_enumprinter and make_spoolss_openprinterex for
rpcclient as I'm trying to keep in sync the parsing code between HEAD and
TNG.
Will commit changes to TNG after lunch.
J.F.
(This used to be commit 025cdb345f6de287a41d4449b2662dbc5e762bf2)
Diffstat (limited to 'source3/include/rpc_spoolss.h')
| -rwxr-xr-x | source3/include/rpc_spoolss.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h index b5aa50ecba..69820676cc 100755 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -106,12 +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 @@ -150,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 @@ -747,12 +746,8 @@ typedef struct 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 |