diff options
| -rw-r--r-- | source/libads/ldap_printer.c | 21 | ||||
| -rw-r--r-- | source/python/py_spoolss_drivers.c | 27 | ||||
| -rw-r--r-- | source/python/py_spoolss_forms.c | 16 | ||||
| -rw-r--r-- | source/python/py_spoolss_jobs.c | 18 | ||||
| -rw-r--r-- | source/python/py_spoolss_ports.c | 8 | ||||
| -rw-r--r-- | source/python/py_spoolss_printerdata.c | 35 | ||||
| -rw-r--r-- | source/python/py_spoolss_printers.c | 18 | ||||
| -rw-r--r-- | source/rpc_client/cli_spoolss.c | 2739 | ||||
| -rw-r--r-- | source/rpcclient/cmd_spoolss.c | 360 | ||||
| -rw-r--r-- | source/utils/net_rpc_printer.c | 60 |
10 files changed, 1187 insertions, 2115 deletions
diff --git a/source/libads/ldap_printer.c b/source/libads/ldap_printer.c index 68e67358910..6b053f8b4a3 100644 --- a/source/libads/ldap_printer.c +++ b/source/libads/ldap_printer.c @@ -267,7 +267,7 @@ WERROR get_remote_printer_publishing_data(struct cli_state *cli, char *printername, *servername; REGVAL_CTR dsdriver_ctr, dsspooler_ctr; BOOL got_dsdriver = False, got_dsspooler = False; - uint32 needed, i; + uint32 i; POLICY_HND pol; asprintf(&servername, "\\\\%s", cli->desthost); @@ -286,14 +286,7 @@ WERROR get_remote_printer_publishing_data(struct cli_state *cli, return result; } - result = cli_spoolss_enumprinterdataex(cli, mem_ctx, 0, &needed, - &pol, SPOOL_DSDRIVER_KEY, NULL); - - if (W_ERROR_V(result) == ERRmoredata) - result = cli_spoolss_enumprinterdataex(cli, mem_ctx, needed, - NULL, &pol, - SPOOL_DSDRIVER_KEY, - &dsdriver_ctr); + result = cli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSDRIVER_KEY, NULL); if (!W_ERROR_IS_OK(result)) { DEBUG(3, ("Unable to do enumdataex on %s, error is %s.\n", @@ -307,15 +300,7 @@ WERROR get_remote_printer_publishing_data(struct cli_state *cli, dsdriver_ctr.values[i]); } - result = cli_spoolss_enumprinterdataex(cli, mem_ctx, 0, &needed, - &pol, SPOOL_DSSPOOLER_KEY, - NULL); - - if (W_ERROR_V(result) == ERRmoredata) - result = cli_spoolss_enumprinterdataex(cli, mem_ctx, needed, - NULL, &pol, - SPOOL_DSSPOOLER_KEY, - &dsspooler_ctr); + result = cli_spoolss_enumprinterdataex(cli, mem_ctx, &pol, SPOOL_DSSPOOLER_KEY, NULL); if (!W_ERROR_IS_OK(result)) { DEBUG(3, ("Unable to do enumdataex on %s, error is %s.\n", diff --git a/source/python/py_spoolss_drivers.c b/source/python/py_spoolss_drivers.c index 310f978188c..abc9a4ba9cb 100644 --- a/source/python/py_spoolss_drivers.c +++ b/source/python/py_spoolss_drivers.c @@ -29,7 +29,7 @@ PyObject *spoolss_enumprinterdrivers(PyObject *self, PyObject *args, PyObject *result = NULL, *creds = NULL; PRINTER_DRIVER_CTR ctr; int level = 1, i; - uint32 needed, num_drivers; + uint32 num_drivers; char *arch = "Windows NT x86", *server, *errstr; static char *kwlist[] = {"server", "level", "creds", "arch", NULL}; struct cli_state *cli = NULL; @@ -70,14 +70,9 @@ PyObject *spoolss_enumprinterdrivers(PyObject *self, PyObject *args, } werror = cli_spoolss_enumprinterdrivers( - cli, mem_ctx, 0, &needed, level, arch, + cli, mem_ctx, level, arch, &num_drivers, &ctr); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_enumprinterdrivers( - cli, mem_ctx, needed, NULL, level, arch, - &num_drivers, &ctr); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); goto done; @@ -175,7 +170,6 @@ PyObject *spoolss_hnd_getprinterdriver(PyObject *self, PyObject *args, PyObject *result = Py_None; PRINTER_DRIVER_CTR ctr; int level = 1; - uint32 needed; char *arch = "Windows NT x86"; int version = 2; static char *kwlist[] = {"level", "arch", NULL}; @@ -188,15 +182,9 @@ PyObject *spoolss_hnd_getprinterdriver(PyObject *self, PyObject *args, /* Call rpc function */ - werror = cli_spoolss_getprinterdriver( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, level, + werror = cli_spoolss_getprinterdriver(hnd->cli, hnd->mem_ctx, &hnd->pol, level, arch, version, &ctr); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_getprinterdriver( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, - level, arch, version, &ctr); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); return NULL; @@ -234,7 +222,7 @@ PyObject *spoolss_getprinterdriverdir(PyObject *self, PyObject *args, WERROR werror; PyObject *result = NULL, *creds = NULL; DRIVER_DIRECTORY_CTR ctr; - uint32 needed, level = 1; + uint32 level = 1; char *arch = "Windows NT x86", *server, *errstr; static char *kwlist[] = {"server", "level", "arch", "creds", NULL}; struct cli_state *cli = NULL; @@ -274,12 +262,7 @@ PyObject *spoolss_getprinterdriverdir(PyObject *self, PyObject *args, goto done; } - werror = cli_spoolss_getprinterdriverdir( - cli, mem_ctx, 0, &needed, level, arch, &ctr); - - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_getprinterdriverdir( - cli, mem_ctx, needed, NULL, level, arch, &ctr); + werror = cli_spoolss_getprinterdriverdir(cli, mem_ctx, level, arch, &ctr); if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); diff --git a/source/python/py_spoolss_forms.c b/source/python/py_spoolss_forms.c index 66a6540e074..00c5b18e18d 100644 --- a/source/python/py_spoolss_forms.c +++ b/source/python/py_spoolss_forms.c @@ -101,14 +101,9 @@ PyObject *spoolss_hnd_getform(PyObject *self, PyObject *args, PyObject *kw) /* Call rpc function */ - werror = cli_spoolss_getform(hnd->cli, hnd->mem_ctx, 0, &needed, + werror = cli_spoolss_getform(hnd->cli, hnd->mem_ctx, &hnd->pol, form_name, level, &form); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_getform( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, - form_name, 1, &form); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); return NULL; @@ -211,7 +206,7 @@ PyObject *spoolss_hnd_enumforms(PyObject *self, PyObject *args, PyObject *kw) PyObject *result; spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; - uint32 level = 1, num_forms, needed, i; + uint32 level = 1, num_forms, i; static char *kwlist[] = {"level", NULL}; FORM_1 *forms; @@ -224,14 +219,9 @@ PyObject *spoolss_hnd_enumforms(PyObject *self, PyObject *args, PyObject *kw) /* Call rpc function */ werror = cli_spoolss_enumforms( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, level, + hnd->cli, hnd->mem_ctx, &hnd->pol, level, &num_forms, &forms); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_enumforms( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, level, - &num_forms, &forms); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); return NULL; diff --git a/source/python/py_spoolss_jobs.c b/source/python/py_spoolss_jobs.c index 59754bd36dd..8ea0ebc073a 100644 --- a/source/python/py_spoolss_jobs.c +++ b/source/python/py_spoolss_jobs.c @@ -28,7 +28,7 @@ PyObject *spoolss_hnd_enumjobs(PyObject *self, PyObject *args, PyObject *kw) WERROR werror; PyObject *result; int level = 1; - uint32 i, needed, num_jobs; + uint32 i, num_jobs; static char *kwlist[] = {"level", NULL}; JOB_INFO_CTR ctr; @@ -40,14 +40,9 @@ PyObject *spoolss_hnd_enumjobs(PyObject *self, PyObject *args, PyObject *kw) /* Call rpc function */ werror = cli_spoolss_enumjobs( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, level, 0, + hnd->cli, hnd->mem_ctx, &hnd->pol, level, 0, 1000, &num_jobs, &ctr); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_enumjobs( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, - level, 0, 1000, &num_jobs, &ctr); - /* Return value */ result = Py_None; @@ -123,7 +118,7 @@ PyObject *spoolss_hnd_getjob(PyObject *self, PyObject *args, PyObject *kw) spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; WERROR werror; PyObject *result; - uint32 level = 1, jobid, needed; + uint32 level = 1, jobid; static char *kwlist[] = {"jobid", "level", NULL}; JOB_INFO_CTR ctr; @@ -135,14 +130,9 @@ PyObject *spoolss_hnd_getjob(PyObject *self, PyObject *args, PyObject *kw) /* Call rpc function */ - werror = cli_spoolss_getjob(hnd->cli, hnd->mem_ctx, 0, &needed, + werror = cli_spoolss_getjob(hnd->cli, hnd->mem_ctx, &hnd->pol, jobid, level, &ctr); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_getjob( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, - jobid, level, &ctr); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); return NULL; diff --git a/source/python/py_spoolss_ports.c b/source/python/py_spoolss_ports.c index ddc8868f0f5..11a4615bbdb 100644 --- a/source/python/py_spoolss_ports.c +++ b/source/python/py_spoolss_ports.c @@ -67,13 +67,7 @@ PyObject *spoolss_enumports(PyObject *self, PyObject *args, PyObject *kw) /* Call rpc function */ - werror = cli_spoolss_enum_ports( - cli, mem_ctx, 0, &needed, level, &num_ports, &ctr); - - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_enum_ports( - cli, mem_ctx, needed, NULL, level, - &num_ports, &ctr); + werror = cli_spoolss_enum_ports( cli, mem_ctx, level, &num_ports, &ctr); if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); diff --git a/source/python/py_spoolss_printerdata.c b/source/python/py_spoolss_printerdata.c index f165475b080..6fc4227ad21 100644 --- a/source/python/py_spoolss_printerdata.c +++ b/source/python/py_spoolss_printerdata.c @@ -112,7 +112,6 @@ PyObject *spoolss_hnd_getprinterdata(PyObject *self, PyObject *args, PyObject *k static char *kwlist[] = { "value", NULL }; char *valuename; WERROR werror; - uint32 needed; PyObject *result; REGISTRY_VALUE value; @@ -124,14 +123,9 @@ PyObject *spoolss_hnd_getprinterdata(PyObject *self, PyObject *args, PyObject *k /* Call rpc function */ werror = cli_spoolss_getprinterdata( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, valuename, + hnd->cli, hnd->mem_ctx, &hnd->pol, valuename, &value); - if (W_ERROR_V(werror) == ERRmoredata) - werror = cli_spoolss_getprinterdata( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, - valuename, &value); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); return NULL; @@ -255,7 +249,6 @@ PyObject *spoolss_hnd_getprinterdataex(PyObject *self, PyObject *args, PyObject static char *kwlist[] = { "key", "value", NULL }; char *key, *valuename; WERROR werror; - uint32 needed; PyObject *result; REGISTRY_VALUE value; @@ -267,14 +260,9 @@ PyObject *spoolss_hnd_getprinterdataex(PyObject *self, PyObject *args, PyObject /* Call rpc function */ werror = cli_spoolss_getprinterdataex( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, key, + hnd->cli, hnd->mem_ctx, &hnd->pol, key, valuename, &value); - if (W_ERROR_V(werror) == ERRmoredata) - werror = cli_spoolss_getprinterdataex( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, key, - valuename, &value); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); return NULL; @@ -323,7 +311,7 @@ PyObject *spoolss_hnd_enumprinterdataex(PyObject *self, PyObject *args, PyObject { spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self; static char *kwlist[] = { "key", NULL }; - uint32 needed, i; + uint32 i; char *key; WERROR werror; PyObject *result; @@ -334,13 +322,7 @@ PyObject *spoolss_hnd_enumprinterdataex(PyObject *self, PyObject *args, PyObject /* Get max buffer sizes for value and data */ - werror = cli_spoolss_enumprinterdataex( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, key, &ctr); - - if (W_ERROR_V(werror) == ERRmoredata) - werror = cli_spoolss_enumprinterdataex( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, key, - &ctr); + werror = cli_spoolss_enumprinterdataex(hnd->cli, hnd->mem_ctx, &hnd->pol, key, &ctr); if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); @@ -400,7 +382,7 @@ PyObject *spoolss_hnd_enumprinterkey(PyObject *self, PyObject *args, static char *kwlist[] = { "key", NULL }; char *keyname; WERROR werror; - uint32 needed, keylist_len; + uint32 keylist_len; uint16 *keylist; PyObject *result; @@ -412,14 +394,9 @@ PyObject *spoolss_hnd_enumprinterkey(PyObject *self, PyObject *args, /* Call rpc function */ werror = cli_spoolss_enumprinterkey( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, + hnd->cli, hnd->mem_ctx, &hnd->pol, keyname, &keylist, &keylist_len); - if (W_ERROR_V(werror) == ERRmoredata) - werror = cli_spoolss_enumprinterkey( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, - keyname, &keylist, &keylist_len); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); return NULL; diff --git a/source/python/py_spoolss_printers.c b/source/python/py_spoolss_printers.c index 7446e2d2828..aab2d634a34 100644 --- a/source/python/py_spoolss_printers.c +++ b/source/python/py_spoolss_printers.c @@ -127,7 +127,6 @@ PyObject *spoolss_hnd_getprinter(PyObject *self, PyObject *args, PyObject *kw) PyObject *result = NULL; PRINTER_INFO_CTR ctr; int level = 1; - uint32 needed; static char *kwlist[] = {"level", NULL}; /* Parse parameters */ @@ -140,12 +139,7 @@ PyObject *spoolss_hnd_getprinter(PyObject *self, PyObject *args, PyObject *kw) /* Call rpc function */ werror = cli_spoolss_getprinter( - hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, level, &ctr); - - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_getprinter( - hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, - level, &ctr); + hnd->cli, hnd->mem_ctx, &hnd->pol, level, &ctr); /* Return value */ @@ -277,7 +271,7 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw) PyObject *result = NULL, *creds = NULL; PRINTER_INFO_CTR ctr; int level = 1, flags = PRINTER_ENUM_LOCAL, i; - uint32 needed, num_printers; + uint32 num_printers; static char *kwlist[] = {"server", "name", "level", "flags", "creds", NULL}; TALLOC_CTX *mem_ctx = NULL; @@ -331,15 +325,9 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw) /* Call rpc function */ - werror = cli_spoolss_enum_printers( - cli, mem_ctx, 0, &needed, name, flags, level, + werror = cli_spoolss_enum_printers(cli, mem_ctx, name, flags, level, &num_printers, &ctr); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_enum_printers( - cli, mem_ctx, needed, NULL, name, flags, - level, &num_printers, &ctr); - if (!W_ERROR_IS_OK(werror)) { PyErr_SetObject(spoolss_werror, py_werror_tuple(werror)); goto done; diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c index 8ed29f50fb9..7ebae0868fa 100644 --- a/source/rpc_client/cli_spoolss.c +++ b/source/rpc_client/cli_spoolss.c @@ -2,7 +2,7 @@ Unix SMB/CIFS implementation. RPC pipe client - Copyright (C) Gerald Carter 2001-2002, + Copyright (C) Gerald Carter 2001-2005, Copyright (C) Tim Potter 2000-2002, Copyright (C) Andrew Tridgell 1994-2000, Copyright (C) Luke Kenneth Casson Leighton 1996-2000, @@ -24,12 +24,7 @@ */ #include "includes.h" - -/** @defgroup spoolss SPOOLSS - NT printing routines - * @ingroup rpc_client - * - * @{ - **/ +#include "rpc_client.h" /********************************************************************* Decode various spoolss rpc's and info levels @@ -37,6 +32,7 @@ /********************************************************************** **********************************************************************/ + static void decode_printer_info_0(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, uint32 returned, PRINTER_INFO_0 **info) { @@ -257,1613 +253,1102 @@ static void decode_printerdriverdir_1 (TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, *info=inf; } -/** Return a handle to the specified printer or print server. - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param printername The name of the printer or print server to be - * opened in UNC format. - * - * @param datatype Specifies the default data type for the printer. - * - * @param access_required The access rights requested on the printer or - * print server. - * - * @param station The UNC name of the requesting workstation. - * - * @param username The name of the user requesting the open. - * - * @param pol Returned policy handle. - */ - -/********************************************************************************* - Win32 API - OpenPrinter() - ********************************************************************************/ +/********************************************************************** +**********************************************************************/ -WERROR cli_spoolss_open_printer_ex(struct cli_state *cli, TALLOC_CTX *mem_ctx, - const char *printername, const char *datatype, uint32 access_required, - const char *station, const char *username, POLICY_HND *pol) +static void decode_jobs_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, + uint32 num_jobs, JOB_INFO_1 **jobs) { - prs_struct qbuf, rbuf; - SPOOL_Q_OPEN_PRINTER_EX q; - SPOOL_R_OPEN_PRINTER_EX r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ + uint32 i; - make_spoolss_q_open_printer_ex(&q, printername, datatype, - access_required, station, username); + *jobs = TALLOC_ARRAY(mem_ctx, JOB_INFO_1, num_jobs); + prs_set_offset(&buffer->prs,0); - /* Marshall data and send request */ + for (i = 0; i < num_jobs; i++) + smb_io_job_info_1("", buffer, &((*jobs)[i]), 0); +} - if (!spoolss_io_q_open_printer_ex("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_OPENPRINTEREX, &qbuf, &rbuf)) - goto done; +/********************************************************************** +**********************************************************************/ - /* Unmarshall response */ +static void decode_jobs_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, + uint32 num_jobs, JOB_INFO_2 **jobs) +{ + uint32 i; - if (!spoolss_io_r_open_printer_ex("", &r, &rbuf, 0)) - goto done; + *jobs = TALLOC_ARRAY(mem_ctx, JOB_INFO_2, num_jobs); + prs_set_offset(&buffer->prs,0); - /* Return output parameters */ + for (i = 0; i < num_jobs; i++) + smb_io_job_info_2("", buffer, &((*jobs)[i]), 0); +} - result = r.status; +/********************************************************************** +**********************************************************************/ - if (W_ERROR_IS_OK(result)) - *pol = r.handle; +static void decode_forms_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, + uint32 num_forms, FORM_1 **forms) +{ + int i; - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + *forms = TALLOC_ARRAY(mem_ctx, FORM_1, num_forms); + prs_set_offset(&buffer->prs,0); - return result; + for (i = 0; i < num_forms; i++) + smb_io_form_1("", buffer, &((*forms)[i]), 0); } -/** Close a printer handle - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param pol Policy handle of printer or print server to close. - */ -/********************************************************************************* - Win32 API - ClosePrinter() - ********************************************************************************/ +/********************************************************************** +**********************************************************************/ -WERROR cli_spoolss_close_printer(struct cli_state *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *pol) +WERROR cli_spoolss_open_printer_ex(struct cli_state *cli, TALLOC_CTX *mem_ctx, + const char *printername, const char *datatype, uint32 access_required, + const char *station, const char *username, POLICY_HND *pol) { prs_struct qbuf, rbuf; - SPOOL_Q_CLOSEPRINTER q; - SPOOL_R_CLOSEPRINTER r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_closeprinter(&q, pol); + SPOOL_Q_OPEN_PRINTER_EX in; + SPOOL_R_OPEN_PRINTER_EX out; - /* Marshall data and send request */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - if (!spoolss_io_q_closeprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_CLOSEPRINTER, &qbuf, &rbuf)) - goto done; + make_spoolss_q_open_printer_ex( &in, printername, datatype, + access_required, station, username ); - /* Unmarshall response */ + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_OPENPRINTEREX, + in, out, + qbuf, rbuf, + spoolss_io_q_open_printer_ex, + spoolss_io_r_open_printer_ex, + WERR_GENERAL_FAILURE ); - if (!spoolss_io_r_closeprinter("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - if (W_ERROR_IS_OK(result)) - *pol = r.handle; + memcpy( pol, &out.handle, sizeof(POLICY_HND) ); + + return out.status; +} - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); +/********************************************************************** +**********************************************************************/ - return result; +WERROR cli_spoolss_close_printer(struct cli_state *cli, TALLOC_CTX *mem_ctx, + POLICY_HND *pol) +{ + prs_struct qbuf, rbuf; + SPOOL_Q_CLOSEPRINTER in; + SPOOL_R_CLOSEPRINTER out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_closeprinter( &in, pol ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_CLOSEPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_closeprinter, + spoolss_io_r_closeprinter, + WERR_GENERAL_FAILURE ); + + return out.status; } -/** Enumerate printers on a print server. - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param offered Buffer size offered in the request. - * @param needed Number of bytes needed to complete the request. - * may be NULL. - * - * @param flags Selected from PRINTER_ENUM_* flags. - * @param level Request information level. - * - * @param num_printers Pointer to number of printers returned. May be - * NULL. - * @param ctr Return structure for printer information. May - * be NULL. - */ -/********************************************************************************* - Win32 API - EnumPrinters() - ********************************************************************************/ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_enum_printers(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, char *name, uint32 flags, uint32 level, uint32 *num_printers, PRINTER_INFO_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMPRINTERS q; - SPOOL_R_ENUMPRINTERS r; + SPOOL_Q_ENUMPRINTERS in; + SPOOL_R_ENUMPRINTERS out; RPC_BUFFER buffer; - WERROR result = W_ERROR(ERRgeneral); + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise input parameters */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - make_spoolss_q_enumprinters(&q, flags, name, level, &buffer, - offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_enumprinters("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENUMPRINTERS, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (spoolss_io_r_enumprinters("", &r, &rbuf, 0)) { - if (needed) - *needed = r.needed; + make_spoolss_q_enumprinters( &in, flags, name, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinters, + spoolss_io_r_enumprinters, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumprinters( &in, flags, name, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinters, + spoolss_io_r_enumprinters, + WERR_GENERAL_FAILURE ); } - - result = r.status; - - /* Return output parameters */ - - if (!W_ERROR_IS_OK(r.status)) - goto done; - - if (num_printers) - *num_printers = r.returned; - if (!ctr) - goto done; + if ( !W_ERROR_IS_OK(out.status) ) + return out.status; switch (level) { case 0: - decode_printer_info_0(mem_ctx, r.buffer, r.returned, - &ctr->printers_0); + decode_printer_info_0(mem_ctx, out.buffer, out.returned, &ctr->printers_0); break; case 1: - decode_printer_info_1(mem_ctx, r.buffer, r.returned, - &ctr->printers_1); + decode_printer_info_1(mem_ctx, out.buffer, out.returned, &ctr->printers_1); break; case 2: - decode_printer_info_2(mem_ctx, r.buffer, r.returned, - &ctr->printers_2); + decode_printer_info_2(mem_ctx, out.buffer, out.returned, &ctr->printers_2); break; case 3: - decode_printer_info_3(mem_ctx, r.buffer, r.returned, - &ctr->printers_3); + decode_printer_info_3(mem_ctx, out.buffer, out.returned, &ctr->printers_3); break; } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + *num_printers = out.returned; - return result; + return out.status; } -/********************************************************************************* - Win32 API - EnumPorts() - ********************************************************************************/ -/** Enumerate printer ports on a print server. - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param offered Buffer size offered in the request. - * @param needed Number of bytes needed to complete the request. - * May be NULL. - * - * @param level Requested information level. - * - * @param num_ports Pointer to number of ports returned. May be NULL. - * @param ctr Pointer to structure holding port information. - * May be NULL. - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_enum_ports(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, uint32 level, uint32 *num_ports, PORT_INFO_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMPORTS q; - SPOOL_R_ENUMPORTS r; + SPOOL_Q_ENUMPORTS in; + SPOOL_R_ENUMPORTS out; RPC_BUFFER buffer; - WERROR result = W_ERROR(ERRgeneral); fstring server; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); + ZERO_STRUCT(in); + ZERO_STRUCT(out); slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); strupper_m(server); - /* Initialise input parameters */ - + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumports( &in, server, level, &buffer, offered ); - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - make_spoolss_q_enumports(&q, server, level, &buffer, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_enumports("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENUMPORTS, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (spoolss_io_r_enumports("", &r, &rbuf, 0)) { - if (needed) - *needed = r.needed; - } + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPORTS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumports, + spoolss_io_r_enumports, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; - result = r.status; - - /* Return output parameters */ - - if (!W_ERROR_IS_OK(result)) - goto done; - - if (num_ports) - *num_ports = r.returned; - - if (!ctr) - goto done; + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumports( &in, server, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPORTS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumports, + spoolss_io_r_enumports, + WERR_GENERAL_FAILURE ); + } + + if ( !W_ERROR_IS_OK(out.status) ) + return out.status; switch (level) { case 1: - decode_port_info_1(mem_ctx, r.buffer, r.returned, - &ctr->port.info_1); + decode_port_info_1(mem_ctx, out.buffer, out.returned, &ctr->port.info_1); break; case 2: - decode_port_info_2(mem_ctx, r.buffer, r.returned, - &ctr->port.info_2); + decode_port_info_2(mem_ctx, out.buffer, out.returned, &ctr->port.info_2); break; } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + *num_ports = out.returned; + + return out.status; } -/********************************************************************************* - Win32 API - GetPrinter() - ********************************************************************************/ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_getprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *pol, uint32 level, PRINTER_INFO_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_GETPRINTER q; - SPOOL_R_GETPRINTER r; + SPOOL_Q_GETPRINTER in; + SPOOL_R_GETPRINTER out; RPC_BUFFER buffer; - WERROR result = W_ERROR(ERRgeneral); + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); + ZERO_STRUCT(in); + ZERO_STRUCT(out); /* Initialise input parameters */ + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getprinter( mem_ctx, &in, pol, level, &buffer, offered ); - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - make_spoolss_q_getprinter(mem_ctx, &q, pol, level, &buffer, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_getprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_GETPRINTER, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_getprinter("", &r, &rbuf, 0)) - goto done; - - if (needed) - *needed = r.needed; - - /* Return output parameters */ - - result = r.status; - - if (W_ERROR_IS_OK(result)) { - switch (level) { - case 0: - decode_printer_info_0(mem_ctx, r.buffer, 1, &ctr->printers_0); - break; - case 1: - decode_printer_info_1(mem_ctx, r.buffer, 1, &ctr->printers_1); - break; - case 2: - decode_printer_info_2(mem_ctx, r.buffer, 1, &ctr->printers_2); - break; - case 3: - decode_printer_info_3(mem_ctx, r.buffer, 1, &ctr->printers_3); - break; - case 7: - decode_printer_info_7(mem_ctx, r.buffer, 1, &ctr->printers_7); - break; - } + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinter, + spoolss_io_r_getprinter, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getprinter( mem_ctx, &in, pol, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinter, + spoolss_io_r_getprinter, + WERR_GENERAL_FAILURE ); } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + if ( !W_ERROR_IS_OK(out.status) ) + return out.status; + + switch (level) { + case 0: + decode_printer_info_0(mem_ctx, out.buffer, 1, &ctr->printers_0); + break; + case 1: + decode_printer_info_1(mem_ctx, out.buffer, 1, &ctr->printers_1); + break; + case 2: + decode_printer_info_2(mem_ctx, out.buffer, 1, &ctr->printers_2); + break; + case 3: + decode_printer_info_3(mem_ctx, out.buffer, 1, &ctr->printers_3); + break; + case 7: + decode_printer_info_7(mem_ctx, out.buffer, 1, &ctr->printers_7); + break; + } - return result; + return out.status; } -/********************************************************************************* - Win32 API - SetPrinter() - ********************************************************************************/ -/** Set printer info - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param pol Policy handle on printer to set info. - * @param level Information level to set. - * @param ctr Pointer to structure holding printer information. - * @param command Specifies the action performed. See - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/prntspol_13ua.asp - * for details. - * - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_setprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *pol, uint32 level, PRINTER_INFO_CTR *ctr, uint32 command) { prs_struct qbuf, rbuf; - SPOOL_Q_SETPRINTER q; - SPOOL_R_SETPRINTER r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise input parameters */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - if (!make_spoolss_q_setprinter(mem_ctx, &q, pol, level, ctr, command)) - goto done; - - /* Marshall data and send request */ - - if (!spoolss_io_q_setprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_SETPRINTER, &qbuf, &rbuf)) - goto done; + SPOOL_Q_SETPRINTER in; + SPOOL_R_SETPRINTER out; - /* Unmarshall response */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - if (!spoolss_io_r_setprinter("", &r, &rbuf, 0)) - goto done; - - result = r.status; + make_spoolss_q_setprinter( mem_ctx, &in, pol, level, ctr, command ); -done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_setprinter, + spoolss_io_r_setprinter, + WERR_GENERAL_FAILURE ); - return result; + return out.status; } -/********************************************************************************* - Win32 API - GetPrinterDriver() - ********************************************************************************/ -/** Get installed printer drivers for a given printer - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param offered Buffer size offered in the request. - * @param needed Number of bytes needed to complete the request. - * may be NULL. - * - * @param pol Pointer to an open policy handle for the printer - * opened with cli_spoolss_open_printer_ex(). - * @param level Requested information level. - * @param env The print environment or archictecture. This is - * "Windows NT x86" for NT4. - * @param ctr Returned printer driver information. - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_getprinterdriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *pol, uint32 level, const char *env, int version, PRINTER_DRIVER_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_GETPRINTERDRIVER2 q; - SPOOL_R_GETPRINTERDRIVER2 r; + SPOOL_Q_GETPRINTERDRIVER2 in; + SPOOL_R_GETPRINTERDRIVER2 out; RPC_BUFFER buffer; - WERROR result = W_ERROR(ERRgeneral); fstring server; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); + ZERO_STRUCT(in); + ZERO_STRUCT(out); fstrcpy(server, cli->desthost); strupper_m(server); - /* Initialise input parameters */ - + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - make_spoolss_q_getprinterdriver2(&q, pol, env, level, version, 2, - &buffer, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_getprinterdriver2 ("", &q, &qbuf, 0) || - !rpc_api_pipe_req (cli, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVER2, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (spoolss_io_r_getprinterdriver2 ("", &r, &rbuf, 0)) { - if (needed) - *needed = r.needed; + make_spoolss_q_getprinterdriver2( &in, pol, env, level, + version, 2, &buffer, offered); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVER2, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdriver2, + spoolss_io_r_getprinterdriver2, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getprinterdriver2( &in, pol, env, level, + version, 2, &buffer, offered); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVER2, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdriver2, + spoolss_io_r_getprinterdriver2, + WERR_GENERAL_FAILURE ); } - - result = r.status; - - /* Return output parameters */ - - if (!W_ERROR_IS_OK(result)) - goto done; - - if (!ctr) - goto done; + + if ( !W_ERROR_IS_OK(out.status) ) + return out.status; switch (level) { case 1: - decode_printer_driver_1(mem_ctx, r.buffer, 1, &ctr->info1); + decode_printer_driver_1(mem_ctx, out.buffer, 1, &ctr->info1); break; case 2: - decode_printer_driver_2(mem_ctx, r.buffer, 1, &ctr->info2); + decode_printer_driver_2(mem_ctx, out.buffer, 1, &ctr->info2); break; case 3: - decode_printer_driver_3(mem_ctx, r.buffer, 1, &ctr->info3); + decode_printer_driver_3(mem_ctx, out.buffer, 1, &ctr->info3); break; - default: - DEBUG(10, ("cli_spoolss_getprinterdriver: unknown info level %d", level)); - return WERR_UNKNOWN_LEVEL; } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } -/********************************************************************************* - Win32 API - EnumPrinterDrivers() - ********************************************************************************/ /********************************************************************** - * Get installed printer drivers for a given printer - */ +**********************************************************************/ + WERROR cli_spoolss_enumprinterdrivers (struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, uint32 level, const char *env, uint32 *num_drivers, PRINTER_DRIVER_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMPRINTERDRIVERS q; - SPOOL_R_ENUMPRINTERDRIVERS r; + SPOOL_Q_ENUMPRINTERDRIVERS in; + SPOOL_R_ENUMPRINTERDRIVERS out; RPC_BUFFER buffer; - WERROR result = W_ERROR(ERRgeneral); fstring server; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); + ZERO_STRUCT(in); + ZERO_STRUCT(out); slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); strupper_m(server); - /* Initialise input parameters */ - + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Write the request */ - - make_spoolss_q_enumprinterdrivers(&q, server, env, level, &buffer, - offered); + make_spoolss_q_enumprinterdrivers( &in, server, env, level, + &buffer, offered); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDRIVERS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinterdrivers, + spoolss_io_r_enumprinterdrivers, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumprinterdrivers( &in, server, env, level, + &buffer, offered); - /* Marshall data and send request */ + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDRIVERS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinterdrivers, + spoolss_io_r_enumprinterdrivers, + WERR_GENERAL_FAILURE ); + } - if (!spoolss_io_q_enumprinterdrivers ("", &q, &qbuf, 0) || - !rpc_api_pipe_req (cli, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDRIVERS, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_enumprinterdrivers ("", &r, &rbuf, 0)) - goto done; - - if (needed) - *needed = r.needed; - - if (num_drivers) - *num_drivers = r.returned; + *num_drivers = out.returned; - result = r.status; - - /* Return output parameters */ - - if (W_ERROR_IS_OK(result) && (r.returned != 0)) { - *num_drivers = r.returned; + if ( !W_ERROR_IS_OK(out.status) ) + return out.status; + + if ( out.returned ) { switch (level) { case 1: - decode_printer_driver_1(mem_ctx, r.buffer, r.returned, &ctr->info1); + decode_printer_driver_1(mem_ctx, out.buffer, out.returned, &ctr->info1); break; case 2: - decode_printer_driver_2(mem_ctx, r.buffer, r.returned, &ctr->info2); + decode_printer_driver_2(mem_ctx, out.buffer, out.returned, &ctr->info2); break; case 3: - decode_printer_driver_3(mem_ctx, r.buffer, r.returned, &ctr->info3); + decode_printer_driver_3(mem_ctx, out.buffer, out.returned, &ctr->info3); break; - default: - DEBUG(10, ("cli_spoolss_enumprinterdrivers: unknown info level %d\n", - level)); - return WERR_UNKNOWN_LEVEL; } } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } -/********************************************************************************* - Win32 API - GetPrinterDriverDirectory() - ********************************************************************************/ /********************************************************************** - * Get installed printer drivers for a given printer - */ +**********************************************************************/ + WERROR cli_spoolss_getprinterdriverdir (struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, uint32 level, char *env, DRIVER_DIRECTORY_CTR *ctr) { - prs_struct qbuf, rbuf; - SPOOL_Q_GETPRINTERDRIVERDIR q; - SPOOL_R_GETPRINTERDRIVERDIR r; - RPC_BUFFER buffer; - WERROR result = W_ERROR(ERRgeneral); - fstring server; + prs_struct qbuf, rbuf; + SPOOL_Q_GETPRINTERDRIVERDIR in; + SPOOL_R_GETPRINTERDRIVERDIR out; + RPC_BUFFER buffer; + fstring server; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); + ZERO_STRUCT(in); + ZERO_STRUCT(out); slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); strupper_m(server); - /* Initialise input parameters */ - + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Write the request */ - - make_spoolss_q_getprinterdriverdir(&q, server, env, level, &buffer, - offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_getprinterdriverdir ("", &q, &qbuf, 0) || - !rpc_api_pipe_req (cli, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVERDIRECTORY, - &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (spoolss_io_r_getprinterdriverdir ("", &r, &rbuf, 0)) { - if (needed) - *needed = r.needed; - } + make_spoolss_q_getprinterdriverdir( &in, server, env, level, + &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVERDIRECTORY, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdriverdir, + spoolss_io_r_getprinterdriverdir, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; - /* Return output parameters */ - - result = r.status; - - if (W_ERROR_IS_OK(result)) { - switch (level) { - case 1: - decode_printerdriverdir_1(mem_ctx, r.buffer, 1, - &ctr->info1); - break; - } + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getprinterdriverdir( &in, server, env, level, + &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDRIVERDIRECTORY, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdriverdir, + spoolss_io_r_getprinterdriverdir, + WERR_GENERAL_FAILURE ); } + + if (!W_ERROR_IS_OK(out.status)) + return out.status; - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + decode_printerdriverdir_1(mem_ctx, out.buffer, 1, &ctr->info1); - return result; + return out.status; } -/********************************************************************************* - Win32 API - AddPrinterDriver() - ********************************************************************************/ /********************************************************************** - * Install a printer driver - */ +**********************************************************************/ + WERROR cli_spoolss_addprinterdriver (struct cli_state *cli, TALLOC_CTX *mem_ctx, uint32 level, PRINTER_DRIVER_CTR *ctr) { - prs_struct qbuf, rbuf; - SPOOL_Q_ADDPRINTERDRIVER q; - SPOOL_R_ADDPRINTERDRIVER r; - WERROR result = W_ERROR(ERRgeneral); - fstring server; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); + prs_struct qbuf, rbuf; + SPOOL_Q_ADDPRINTERDRIVER in; + SPOOL_R_ADDPRINTERDRIVER out; + fstring server; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); strupper_m(server); - /* Initialise input parameters */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Write the request */ - - make_spoolss_q_addprinterdriver (mem_ctx, &q, server, level, ctr); - - /* Marshall data and send request */ - - if (!spoolss_io_q_addprinterdriver ("", &q, &qbuf, 0) || - !rpc_api_pipe_req (cli, PI_SPOOLSS, SPOOLSS_ADDPRINTERDRIVER, &qbuf, &rbuf)) - goto done; + make_spoolss_q_addprinterdriver( mem_ctx, &in, server, level, ctr ); - /* Unmarshall response */ + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ADDPRINTERDRIVER, + in, out, + qbuf, rbuf, + spoolss_io_q_addprinterdriver, + spoolss_io_r_addprinterdriver, + WERR_GENERAL_FAILURE ); - if (!spoolss_io_r_addprinterdriver ("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - -done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } -/********************************************************************************* - Win32 API - AddPrinter() - ********************************************************************************/ /********************************************************************** - * Install a printer - */ +**********************************************************************/ + WERROR cli_spoolss_addprinterex (struct cli_state *cli, TALLOC_CTX *mem_ctx, uint32 level, PRINTER_INFO_CTR*ctr) { - prs_struct qbuf, rbuf; - SPOOL_Q_ADDPRINTEREX q; - SPOOL_R_ADDPRINTEREX r; - WERROR result = W_ERROR(ERRgeneral); - fstring server, - client, - user; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); + prs_struct qbuf, rbuf; + SPOOL_Q_ADDPRINTEREX in; + SPOOL_R_ADDPRINTEREX out; + fstring server, client, user; + ZERO_STRUCT(in); + ZERO_STRUCT(out); + slprintf(client, sizeof(fstring)-1, "\\\\%s", cli->desthost); - strupper_m(client); slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); + + strupper_m(client); strupper_m(server); - fstrcpy (user, cli->user_name); - - /* Initialise input parameters */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Write the request */ - - make_spoolss_q_addprinterex (mem_ctx, &q, server, client, user, - level, ctr); - - /* Marshall data and send request */ - - if (!spoolss_io_q_addprinterex ("", &q, &qbuf, 0) || - !rpc_api_pipe_req (cli, PI_SPOOLSS, SPOOLSS_ADDPRINTEREX, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - if (!spoolss_io_r_addprinterex ("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ + fstrcpy (user, cli->user_name); - result = r.status; + make_spoolss_q_addprinterex( mem_ctx, &in, server, client, + user, level, ctr); - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ADDPRINTEREX, + in, out, + qbuf, rbuf, + spoolss_io_q_addprinterex, + spoolss_io_r_addprinterex, + WERR_GENERAL_FAILURE ); - return result; + return out.status; } /********************************************************************** - * Delete a Printer Driver from the server (DOES remove - * the driver files) - */ +**********************************************************************/ + WERROR cli_spoolss_deleteprinterdriverex(struct cli_state *cli, TALLOC_CTX *mem_ctx, const char *arch, const char *driver, int version) { - prs_struct qbuf, rbuf; - SPOOL_Q_DELETEPRINTERDRIVEREX q; - SPOOL_R_DELETEPRINTERDRIVEREX r; - WERROR result = W_ERROR(ERRgeneral); - fstring server; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); + prs_struct qbuf, rbuf; + SPOOL_Q_DELETEPRINTERDRIVEREX in; + SPOOL_R_DELETEPRINTERDRIVEREX out; + fstring server; - - /* Initialise input parameters */ - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); + ZERO_STRUCT(in); + ZERO_STRUCT(out); slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); strupper_m(server); - /* Write the request */ - make_spoolss_q_deleteprinterdriverex(mem_ctx, &q, server, arch, driver, version); - - /* Marshall data and send request */ + make_spoolss_q_deleteprinterdriverex( mem_ctx, &in, server, arch, driver, version ); - if (!spoolss_io_q_deleteprinterdriverex ("", &q, &qbuf, 0) - || !rpc_api_pipe_req (cli, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDRIVEREX , &qbuf, &rbuf)) - { - goto done; - } - - /* Unmarshall response */ - - if (!spoolss_io_r_deleteprinterdriverex ("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - -done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDRIVEREX, + in, out, + qbuf, rbuf, + spoolss_io_q_deleteprinterdriverex, + spoolss_io_r_deleteprinterdriverex, + WERR_GENERAL_FAILURE ); + + return out.status; } -/********************************************************************************* - Win32 API - DeltePrinterDriver() - ********************************************************************************/ /********************************************************************** - * Delete a Printer Driver from the server (does not remove - * the driver files - */ +**********************************************************************/ + WERROR cli_spoolss_deleteprinterdriver (struct cli_state *cli, TALLOC_CTX *mem_ctx, const char *arch, const char *driver) { - prs_struct qbuf, rbuf; - SPOOL_Q_DELETEPRINTERDRIVER q; - SPOOL_R_DELETEPRINTERDRIVER r; - WERROR result = W_ERROR(ERRgeneral); - fstring server; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - + prs_struct qbuf, rbuf; + SPOOL_Q_DELETEPRINTERDRIVER in; + SPOOL_R_DELETEPRINTERDRIVER out; + fstring server; - /* Initialise input parameters */ - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); + ZERO_STRUCT(in); + ZERO_STRUCT(out); slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); strupper_m(server); - /* Write the request */ - - make_spoolss_q_deleteprinterdriver(mem_ctx, &q, server, arch, driver); - - /* Marshall data and send request */ - - if (!spoolss_io_q_deleteprinterdriver ("", &q, &qbuf, 0) || - !rpc_api_pipe_req (cli, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDRIVER , &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_deleteprinterdriver ("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + make_spoolss_q_deleteprinterdriver( mem_ctx, &in, server, arch, driver ); - return result; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDRIVER, + in, out, + qbuf, rbuf, + spoolss_io_q_deleteprinterdriver, + spoolss_io_r_deleteprinterdriver, + WERR_GENERAL_FAILURE ); + + return out.status; } -/********************************************************************************* - Win32 API - GetPrinterProcessorDirectory() - ********************************************************************************/ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_getprintprocessordirectory(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, char *name, char *environment, fstring procdir) { prs_struct qbuf, rbuf; - SPOOL_Q_GETPRINTPROCESSORDIRECTORY q; - SPOOL_R_GETPRINTPROCESSORDIRECTORY r; + SPOOL_Q_GETPRINTPROCESSORDIRECTORY in; + SPOOL_R_GETPRINTPROCESSORDIRECTORY out; int level = 1; - WERROR result = W_ERROR(ERRgeneral); RPC_BUFFER buffer; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); - - make_spoolss_q_getprintprocessordirectory( - &q, name, environment, level, &buffer, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_getprintprocessordirectory("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_GETPRINTPROCESSORDIRECTORY, - &qbuf, &rbuf)) - goto done; + make_spoolss_q_getprintprocessordirectory( &in, name, + environment, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTPROCESSORDIRECTORY, + in, out, + qbuf, rbuf, + spoolss_io_q_getprintprocessordirectory, + spoolss_io_r_getprintprocessordirectory, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; - /* Unmarshall response */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - if (!spoolss_io_r_getprintprocessordirectory("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - if (needed) - *needed = r.needed; - - if (W_ERROR_IS_OK(result)) - fstrcpy(procdir, "Not implemented!"); - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getprintprocessordirectory( &in, name, + environment, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTPROCESSORDIRECTORY, + in, out, + qbuf, rbuf, + spoolss_io_q_getprintprocessordirectory, + spoolss_io_r_getprintprocessordirectory, + WERR_GENERAL_FAILURE ); + } + + if ( !W_ERROR_IS_OK(out.status) ) + return out.status; + + fstrcpy(procdir, "Not implemented!"); + + return out.status; } -/** Add a form to a printer. - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param handle Policy handle opened with cli_spoolss_open_printer_ex - * or cli_spoolss_addprinterex. - * @param level Form info level to add - should always be 1. - * @param form A pointer to the form to be added. - * - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, uint32 level, FORM *form) { prs_struct qbuf, rbuf; - SPOOL_Q_ADDFORM q; - SPOOL_R_ADDFORM r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_ADDFORM in; + SPOOL_R_ADDFORM out; - ZERO_STRUCT(q); - ZERO_STRUCT(r); + ZERO_STRUCT(in); + ZERO_STRUCT(out); - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_addform(&q, handle, level, form); + make_spoolss_q_addform( &in, handle, level, form ); - /* Marshall data and send request */ - - if (!spoolss_io_q_addform("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ADDFORM, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_addform("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ADDFORM, + in, out, + qbuf, rbuf, + spoolss_io_q_addform, + spoolss_io_r_addform, + WERR_GENERAL_FAILURE ); + + return out.status; } -/** Set a form on a printer. - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param handle Policy handle opened with cli_spoolss_open_printer_ex - * or cli_spoolss_addprinterex. - * @param level Form info level to set - should always be 1. - * @param form A pointer to the form to be set. - * - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, uint32 level, const char *form_name, FORM *form) { prs_struct qbuf, rbuf; - SPOOL_Q_SETFORM q; - SPOOL_R_SETFORM r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_SETFORM in; + SPOOL_R_SETFORM out; - ZERO_STRUCT(q); - ZERO_STRUCT(r); + ZERO_STRUCT(in); + ZERO_STRUCT(out); - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_setform(&q, handle, level, form_name, form); + make_spoolss_q_setform( &in, handle, level, form_name, form ); - /* Marshall data and send request */ - - if (!spoolss_io_q_setform("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_SETFORM, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_setform("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - if (!W_ERROR_IS_OK(result)) - goto done; - - - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETFORM, + in, out, + qbuf, rbuf, + spoolss_io_q_setform, + spoolss_io_r_setform, + WERR_GENERAL_FAILURE ); + + return out.status; } -/** Get a form on a printer. - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param handle Policy handle opened with cli_spoolss_open_printer_ex - * or cli_spoolss_addprinterex. - * @param formname Name of the form to get - * @param level Form info level to get - should always be 1. - * - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *handle, const char *formname, uint32 level, FORM_1 *form) { prs_struct qbuf, rbuf; - SPOOL_Q_GETFORM q; - SPOOL_R_GETFORM r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_GETFORM in; + SPOOL_R_GETFORM out; RPC_BUFFER buffer; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_getform(&q, handle, formname, level, &buffer, offered); + make_spoolss_q_getform( &in, handle, formname, level, &buffer, offered ); - /* Marshall data and send request */ - - if (!spoolss_io_q_getform("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_GETFORM, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_getform("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - if (needed) - *needed = r.needed; - - if (W_ERROR_IS_OK(result)) { - switch(level) { - case 1: - smb_io_form_1("", r.buffer, form, 0); - break; - default: - DEBUG(10, ("cli_spoolss_getform: unknown info level %d", level)); - return WERR_UNKNOWN_LEVEL; - } + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETFORM, + in, out, + qbuf, rbuf, + spoolss_io_q_getform, + spoolss_io_r_getform, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getform( &in, handle, formname, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETFORM, + in, out, + qbuf, rbuf, + spoolss_io_q_getform, + spoolss_io_r_getform, + WERR_GENERAL_FAILURE ); } + + if (!W_ERROR_IS_OK(out.status)) + return out.status; - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + smb_io_form_1("", out.buffer, form, 0); - return result; + return out.status; } -/** Delete a form on a printer. - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param handle Policy handle opened with cli_spoolss_open_printer_ex - * or cli_spoolss_addprinterex. - * @param form The name of the form to delete. - * - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_deleteform(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, const char *form_name) { prs_struct qbuf, rbuf; - SPOOL_Q_DELETEFORM q; - SPOOL_R_DELETEFORM r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ + SPOOL_Q_DELETEFORM in; + SPOOL_R_DELETEFORM out; - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); + ZERO_STRUCT(in); + ZERO_STRUCT(out); - /* Initialise input parameters */ - - make_spoolss_q_deleteform(&q, handle, form_name); + make_spoolss_q_deleteform( &in, handle, form_name ); - /* Marshall data and send request */ - - if (!spoolss_io_q_deleteform("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_DELETEFORM, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_deleteform("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEFORM, + in, out, + qbuf, rbuf, + spoolss_io_q_deleteform, + spoolss_io_r_deleteform, + WERR_GENERAL_FAILURE ); + + return out.status; } -static void decode_forms_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, - uint32 num_forms, FORM_1 **forms) -{ - int i; - - *forms = TALLOC_ARRAY(mem_ctx, FORM_1, num_forms); - prs_set_offset(&buffer->prs,0); - - for (i = 0; i < num_forms; i++) - smb_io_form_1("", buffer, &((*forms)[i]), 0); -} - -/** Enumerate forms - * - * @param cli Pointer to client state structure which is open - * on the SPOOLSS pipe. - * @param mem_ctx Pointer to an initialised talloc context. - * - * @param offered Buffer size offered in the request. - * @param needed Number of bytes needed to complete the request. - * may be NULL. - * or cli_spoolss_addprinterex. - * @param level Form info level to get - should always be 1. - * @param handle Open policy handle - * - */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_enumforms(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *handle, int level, uint32 *num_forms, FORM_1 **forms) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMFORMS q; - SPOOL_R_ENUMFORMS r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_ENUMFORMS in; + SPOOL_R_ENUMFORMS out; RPC_BUFFER buffer; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumforms( &in, handle, level, &buffer, offered ); - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_enumforms(&q, handle, level, &buffer, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_enumforms("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENUMFORMS, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_enumforms("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - if (needed) - *needed = r.needed; - - if (num_forms) - *num_forms = r.numofforms; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMFORMS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumforms, + spoolss_io_r_enumforms, + WERR_GENERAL_FAILURE ); - decode_forms_1(mem_ctx, r.buffer, *num_forms, forms); - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; -} - -static void decode_jobs_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, - uint32 num_jobs, JOB_INFO_1 **jobs) -{ - uint32 i; - - *jobs = TALLOC_ARRAY(mem_ctx, JOB_INFO_1, num_jobs); - prs_set_offset(&buffer->prs,0); - - for (i = 0; i < num_jobs; i++) - smb_io_job_info_1("", buffer, &((*jobs)[i]), 0); -} + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumforms( &in, handle, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMFORMS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumforms, + spoolss_io_r_enumforms, + WERR_GENERAL_FAILURE ); + } -static void decode_jobs_2(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, - uint32 num_jobs, JOB_INFO_2 **jobs) -{ - uint32 i; + if (!W_ERROR_IS_OK(out.status)) + return out.status; - *jobs = TALLOC_ARRAY(mem_ctx, JOB_INFO_2, num_jobs); - prs_set_offset(&buffer->prs,0); + *num_forms = out.numofforms; + + decode_forms_1(mem_ctx, out.buffer, *num_forms, forms); - for (i = 0; i < num_jobs; i++) - smb_io_job_info_2("", buffer, &((*jobs)[i]), 0); + return out.status; } -/* Enumerate jobs */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_enumjobs(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *hnd, uint32 level, uint32 firstjob, uint32 num_jobs, uint32 *returned, JOB_INFO_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMJOBS q; - SPOOL_R_ENUMJOBS r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_ENUMJOBS in; + SPOOL_R_ENUMJOBS out; RPC_BUFFER buffer; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumjobs( &in, hnd, firstjob, num_jobs, level, + &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMJOBS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumjobs, + spoolss_io_r_enumjobs, + WERR_GENERAL_FAILURE ); + + if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_enumjobs( &in, hnd, firstjob, num_jobs, level, + &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMJOBS, + in, out, + qbuf, rbuf, + spoolss_io_q_enumjobs, + spoolss_io_r_enumjobs, + WERR_GENERAL_FAILURE ); + } - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_enumjobs(&q, hnd, firstjob, num_jobs, level, &buffer, - offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_enumjobs("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENUMJOBS, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_enumjobs("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - if (needed) - *needed = r.needed; - - if (!W_ERROR_IS_OK(r.status)) - goto done; - - *returned = r.returned; - + if (!W_ERROR_IS_OK(out.status)) + return out.status; + switch(level) { case 1: - decode_jobs_1(mem_ctx, r.buffer, r.returned, - &ctr->job.job_info_1); + decode_jobs_1(mem_ctx, out.buffer, out.returned, &ctr->job.job_info_1); break; case 2: - decode_jobs_2(mem_ctx, r.buffer, r.returned, - &ctr->job.job_info_2); + decode_jobs_2(mem_ctx, out.buffer, out.returned, &ctr->job.job_info_2); break; default: DEBUG(3, ("unsupported info level %d", level)); break; } + + *returned = out.returned; - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } -/* Set job */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_setjob(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, uint32 jobid, uint32 level, uint32 command) { prs_struct qbuf, rbuf; - SPOOL_Q_SETJOB q; - SPOOL_R_SETJOB r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_setjob(&q, hnd, jobid, level, command); - - /* Marshall data and send request */ - - if (!spoolss_io_q_setjob("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_SETJOB, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_setjob("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + SPOOL_Q_SETJOB in; + SPOOL_R_SETJOB out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_setjob( &in, hnd, jobid, level, command ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETJOB, + in, out, + qbuf, rbuf, + spoolss_io_q_setjob, + spoolss_io_r_setjob, + WERR_GENERAL_FAILURE ); + + return out.status; } -/* Get job */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_getjob(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *hnd, uint32 jobid, uint32 level, JOB_INFO_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_GETJOB q; - SPOOL_R_GETJOB r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_GETJOB in; + SPOOL_R_GETJOB out; RPC_BUFFER buffer; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); + offered = 0; rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getjob( &in, hnd, jobid, level, &buffer, offered ); - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_getjob(&q, hnd, jobid, level, &buffer, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_getjob("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_GETJOB, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_getjob("", &r, &rbuf, 0)) - goto done; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETJOB, + in, out, + qbuf, rbuf, + spoolss_io_q_getjob, + spoolss_io_r_getjob, + WERR_GENERAL_FAILURE ); - /* Return output parameters */ - - result = r.status; - - if (needed) - *needed = r.needed; + if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + rpcbuf_init(&buffer, offered, mem_ctx); + make_spoolss_q_getjob( &in, hnd, jobid, level, &buffer, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETJOB, + in, out, + qbuf, rbuf, + spoolss_io_q_getjob, + spoolss_io_r_getjob, + WERR_GENERAL_FAILURE ); + } - if (!W_ERROR_IS_OK(r.status)) - goto done; + if (!W_ERROR_IS_OK(out.status)) + return out.status; switch(level) { case 1: - decode_jobs_1(mem_ctx, r.buffer, 1, &ctr->job.job_info_1); + decode_jobs_1(mem_ctx, out.buffer, 1, &ctr->job.job_info_1); break; case 2: - decode_jobs_2(mem_ctx, r.buffer, 1, &ctr->job.job_info_2); - break; - default: - DEBUG(3, ("unsupported info level %d", level)); + decode_jobs_2(mem_ctx, out.buffer, 1, &ctr->job.job_info_2); break; } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } -/* Startpageprinter. Sent to notify the spooler when a page is about to be - sent to a printer. */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_startpageprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd) { prs_struct qbuf, rbuf; - SPOOL_Q_STARTPAGEPRINTER q; - SPOOL_R_STARTPAGEPRINTER r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_startpageprinter(&q, hnd); - - /* Marshall data and send request */ - - if (!spoolss_io_q_startpageprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_STARTPAGEPRINTER, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_startpageprinter("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + SPOOL_Q_STARTPAGEPRINTER in; + SPOOL_R_STARTPAGEPRINTER out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_startpageprinter( &in, hnd ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_STARTPAGEPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_startpageprinter, + spoolss_io_r_startpageprinter, + WERR_GENERAL_FAILURE ); + + return out.status; } -/* Endpageprinter. Sent to notify the spooler when a page has finished - being sent to a printer. */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_endpageprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd) { prs_struct qbuf, rbuf; - SPOOL_Q_ENDPAGEPRINTER q; - SPOOL_R_ENDPAGEPRINTER r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_endpageprinter(&q, hnd); - - /* Marshall data and send request */ - - if (!spoolss_io_q_endpageprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENDPAGEPRINTER, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_endpageprinter("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + SPOOL_Q_ENDPAGEPRINTER in; + SPOOL_R_ENDPAGEPRINTER out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_endpageprinter( &in, hnd ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENDPAGEPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_endpageprinter, + spoolss_io_r_endpageprinter, + WERR_GENERAL_FAILURE ); + + return out.status; } -/* Startdocprinter. Sent to notify the spooler that a document is about - to be spooled for printing. */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_startdocprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, char *docname, @@ -1871,298 +1356,214 @@ WERROR cli_spoolss_startdocprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, uint32 *jobid) { prs_struct qbuf, rbuf; - SPOOL_Q_STARTDOCPRINTER q; - SPOOL_R_STARTDOCPRINTER r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_STARTDOCPRINTER in; + SPOOL_R_STARTDOCPRINTER out; uint32 level = 1; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_startdocprinter(&q, hnd, level, docname, outputfile, - datatype); - - /* Marshall data and send request */ - - if (!spoolss_io_q_startdocprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_STARTDOCPRINTER, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_startdocprinter("", &r, &rbuf, 0)) - goto done; + ZERO_STRUCT(in); + ZERO_STRUCT(out); - /* Return output parameters */ + make_spoolss_q_startdocprinter( &in, hnd, level, docname, + outputfile, datatype ); - result = r.status; - - if (W_ERROR_IS_OK(result)) - *jobid = r.jobid; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_STARTDOCPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_startdocprinter, + spoolss_io_r_startdocprinter, + WERR_GENERAL_FAILURE ); - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + *jobid = out.jobid; - return result; + return out.status; } -/* Enddocprinter. Sent to notify the spooler that a document has finished - being spooled. */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_enddocprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd) { prs_struct qbuf, rbuf; - SPOOL_Q_ENDDOCPRINTER q; - SPOOL_R_ENDDOCPRINTER r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_enddocprinter(&q, hnd); - - /* Marshall data and send request */ - - if (!spoolss_io_q_enddocprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENDDOCPRINTER, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_enddocprinter("", &r, &rbuf, 0)) - goto done; - - /* Return output parameters */ - - result = r.status; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + SPOOL_Q_ENDDOCPRINTER in; + SPOOL_R_ENDDOCPRINTER out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_enddocprinter( &in, hnd ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENDDOCPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_enddocprinter, + spoolss_io_r_enddocprinter, + WERR_GENERAL_FAILURE ); + + return out.status; } -/* Get printer data */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_getprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *hnd, const char *valuename, REGISTRY_VALUE *value) { prs_struct qbuf, rbuf; - SPOOL_Q_GETPRINTERDATA q; - SPOOL_R_GETPRINTERDATA r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); + SPOOL_Q_GETPRINTERDATA in; + SPOOL_R_GETPRINTERDATA out; + uint32 offered; - /* Initialise parse structures */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); + offered = 0; + make_spoolss_q_getprinterdata( &in, hnd, valuename, offered ); - /* Initialise input parameters */ + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATA, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdata, + spoolss_io_r_getprinterdata, + WERR_GENERAL_FAILURE ); - make_spoolss_q_getprinterdata(&q, hnd, valuename, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_getprinterdata("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_GETPRINTERDATA, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_getprinterdata("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (needed) - *needed = r.needed; + if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_getprinterdata( &in, hnd, valuename, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATA, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdata, + spoolss_io_r_getprinterdata, + WERR_GENERAL_FAILURE ); + } - if (!W_ERROR_IS_OK(r.status)) - goto done; + if (!W_ERROR_IS_OK(out.status)) + return out.status; /* Return output parameters */ - value->data_p = TALLOC_MEMDUP(mem_ctx, r.data, r.needed); - value->type = r.type; - value->size = r.size; + value->data_p = TALLOC_MEMDUP(mem_ctx, out.data, out.needed); + value->type = out.type; + value->size = out.size; - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } +/********************************************************************** +**********************************************************************/ + WERROR cli_spoolss_getprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *hnd, const char *keyname, const char *valuename, REGISTRY_VALUE *value) { prs_struct qbuf, rbuf; - SPOOL_Q_GETPRINTERDATAEX q; - SPOOL_R_GETPRINTERDATAEX r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); + SPOOL_Q_GETPRINTERDATAEX in; + SPOOL_R_GETPRINTERDATAEX out; + uint32 offered; - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - make_spoolss_q_getprinterdataex(&q, hnd, keyname, valuename, offered); + make_spoolss_q_getprinterdataex( &in, hnd, keyname, valuename, offered ); - /* Marshall data and send request */ + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATAEX, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdataex, + spoolss_io_r_getprinterdataex, + WERR_GENERAL_FAILURE ); - if (!spoolss_io_q_getprinterdataex("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_GETPRINTERDATAEX, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_getprinterdataex("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (needed) - *needed = r.needed; + if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_getprinterdataex( &in, hnd, keyname, valuename, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_GETPRINTERDATAEX, + in, out, + qbuf, rbuf, + spoolss_io_q_getprinterdataex, + spoolss_io_r_getprinterdataex, + WERR_GENERAL_FAILURE ); + } - if (!W_ERROR_IS_OK(r.status)) - goto done; + if (!W_ERROR_IS_OK(out.status)) + return out.status; /* Return output parameters */ - value->data_p = TALLOC_MEMDUP(mem_ctx, r.data, r.needed); - value->type = r.type; - value->size = r.needed; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + value->data_p = TALLOC_MEMDUP(mem_ctx, out.data, out.needed); + value->type = out.type; + value->size = out.needed; + + return out.status; } -/* Set printer data */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_setprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, REGISTRY_VALUE *value) { prs_struct qbuf, rbuf; - SPOOL_Q_SETPRINTERDATA q; - SPOOL_R_SETPRINTERDATA r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_setprinterdata( - &q, hnd, value->valuename, value->type, (char *)value->data_p, value->size); - - /* Marshall data and send request */ - - if (!spoolss_io_q_setprinterdata("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_SETPRINTERDATA, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_setprinterdata("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (!W_ERROR_IS_OK(r.status)) - goto done; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + SPOOL_Q_SETPRINTERDATA in; + SPOOL_R_SETPRINTERDATA out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_setprinterdata( &in, hnd, value->valuename, + value->type, (char *)value->data_p, value->size); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETPRINTERDATA, + in, out, + qbuf, rbuf, + spoolss_io_q_setprinterdata, + spoolss_io_r_setprinterdata, + WERR_GENERAL_FAILURE ); + + return out.status; } +/********************************************************************** +**********************************************************************/ + WERROR cli_spoolss_setprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, char *keyname, REGISTRY_VALUE *value) { prs_struct qbuf, rbuf; - SPOOL_Q_SETPRINTERDATAEX q; - SPOOL_R_SETPRINTERDATAEX r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_setprinterdataex( - &q, hnd, keyname, value->valuename, value->type, (char *)value->data_p, - value->size); - - /* Marshall data and send request */ - - if (!spoolss_io_q_setprinterdataex("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_SETPRINTERDATAEX, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_setprinterdataex("", &r, &rbuf, 0)) - goto done; + SPOOL_Q_SETPRINTERDATAEX in; + SPOOL_R_SETPRINTERDATAEX out; - result = r.status; + ZERO_STRUCT(in); + ZERO_STRUCT(out); - if (!W_ERROR_IS_OK(r.status)) - goto done; + make_spoolss_q_setprinterdataex( &in, hnd, keyname, value->valuename, + value->type, (char *)value->data_p, value->size); - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_SETPRINTERDATAEX, + in, out, + qbuf, rbuf, + spoolss_io_q_setprinterdataex, + spoolss_io_r_setprinterdataex, + WERR_GENERAL_FAILURE ); - return result; + return out.status; } -/* Enum printer data */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_enumprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, uint32 ndx, @@ -2171,109 +1572,87 @@ WERROR cli_spoolss_enumprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, REGISTRY_VALUE *value) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMPRINTERDATA q; - SPOOL_R_ENUMPRINTERDATA r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_enumprinterdata(&q, hnd, ndx, value_offered, data_offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_enumprinterdata("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATA, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_enumprinterdata("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (!W_ERROR_IS_OK(r.status)) - goto done; - - /* Return data */ - - if (value_needed) - *value_needed = r.realvaluesize; - - if (data_needed) - *data_needed = r.realdatasize; + SPOOL_Q_ENUMPRINTERDATA in; + SPOOL_R_ENUMPRINTERDATA out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_enumprinterdata( &in, hnd, ndx, value_offered, data_offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATA, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinterdata, + spoolss_io_r_enumprinterdata, + WERR_GENERAL_FAILURE ); + + *value_needed = out.realvaluesize; + *data_needed = out.realdatasize; + + if (!W_ERROR_IS_OK(out.status)) + return out.status; if (value) { - rpcstr_pull(value->valuename, r.value, sizeof(value->valuename), -1, + rpcstr_pull(value->valuename, out.value, sizeof(value->valuename), -1, STR_TERMINATE); - value->data_p = TALLOC_MEMDUP(mem_ctx, r.data, r.realdatasize); - value->type = r.type; - value->size = r.realdatasize; + value->data_p = TALLOC_MEMDUP(mem_ctx, out.data, out.realdatasize); + value->type = out.type; + value->size = out.realdatasize; } - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + + return out.status; } +/********************************************************************** +**********************************************************************/ + WERROR cli_spoolss_enumprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *hnd, const char *keyname, REGVAL_CTR *ctr) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMPRINTERDATAEX q; - SPOOL_R_ENUMPRINTERDATAEX r; - WERROR result = W_ERROR(ERRgeneral); + SPOOL_Q_ENUMPRINTERDATAEX in; + SPOOL_R_ENUMPRINTERDATAEX out; int i; + uint32 offered; - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_enumprinterdataex(&q, hnd, keyname, offered); - - /* Marshall data and send request */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - if (!spoolss_io_q_enumprinterdataex("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATAEX, &qbuf, &rbuf)) - goto done; + offered = 0; + make_spoolss_q_enumprinterdataex( &in, hnd, keyname, offered ); - /* Unmarshall response */ + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATAEX, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinterdataex, + spoolss_io_r_enumprinterdataex, + WERR_GENERAL_FAILURE ); - if (!spoolss_io_r_enumprinterdataex("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (needed) - *needed = r.needed; + if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_enumprinterdataex( &in, hnd, keyname, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERDATAEX, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinterdataex, + spoolss_io_r_enumprinterdataex, + WERR_GENERAL_FAILURE ); + } - if (!W_ERROR_IS_OK(r.status)) - goto done; - - /* Return data */ + if (!W_ERROR_IS_OK(out.status)) + return out.status; regval_ctr_init(ctr); - for (i = 0; i < r.returned; i++) { - PRINTER_ENUM_VALUES *v = &r.ctr.values[i]; + for (i = 0; i < out.returned; i++) { + PRINTER_ENUM_VALUES *v = &out.ctr.values[i]; fstring name; rpcstr_pull(name, v->valuename.buffer, sizeof(name), -1, @@ -2281,249 +1660,165 @@ WERROR cli_spoolss_enumprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, regval_ctr_addvalue(ctr, name, v->type, (const char *)v->data, v->data_len); } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } -/* Write data to printer */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_writeprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, uint32 data_size, char *data, uint32 *num_written) { prs_struct qbuf, rbuf; - SPOOL_Q_WRITEPRINTER q; - SPOOL_R_WRITEPRINTER r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ + SPOOL_Q_WRITEPRINTER in; + SPOOL_R_WRITEPRINTER out; - make_spoolss_q_writeprinter(&q, hnd, data_size, data); + ZERO_STRUCT(in); + ZERO_STRUCT(out); - /* Marshall data and send request */ - - if (!spoolss_io_q_writeprinter("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_WRITEPRINTER, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_writeprinter("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (!W_ERROR_IS_OK(r.status)) - goto done; + make_spoolss_q_writeprinter( &in, hnd, data_size, data ); + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_WRITEPRINTER, + in, out, + qbuf, rbuf, + spoolss_io_q_writeprinter, + spoolss_io_r_writeprinter, + WERR_GENERAL_FAILURE ); + if (num_written) - *num_written = r.buffer_written; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + *num_written = out.buffer_written; + + return out.status; } -/* Delete printer data */ +/********************************************************************** +**********************************************************************/ WERROR cli_spoolss_deleteprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, char *valuename) { prs_struct qbuf, rbuf; - SPOOL_Q_DELETEPRINTERDATA q; - SPOOL_R_DELETEPRINTERDATA r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); + SPOOL_Q_DELETEPRINTERDATA in; + SPOOL_R_DELETEPRINTERDATA out; - /* Initialise parse structures */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); + make_spoolss_q_deleteprinterdata( &in, hnd, valuename ); - /* Initialise input parameters */ - - make_spoolss_q_deleteprinterdata(&q, hnd, valuename); - - /* Marshall data and send request */ + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDATA, + in, out, + qbuf, rbuf, + spoolss_io_q_deleteprinterdata, + spoolss_io_r_deleteprinterdata, + WERR_GENERAL_FAILURE ); - if (!spoolss_io_q_deleteprinterdata("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDATA, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_deleteprinterdata("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (!W_ERROR_IS_OK(r.status)) - goto done; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } +/********************************************************************** +**********************************************************************/ + WERROR cli_spoolss_deleteprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, char *keyname, char *valuename) { prs_struct qbuf, rbuf; - SPOOL_Q_DELETEPRINTERDATAEX q; - SPOOL_R_DELETEPRINTERDATAEX r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ + SPOOL_Q_DELETEPRINTERDATAEX in; + SPOOL_R_DELETEPRINTERDATAEX out; - make_spoolss_q_deleteprinterdataex(&q, hnd, keyname, valuename); - - /* Marshall data and send request */ - - if (!spoolss_io_q_deleteprinterdataex("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDATAEX, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_deleteprinterdataex("", &r, &rbuf, 0)) - goto done; - - result = r.status; + ZERO_STRUCT(in); + ZERO_STRUCT(out); - if (!W_ERROR_IS_OK(r.status)) - goto done; + make_spoolss_q_deleteprinterdataex( &in, hnd, keyname, valuename ); - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERDATAEX, + in, out, + qbuf, rbuf, + spoolss_io_q_deleteprinterdataex, + spoolss_io_r_deleteprinterdataex, + WERR_GENERAL_FAILURE ); - return result; + return out.status; } +/********************************************************************** +**********************************************************************/ + WERROR cli_spoolss_enumprinterkey(struct cli_state *cli, TALLOC_CTX *mem_ctx, - uint32 offered, uint32 *needed, POLICY_HND *hnd, const char *keyname, uint16 **keylist, uint32 *len) { prs_struct qbuf, rbuf; - SPOOL_Q_ENUMPRINTERKEY q; - SPOOL_R_ENUMPRINTERKEY r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_enumprinterkey(&q, hnd, keyname, offered); - - /* Marshall data and send request */ - - if (!spoolss_io_q_enumprinterkey("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_ENUMPRINTERKEY, &qbuf, &rbuf)) - goto done; + SPOOL_Q_ENUMPRINTERKEY in; + SPOOL_R_ENUMPRINTERKEY out; + uint32 offered; - /* Unmarshall response */ + ZERO_STRUCT(in); + ZERO_STRUCT(out); - if (!spoolss_io_r_enumprinterkey("", &r, &rbuf, 0)) - goto done; - - result = r.status; + make_spoolss_q_enumprinterkey( &in, hnd, keyname, offered ); - if (needed) - *needed = r.needed; + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERKEY, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinterkey, + spoolss_io_r_enumprinterkey, + WERR_GENERAL_FAILURE ); - if (!W_ERROR_IS_OK(r.status)) - goto done; + if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) { + offered = out.needed; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_enumprinterkey( &in, hnd, keyname, offered ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_ENUMPRINTERKEY, + in, out, + qbuf, rbuf, + spoolss_io_q_enumprinterkey, + spoolss_io_r_enumprinterkey, + WERR_GENERAL_FAILURE ); + } - /* Copy results */ + if ( !W_ERROR_IS_OK(out.status) ) + return out.status; if (keylist) { - *keylist = SMB_MALLOC_ARRAY(uint16, r.keys.buf_len); - memcpy(*keylist, r.keys.buffer, r.keys.buf_len * 2); + *keylist = SMB_MALLOC_ARRAY(uint16, out.keys.buf_len); + memcpy(*keylist, out.keys.buffer, out.keys.buf_len * 2); if (len) - *len = r.keys.buf_len * 2; + *len = out.keys.buf_len * 2; } - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + return out.status; } +/********************************************************************** +**********************************************************************/ + WERROR cli_spoolss_deleteprinterkey(struct cli_state *cli, TALLOC_CTX *mem_ctx, POLICY_HND *hnd, char *keyname) { prs_struct qbuf, rbuf; - SPOOL_Q_DELETEPRINTERKEY q; - SPOOL_R_DELETEPRINTERKEY r; - WERROR result = W_ERROR(ERRgeneral); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Initialise parse structures */ - - prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); - prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); - - /* Initialise input parameters */ - - make_spoolss_q_deleteprinterkey(&q, hnd, keyname); - - /* Marshall data and send request */ - - if (!spoolss_io_q_deleteprinterkey("", &q, &qbuf, 0) || - !rpc_api_pipe_req(cli, PI_SPOOLSS, SPOOLSS_DELETEPRINTERKEY, &qbuf, &rbuf)) - goto done; - - /* Unmarshall response */ - - if (!spoolss_io_r_deleteprinterkey("", &r, &rbuf, 0)) - goto done; - - result = r.status; - - if (!W_ERROR_IS_OK(r.status)) - goto done; - - done: - prs_mem_free(&qbuf); - prs_mem_free(&rbuf); - - return result; + SPOOL_Q_DELETEPRINTERKEY in; + SPOOL_R_DELETEPRINTERKEY out; + + ZERO_STRUCT(in); + ZERO_STRUCT(out); + + make_spoolss_q_deleteprinterkey( &in, hnd, keyname ); + + CLI_DO_RPC( cli, mem_ctx, PI_SPOOLSS, SPOOLSS_DELETEPRINTERKEY, + in, out, + qbuf, rbuf, + spoolss_io_q_deleteprinterkey, + spoolss_io_r_deleteprinterkey, + WERR_GENERAL_FAILURE ); + + return out.status; } /** @} **/ diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c index ec9d3048822..f774d408fe6 100644 --- a/source/rpcclient/cmd_spoolss.c +++ b/source/rpcclient/cmd_spoolss.c @@ -2,7 +2,7 @@ Unix SMB/CIFS implementation. RPC pipe client - Copyright (C) Gerald Carter 2001 + Copyright (C) Gerald Carter 2001-2005 Copyright (C) Tim Potter 2000 Copyright (C) Andrew Tridgell 1992-1999 Copyright (C) Luke Kenneth Casson Leighton 1996-1999 @@ -61,9 +61,10 @@ static const struct table_node archi_table[]= { **/ /**************************************************************************** -function to do the mapping between the long architecture name and -the short one. + function to do the mapping between the long architecture name and + the short one. ****************************************************************************/ + static const char *cmd_spoolss_get_short_archi(const char *long_archi) { int i=-1; @@ -89,22 +90,9 @@ static const char *cmd_spoolss_get_short_archi(const char *long_archi) return archi_table[i].short_archi; } -#if 0 -/********************************************************************** - * dummy function -- placeholder - */ -static WERROR cmd_spoolss_not_implemented(struct cli_state *cli, - TALLOC_CTX *mem_ctx, - int argc, const char **argv) -{ - printf ("(*) This command is not currently implemented.\n"); - return WERR_OK; -} -#endif +/**************************************************************************** +****************************************************************************/ -/*********************************************************************** - * Get printer information - */ static WERROR cmd_spoolss_open_printer_ex(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -148,8 +136,8 @@ static WERROR cmd_spoolss_open_printer_ex(struct cli_state *cli, /**************************************************************************** -printer info level 0 display function ****************************************************************************/ + static void display_print_info_0(PRINTER_INFO_0 *i0) { fstring name = ""; @@ -206,8 +194,8 @@ static void display_print_info_0(PRINTER_INFO_0 *i0) } /**************************************************************************** -printer info level 1 display function ****************************************************************************/ + static void display_print_info_1(PRINTER_INFO_1 *i1) { fstring desc = ""; @@ -229,8 +217,8 @@ static void display_print_info_1(PRINTER_INFO_1 *i1) } /**************************************************************************** -printer info level 2 display function ****************************************************************************/ + static void display_print_info_2(PRINTER_INFO_2 *i2) { fstring servername = ""; @@ -246,25 +234,15 @@ static void display_print_info_2(PRINTER_INFO_2 *i2) fstring parameters = ""; rpcstr_pull(servername, i2->servername.buffer,sizeof(servername), -1, STR_TERMINATE); - rpcstr_pull(printername, i2->printername.buffer,sizeof(printername), -1, STR_TERMINATE); - rpcstr_pull(sharename, i2->sharename.buffer,sizeof(sharename), -1, STR_TERMINATE); - rpcstr_pull(portname, i2->portname.buffer,sizeof(portname), -1, STR_TERMINATE); - rpcstr_pull(drivername, i2->drivername.buffer,sizeof(drivername), -1, STR_TERMINATE); - rpcstr_pull(comment, i2->comment.buffer,sizeof(comment), -1, STR_TERMINATE); - rpcstr_pull(location, i2->location.buffer,sizeof(location), -1, STR_TERMINATE); - rpcstr_pull(sepfile, i2->sepfile.buffer,sizeof(sepfile), -1, STR_TERMINATE); - rpcstr_pull(printprocessor, i2->printprocessor.buffer,sizeof(printprocessor), -1, STR_TERMINATE); - rpcstr_pull(datatype, i2->datatype.buffer,sizeof(datatype), -1, STR_TERMINATE); - rpcstr_pull(parameters, i2->parameters.buffer,sizeof(parameters), -1, STR_TERMINATE); printf("\tservername:[%s]\n", servername); @@ -294,8 +272,8 @@ static void display_print_info_2(PRINTER_INFO_2 *i2) } /**************************************************************************** -printer info level 3 display function ****************************************************************************/ + static void display_print_info_3(PRINTER_INFO_3 *i3) { printf("\tflags:[0x%x]\n", i3->flags); @@ -306,8 +284,8 @@ static void display_print_info_3(PRINTER_INFO_3 *i3) } /**************************************************************************** -printer info level 7 display function ****************************************************************************/ + static void display_print_info_7(PRINTER_INFO_7 *i7) { fstring guid = ""; @@ -317,7 +295,8 @@ static void display_print_info_7(PRINTER_INFO_7 *i7) } -/* Enumerate printers */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_enum_printers(struct cli_state *cli, TALLOC_CTX *mem_ctx, @@ -326,7 +305,7 @@ static WERROR cmd_spoolss_enum_printers(struct cli_state *cli, WERROR result; uint32 info_level = 1; PRINTER_INFO_CTR ctr; - uint32 i = 0, num_printers, needed; + uint32 i = 0, num_printers; fstring name; if (argc > 3) @@ -345,20 +324,11 @@ static WERROR cmd_spoolss_enum_printers(struct cli_state *cli, strupper_m(name); } - /* Enumerate printers -- Should we enumerate types other - than PRINTER_ENUM_LOCAL? Maybe accept as a parameter? --jerry */ - ZERO_STRUCT(ctr); - result = cli_spoolss_enum_printers( - cli, mem_ctx, 0, &needed, name, PRINTER_ENUM_LOCAL, + result = cli_spoolss_enum_printers(cli, mem_ctx, name, PRINTER_ENUM_LOCAL, info_level, &num_printers, &ctr); - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_enum_printers( - cli, mem_ctx, needed, NULL, name, PRINTER_ENUM_LOCAL, - info_level, &num_printers, &ctr); - if (W_ERROR_IS_OK(result)) { if (!num_printers) { @@ -392,8 +362,8 @@ static WERROR cmd_spoolss_enum_printers(struct cli_state *cli, } /**************************************************************************** -port info level 1 display function ****************************************************************************/ + static void display_port_info_1(PORT_INFO_1 *i1) { fstring buffer; @@ -403,8 +373,8 @@ static void display_port_info_1(PORT_INFO_1 *i1) } /**************************************************************************** -port info level 2 display function ****************************************************************************/ + static void display_port_info_2(PORT_INFO_2 *i2) { fstring buffer; @@ -446,14 +416,15 @@ static void display_port_info_2(PORT_INFO_2 *i2) printf("\n"); } -/* Enumerate ports */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_enum_ports(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { WERROR result; - uint32 needed, info_level = 1; + uint32 info_level = 1; PORT_INFO_CTR ctr; uint32 returned; @@ -469,12 +440,7 @@ static WERROR cmd_spoolss_enum_ports(struct cli_state *cli, ZERO_STRUCT(ctr); - result = cli_spoolss_enum_ports(cli, mem_ctx, 0, &needed, info_level, - &returned, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_enum_ports(cli, mem_ctx, needed, NULL, - info_level, &returned, &ctr); + result = cli_spoolss_enum_ports(cli, mem_ctx, info_level, &returned, &ctr); if (W_ERROR_IS_OK(result)) { int i; @@ -497,16 +463,15 @@ static WERROR cmd_spoolss_enum_ports(struct cli_state *cli, return result; } -/*********************************************************************** - * Set printer comment - use a level2 set. - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_setprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND pol; WERROR result; - uint32 needed; uint32 info_level = 2; BOOL opened_hnd = False; PRINTER_INFO_CTR ctr; @@ -542,10 +507,7 @@ static WERROR cmd_spoolss_setprinter(struct cli_state *cli, opened_hnd = True; /* Get printer info */ - result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, &pol, info_level, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, info_level, &ctr); + result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr); if (!W_ERROR_IS_OK(result)) goto done; @@ -567,16 +529,15 @@ static WERROR cmd_spoolss_setprinter(struct cli_state *cli, return result; } -/*********************************************************************** - * Set printer name - use a level2 set. - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_setprintername(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND pol; WERROR result; - uint32 needed; uint32 info_level = 2; BOOL opened_hnd = False; PRINTER_INFO_CTR ctr; @@ -612,15 +573,11 @@ static WERROR cmd_spoolss_setprintername(struct cli_state *cli, opened_hnd = True; /* Get printer info */ - result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, &pol, info_level, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, info_level, &ctr); + result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr); if (!W_ERROR_IS_OK(result)) goto done; - /* Modify the printername. */ init_unistr(&ctr.printers_2->printername, new_printername); ctr.printers_2->devmode = NULL; @@ -637,9 +594,9 @@ static WERROR cmd_spoolss_setprintername(struct cli_state *cli, return result; } -/*********************************************************************** - * Get printer information - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_getprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -652,7 +609,6 @@ static WERROR cmd_spoolss_getprinter(struct cli_state *cli, fstring printername, servername, user; - uint32 needed; if (argc == 1 || argc > 3) { printf("Usage: %s <printername> [level]\n", argv[0]); @@ -682,12 +638,7 @@ static WERROR cmd_spoolss_getprinter(struct cli_state *cli, /* Get printer info */ - result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, - &pol, info_level, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprinter( - cli, mem_ctx, needed, NULL, &pol, info_level, &ctr); + result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr); if (!W_ERROR_IS_OK(result)) goto done; @@ -722,6 +673,9 @@ static WERROR cmd_spoolss_getprinter(struct cli_state *cli, return result; } +/**************************************************************************** +****************************************************************************/ + static void display_reg_value(REGISTRY_VALUE value) { pstring text; @@ -759,9 +713,9 @@ static void display_reg_value(REGISTRY_VALUE value) } -/*********************************************************************** - * Get printer data - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -772,7 +726,6 @@ static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli, fstring printername, servername, user; - uint32 needed; const char *valuename; REGISTRY_VALUE value; @@ -807,12 +760,7 @@ static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli, /* Get printer info */ - result = cli_spoolss_getprinterdata(cli, mem_ctx, 0, &needed, - &pol, valuename, &value); - - if (W_ERROR_V(result) == ERRmoredata) - result = cli_spoolss_getprinterdata( - cli, mem_ctx, needed, NULL, &pol, valuename, &value); + result = cli_spoolss_getprinterdata(cli, mem_ctx, &pol, valuename, &value); if (!W_ERROR_IS_OK(result)) goto done; @@ -830,9 +778,9 @@ static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli, return result; } -/*********************************************************************** - * Get printer data - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -843,7 +791,6 @@ static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli, fstring printername, servername, user; - uint32 needed; const char *valuename, *keyname; REGISTRY_VALUE value; @@ -880,14 +827,8 @@ static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli, /* Get printer info */ - result = cli_spoolss_getprinterdataex(cli, mem_ctx, 0, &needed, - &pol, keyname, valuename, - &value); - - if (W_ERROR_V(result) == ERRmoredata) - result = cli_spoolss_getprinterdataex(cli, mem_ctx, needed, - NULL, &pol, keyname, - valuename, &value); + result = cli_spoolss_getprinterdataex(cli, mem_ctx, &pol, keyname, + valuename, &value); if (!W_ERROR_IS_OK(result)) goto done; @@ -906,8 +847,8 @@ static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli, } /**************************************************************************** -printer info level 0 display function ****************************************************************************/ + static void display_print_driver_1(DRIVER_INFO_1 *i1) { fstring name; @@ -923,8 +864,8 @@ static void display_print_driver_1(DRIVER_INFO_1 *i1) } /**************************************************************************** -printer info level 1 display function ****************************************************************************/ + static void display_print_driver_2(DRIVER_INFO_2 *i1) { fstring name; @@ -953,8 +894,8 @@ static void display_print_driver_2(DRIVER_INFO_2 *i1) } /**************************************************************************** -printer info level 2 display function ****************************************************************************/ + static void display_print_driver_3(DRIVER_INFO_3 *i1) { fstring name = ""; @@ -1015,9 +956,9 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1) return; } -/*********************************************************************** - * Get printer information - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_getdriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1063,20 +1004,11 @@ static WERROR cmd_spoolss_getdriver(struct cli_state *cli, /* loop through and print driver info level for each architecture */ for (i=0; archi_table[i].long_archi!=NULL; i++) { - uint32 needed; - werror = cli_spoolss_getprinterdriver( - cli, mem_ctx, 0, &needed, &pol, info_level, + werror = cli_spoolss_getprinterdriver( cli, mem_ctx, &pol, info_level, archi_table[i].long_archi, archi_table[i].version, &ctr); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) { - werror = cli_spoolss_getprinterdriver( - cli, mem_ctx, needed, NULL, &pol, info_level, - archi_table[i].long_archi, archi_table[i].version, - &ctr); - } - if (!W_ERROR_IS_OK(werror)) continue; @@ -1113,9 +1045,9 @@ static WERROR cmd_spoolss_getdriver(struct cli_state *cli, return werror; } -/*********************************************************************** - * Get printer information - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_enum_drivers(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1139,22 +1071,15 @@ static WERROR cmd_spoolss_enum_drivers(struct cli_state *cli, /* loop through and print driver info level for each architecture */ for (i=0; archi_table[i].long_archi!=NULL; i++) { - uint32 needed; - /* check to see if we already asked for this architecture string */ if ( i>0 && strequal(archi_table[i].long_archi, archi_table[i-1].long_archi) ) continue; werror = cli_spoolss_enumprinterdrivers( - cli, mem_ctx, 0, &needed, info_level, + cli, mem_ctx, info_level, archi_table[i].long_archi, &returned, &ctr); - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_enumprinterdrivers( - cli, mem_ctx, needed, NULL, info_level, - archi_table[i].long_archi, &returned, &ctr); - if (W_ERROR_V(werror) == W_ERROR_V(WERR_INVALID_ENVIRONMENT)) { printf ("Server does not support environment [%s]\n", archi_table[i].long_archi); @@ -1200,8 +1125,8 @@ static WERROR cmd_spoolss_enum_drivers(struct cli_state *cli, } /**************************************************************************** -printer info level 1 display function ****************************************************************************/ + static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1) { fstring name; @@ -1213,9 +1138,9 @@ static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1) printf ("\tDirectory Name:[%s]\n", name); } -/*********************************************************************** - * Get printer driver directory information - */ +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_getdriverdir(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1223,7 +1148,6 @@ static WERROR cmd_spoolss_getdriverdir(struct cli_state *cli, WERROR result; fstring env; DRIVER_DIRECTORY_CTR ctr; - uint32 needed; if (argc > 2) { printf("Usage: %s [environment]\n", argv[0]); @@ -1239,12 +1163,7 @@ static WERROR cmd_spoolss_getdriverdir(struct cli_state *cli, /* Get the directory. Only use Info level 1 */ - result = cli_spoolss_getprinterdriverdir( - cli, mem_ctx, 0, &needed, 1, env, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprinterdriverdir( - cli, mem_ctx, needed, NULL, 1, env, &ctr); + result = cli_spoolss_getprinterdriverdir(cli, mem_ctx, 1, env, &ctr); if (W_ERROR_IS_OK(result)) display_printdriverdir_1(ctr.info1); @@ -1252,9 +1171,9 @@ static WERROR cmd_spoolss_getdriverdir(struct cli_state *cli, return result; } -/******************************************************************************* - set the version and environment fields of a DRIVER_INFO_3 struct - ******************************************************************************/ +/**************************************************************************** +****************************************************************************/ + void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch) { @@ -1283,6 +1202,7 @@ void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch) wrapper for strtok to get the next parameter from a delimited list. Needed to handle the empty parameter string denoted by "NULL" *************************************************************************/ + static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest) { char *ptr; @@ -1357,6 +1277,9 @@ static BOOL init_drv_info_3_members ( TALLOC_CTX *mem_ctx, DRIVER_INFO_3 *info, } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_addprinterdriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1421,6 +1344,9 @@ static WERROR cmd_spoolss_addprinterdriver(struct cli_state *cli, } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_addprinterex(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1443,9 +1369,7 @@ static WERROR cmd_spoolss_addprinterex(struct cli_state *cli, /* Fill in the DRIVER_INFO_2 struct */ ZERO_STRUCT(info2); -#if 0 /* JERRY */ - init_unistr( &info2.servername, servername); -#endif + init_unistr( &info2.printername, argv[1]); init_unistr( &info2.sharename, argv[2]); init_unistr( &info2.drivername, argv[3]); @@ -1478,6 +1402,9 @@ static WERROR cmd_spoolss_addprinterex(struct cli_state *cli, return result; } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_setdriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1491,7 +1418,6 @@ static WERROR cmd_spoolss_setdriver(struct cli_state *cli, fstring servername, printername, user; - uint32 needed; /* parse the command arguements */ if (argc != 3) @@ -1521,12 +1447,7 @@ static WERROR cmd_spoolss_setdriver(struct cli_state *cli, ZERO_STRUCT (info2); ctr.printers_2 = &info2; - result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, - &pol, level, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprinter( - cli, mem_ctx, needed, NULL, &pol, level, &ctr); + result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr); if (!W_ERROR_IS_OK(result)) { printf ("Unable to retrieve printer information!\n"); @@ -1556,6 +1477,9 @@ done: } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_deletedriverex(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1611,6 +1535,9 @@ static WERROR cmd_spoolss_deletedriverex(struct cli_state *cli, } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_deletedriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1653,6 +1580,9 @@ static WERROR cmd_spoolss_deletedriver(struct cli_state *cli, return result; } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1660,7 +1590,6 @@ static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli, WERROR result; char *servername = NULL, *environment = NULL; fstring procdir; - uint32 needed; /* parse the command arguements */ if (argc > 2) { @@ -1679,12 +1608,7 @@ static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli, } result = cli_spoolss_getprintprocessordirectory( - cli, mem_ctx, 0, &needed, servername, environment, procdir); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprintprocessordirectory( - cli, mem_ctx, needed, NULL, servername, environment, - procdir); + cli, mem_ctx, servername, environment, procdir); if (W_ERROR_IS_OK(result)) printf("%s\n", procdir); @@ -1695,7 +1619,8 @@ static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli, return result; } -/* Add a form */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1754,7 +1679,8 @@ static WERROR cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx, return werror; } -/* Set a form */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1812,6 +1738,9 @@ static WERROR cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx, return werror; } +/**************************************************************************** +****************************************************************************/ + static const char *get_form_flag(int form_flag) { switch (form_flag) { @@ -1826,6 +1755,9 @@ static const char *get_form_flag(int form_flag) } } +/**************************************************************************** +****************************************************************************/ + static void display_form(FORM_1 *form) { fstring form_name = ""; @@ -1844,7 +1776,8 @@ static void display_form(FORM_1 *form) form->top, form->bottom); } -/* Get a form */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -1854,7 +1787,6 @@ static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx, char *servername = NULL, *printername = NULL; FORM_1 form; BOOL got_handle = False; - uint32 needed; /* Parse the command arguements */ @@ -1880,12 +1812,7 @@ static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx, /* Get the form */ - werror = cli_spoolss_getform(cli, mem_ctx, 0, &needed, - &handle, argv[2], 1, &form); - - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_getform(cli, mem_ctx, needed, NULL, - &handle, argv[2], 1, &form); + werror = cli_spoolss_getform(cli, mem_ctx, &handle, argv[2], 1, &form); if (!W_ERROR_IS_OK(werror)) goto done; @@ -1902,7 +1829,8 @@ static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx, return werror; } -/* Delete a form */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_deleteform(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, @@ -1949,7 +1877,8 @@ static WERROR cmd_spoolss_deleteform(struct cli_state *cli, return werror; } -/* Enumerate forms */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, @@ -1959,7 +1888,7 @@ static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, WERROR werror; char *servername = NULL, *printername = NULL; BOOL got_handle = False; - uint32 needed, num_forms, level = 1, i; + uint32 needed, offered, num_forms, level = 1, i; FORM_1 *forms; /* Parse the command arguements */ @@ -1986,13 +1915,8 @@ static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, /* Enumerate forms */ - werror = cli_spoolss_enumforms( - cli, mem_ctx, 0, &needed, &handle, level, &num_forms, &forms); - - if (W_ERROR_V(werror) == ERRinsufficientbuffer) - werror = cli_spoolss_enumforms( - cli, mem_ctx, needed, NULL, &handle, level, - &num_forms, &forms); + offered = needed = 0; + werror = cli_spoolss_enumforms(cli, mem_ctx, &handle, level, &num_forms, &forms); if (!W_ERROR_IS_OK(werror)) goto done; @@ -2015,12 +1939,14 @@ static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, return werror; } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { WERROR result; - uint32 needed; fstring servername, printername, user; POLICY_HND pol; BOOL opened_hnd = False; @@ -2033,7 +1959,7 @@ static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli, if (argc != 4) { printf ("Usage: %s <printer> <value> <data>\n", argv[0]); return WERR_OK; - } + } slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost); strupper_m(servername); @@ -2051,11 +1977,7 @@ static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli, ctr.printers_0 = &info; - result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, - &pol, 0, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, 0, &ctr); + result = cli_spoolss_getprinter(cli, mem_ctx, &pol, 0, &ctr); if (!W_ERROR_IS_OK(result)) goto done; @@ -2078,11 +2000,8 @@ static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli, goto done; } printf("\tSetPrinterData succeeded [%s: %s]\n", argv[2], argv[3]); - - result = cli_spoolss_getprinter(cli, mem_ctx, 0, &needed, &pol, 0, &ctr); - - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_getprinter(cli, mem_ctx, needed, NULL, &pol, 0, &ctr); + + result = cli_spoolss_getprinter(cli, mem_ctx, &pol, 0, &ctr); if (!W_ERROR_IS_OK(result)) goto done; @@ -2098,6 +2017,9 @@ done: return result; } +/**************************************************************************** +****************************************************************************/ + static void display_job_info_1(JOB_INFO_1 *job) { fstring username = "", document = "", text_status = ""; @@ -2116,6 +2038,9 @@ static void display_job_info_1(JOB_INFO_1 *job) job->totalpages); } +/**************************************************************************** +****************************************************************************/ + static void display_job_info_2(JOB_INFO_2 *job) { fstring username = "", document = "", text_status = ""; @@ -2134,14 +2059,15 @@ static void display_job_info_2(JOB_INFO_2 *job) job->totalpages, job->size); } -/* Enumerate jobs */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_enum_jobs(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { WERROR result; - uint32 needed, level = 1, num_jobs, i; + uint32 needed, offered, level = 1, num_jobs, i; BOOL got_hnd = False; pstring printername; fstring servername, user; @@ -2176,15 +2102,10 @@ static WERROR cmd_spoolss_enum_jobs(struct cli_state *cli, /* Enumerate ports */ - result = cli_spoolss_enumjobs( - cli, mem_ctx, 0, &needed, &hnd, level, 0, 1000, + offered = needed = 0; + result = cli_spoolss_enumjobs(cli, mem_ctx, &hnd, level, 0, 1000, &num_jobs, &ctr); - if (W_ERROR_V(result) == ERRinsufficientbuffer) - result = cli_spoolss_enumjobs( - cli, mem_ctx, needed, NULL, &hnd, level, 0, - 1000, &num_jobs, &ctr); - if (!W_ERROR_IS_OK(result)) goto done; @@ -2209,7 +2130,8 @@ done: return result; } -/* enumerate data */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_enum_data( struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, @@ -2268,14 +2190,15 @@ done: return result; } -/* enumerate data for a given key */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { WERROR result; - uint32 needed, i; + uint32 i; BOOL got_hnd = False; pstring printername; fstring servername, user; @@ -2311,11 +2234,7 @@ static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli, /* Enumerate subkeys */ result = cli_spoolss_enumprinterdataex( - cli, mem_ctx, 0, &needed, &hnd, keyname, NULL); - - if (W_ERROR_V(result) == ERRmoredata) - result = cli_spoolss_enumprinterdataex( - cli, mem_ctx, needed, NULL, &hnd, keyname, &ctr); + cli, mem_ctx, &hnd, keyname, NULL); if (!W_ERROR_IS_OK(result)) goto done; @@ -2333,14 +2252,14 @@ done: return result; } -/* enumerate subkeys */ +/**************************************************************************** +****************************************************************************/ static WERROR cmd_spoolss_enum_printerkey( struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { WERROR result; - uint32 needed, returned; BOOL got_hnd = False; pstring printername; fstring servername, user; @@ -2352,7 +2271,7 @@ static WERROR cmd_spoolss_enum_printerkey( struct cli_state *cli, printf("Usage: %s printername [keyname]\n", argv[0]); return WERR_OK; } - + if (argc == 3) keyname = argv[2]; else @@ -2373,18 +2292,12 @@ static WERROR cmd_spoolss_enum_printerkey( struct cli_state *cli, if (!W_ERROR_IS_OK(result)) goto done; - + got_hnd = True; /* Enumerate subkeys */ - result = cli_spoolss_enumprinterkey( - cli, mem_ctx, 0, &needed, &hnd, keyname, NULL, NULL); - - if (W_ERROR_V(result) == ERRmoredata) - result = cli_spoolss_enumprinterkey( - cli, mem_ctx, needed, NULL, &hnd, keyname, &keylist, - &returned); + result = cli_spoolss_enumprinterkey(cli, mem_ctx, &hnd, keyname, NULL, NULL); if (!W_ERROR_IS_OK(result)) goto done; @@ -2407,6 +2320,9 @@ done: return result; } +/**************************************************************************** +****************************************************************************/ + static WERROR cmd_spoolss_rffpcnex(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) diff --git a/source/utils/net_rpc_printer.c b/source/utils/net_rpc_printer.c index 4185f805ee4..e2080cdc285 100644 --- a/source/utils/net_rpc_printer.c +++ b/source/utils/net_rpc_printer.c @@ -817,19 +817,11 @@ net_spoolss_enum_printers(struct cli_state *cli, TALLOC_CTX *mem_ctx, { WERROR result; - uint32 needed; /* enum printers */ - result = cli_spoolss_enum_printers( - cli, mem_ctx, 0, &needed, name, flags, + result = cli_spoolss_enum_printers(cli, mem_ctx, name, flags, level, num_printers, ctr); - if (W_ERROR_V(result) == W_ERROR_V(WERR_INSUFFICIENT_BUFFER)) - result = cli_spoolss_enum_printers( - cli, mem_ctx, needed, NULL, name, flags, - level, num_printers, ctr); - - if (!W_ERROR_IS_OK(result)) { printf("cannot enum printers: %s\n", dos_errstr(result)); return False; @@ -887,16 +879,10 @@ net_spoolss_getprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, PRINTER_INFO_CTR *ctr) { WERROR result; - uint32 needed; /* getprinter call */ - result = cli_spoolss_getprinter(cli, - mem_ctx, 0, &needed, hnd, level, ctr); + result = cli_spoolss_getprinter(cli, mem_ctx, hnd, level, ctr); - if (W_ERROR_V(result) == W_ERROR_V(WERR_INSUFFICIENT_BUFFER)) - result = cli_spoolss_getprinter(cli, - mem_ctx, needed, NULL, hnd, level, ctr); - if (!W_ERROR_IS_OK(result)) { printf("cannot get printer-info: %s\n", dos_errstr(result)); return False; @@ -949,17 +935,10 @@ net_spoolss_enumprinterkey(struct cli_state *cli, TALLOC_CTX *mem_ctx, uint16 **keylist) { WERROR result; - uint32 needed, len; /* enumprinterkey call */ - result = cli_spoolss_enumprinterkey( - cli, mem_ctx, 0, &needed, hnd, keyname, NULL, NULL); + result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname, NULL, NULL); - if (W_ERROR_V(result) == W_ERROR_V(WERR_MORE_DATA)) - result = cli_spoolss_enumprinterkey( - cli, mem_ctx, needed, NULL, hnd, keyname, keylist, - &len); - if (!W_ERROR_IS_OK(result)) { printf("enumprinterkey failed: %s\n", dos_errstr(result)); return False; @@ -976,16 +955,10 @@ net_spoolss_enumprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, REGVAL_CTR *ctr) { WERROR result; - uint32 needed; /* enumprinterdataex call */ - result = cli_spoolss_enumprinterdataex( - cli, mem_ctx, 0, &needed, hnd, keyname, ctr); + result = cli_spoolss_enumprinterdataex(cli, mem_ctx, hnd, keyname, ctr); - if (W_ERROR_V(result) == W_ERROR_V(WERR_MORE_DATA)) - result = cli_spoolss_enumprinterdataex( - cli, mem_ctx, needed, NULL, hnd, keyname, ctr); - if (!W_ERROR_IS_OK(result)) { printf("enumprinterdataex failed: %s\n", dos_errstr(result)); return False; @@ -1022,16 +995,9 @@ net_spoolss_enumforms(struct cli_state *cli, TALLOC_CTX *mem_ctx, { WERROR result; - uint32 needed; /* enumforms call */ - result = cli_spoolss_enumforms( - cli, mem_ctx, 0, &needed, hnd, level, num_forms, forms); - - if (W_ERROR_V(result) == W_ERROR_V(WERR_INSUFFICIENT_BUFFER)) - result = cli_spoolss_enumforms( - cli, mem_ctx, needed, NULL, hnd, level, - num_forms, forms); + result = cli_spoolss_enumforms(cli, mem_ctx, hnd, level, num_forms, forms); if (!W_ERROR_IS_OK(result)) { printf("could not enum forms: %s\n", dos_errstr(result)); @@ -1049,18 +1015,12 @@ net_spoolss_enumprinterdrivers (struct cli_state *cli, TALLOC_CTX *mem_ctx, PRINTER_DRIVER_CTR *ctr) { WERROR result; - uint32 needed; /* enumprinterdrivers call */ result = cli_spoolss_enumprinterdrivers( - cli, mem_ctx, 0, &needed, level, + cli, mem_ctx, level, env, num_drivers, ctr); - if (W_ERROR_V(result) == W_ERROR_V(WERR_INSUFFICIENT_BUFFER)) - result = cli_spoolss_enumprinterdrivers( - cli, mem_ctx, needed, NULL, level, - env, num_drivers, ctr); - if (!W_ERROR_IS_OK(result)) { printf("cannot enum drivers: %s\n", dos_errstr(result)); return False; @@ -1078,18 +1038,12 @@ net_spoolss_getprinterdriver(struct cli_state *cli, PRINTER_DRIVER_CTR *ctr) { WERROR result; - uint32 needed; /* getprinterdriver call */ result = cli_spoolss_getprinterdriver( - cli, mem_ctx, 0, &needed, hnd, level, + cli, mem_ctx, hnd, level, env, version, ctr); - if (W_ERROR_V(result) == W_ERROR_V(WERR_INSUFFICIENT_BUFFER)) - result = cli_spoolss_getprinterdriver( - cli, mem_ctx, needed, NULL, hnd, level, - env, version, ctr); - if (!W_ERROR_IS_OK(result)) { DEBUG(1,("cannot get driver (for architecture: %s): %s\n", env, dos_errstr(result))); |