From cb6ef25341d183eda44df40e51b2e5b0aba55c2c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Sat, 15 Nov 2008 00:44:51 +0100 Subject: s3-spoolss: use pidl for _spoolss_StartPagePrinter. Guenther --- source3/rpc_server/srv_spoolss.c | 22 +--------------------- source3/rpc_server/srv_spoolss_nt.c | 22 +++++++--------------- 2 files changed, 8 insertions(+), 36 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c index c5fed8cb39..17013a50c3 100644 --- a/source3/rpc_server/srv_spoolss.c +++ b/source3/rpc_server/srv_spoolss.c @@ -428,27 +428,7 @@ static bool api_spoolss_getprinterdriver2(pipes_struct *p) static bool api_spoolss_startpageprinter(pipes_struct *p) { - SPOOL_Q_STARTPAGEPRINTER q_u; - SPOOL_R_STARTPAGEPRINTER r_u; - prs_struct *data = &p->in_data.data; - prs_struct *rdata = &p->out_data.rdata; - - ZERO_STRUCT(q_u); - ZERO_STRUCT(r_u); - - if(!spoolss_io_q_startpageprinter("", &q_u, data, 0)) { - DEBUG(0,("spoolss_io_q_startpageprinter: unable to unmarshall SPOOL_Q_STARTPAGEPRINTER.\n")); - return False; - } - - r_u.status = _spoolss_startpageprinter(p, &q_u, &r_u); - - if(!spoolss_io_r_startpageprinter("",&r_u,rdata,0)) { - DEBUG(0,("spoolss_io_r_startpageprinter: unable to marshall SPOOL_R_STARTPAGEPRINTER.\n")); - return False; - } - - return True; + return proxy_spoolss_call(p, NDR_SPOOLSS_STARTDOCPRINTER); } /******************************************************************** diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 85f5d4076f..092894811a 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5779,12 +5779,15 @@ WERROR _spoolss_getprinterdriver2(pipes_struct *p, SPOOL_Q_GETPRINTERDRIVER2 *q_ return WERR_UNKNOWN_LEVEL; } -/**************************************************************************** -****************************************************************************/ -WERROR _spoolss_startpageprinter(pipes_struct *p, SPOOL_Q_STARTPAGEPRINTER *q_u, SPOOL_R_STARTPAGEPRINTER *r_u) +/**************************************************************** + _spoolss_StartPagePrinter +****************************************************************/ + +WERROR _spoolss_StartPagePrinter(pipes_struct *p, + struct spoolss_StartPagePrinter *r) { - POLICY_HND *handle = &q_u->handle; + POLICY_HND *handle = r->in.handle; Printer_entry *Printer = find_printer_index_by_hnd(p, handle); @@ -10127,17 +10130,6 @@ WERROR _spoolss_StartDocPrinter(pipes_struct *p, return WERR_NOT_SUPPORTED; } -/**************************************************************** - _spoolss_StartPagePrinter -****************************************************************/ - -WERROR _spoolss_StartPagePrinter(pipes_struct *p, - struct spoolss_StartPagePrinter *r) -{ - p->rng_fault_state = true; - return WERR_NOT_SUPPORTED; -} - /**************************************************************** _spoolss_WritePrinter ****************************************************************/ -- cgit