From 7f5ff8852039bc0fde2ae63acb3588646ddecc6f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Sat, 15 Nov 2008 00:49:00 +0100 Subject: s3-spoolss: use pidl for _spoolss_EndPagePrinter. Guenther --- source3/rpc_server/srv_spoolss.c | 22 +--------------------- source3/rpc_server/srv_spoolss_nt.c | 21 ++++++--------------- 2 files changed, 7 insertions(+), 36 deletions(-) (limited to 'source3') diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c index 9c0d2bf206..fef6c49ba3 100644 --- a/source3/rpc_server/srv_spoolss.c +++ b/source3/rpc_server/srv_spoolss.c @@ -439,27 +439,7 @@ static bool api_spoolss_startpageprinter(pipes_struct *p) static bool api_spoolss_endpageprinter(pipes_struct *p) { - SPOOL_Q_ENDPAGEPRINTER q_u; - SPOOL_R_ENDPAGEPRINTER 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_endpageprinter("", &q_u, data, 0)) { - DEBUG(0,("spoolss_io_q_endpageprinter: unable to unmarshall SPOOL_Q_ENDPAGEPRINTER.\n")); - return False; - } - - r_u.status = _spoolss_endpageprinter(p, &q_u, &r_u); - - if(!spoolss_io_r_endpageprinter("",&r_u,rdata,0)) { - DEBUG(0,("spoolss_io_r_endpageprinter: unable to marshall SPOOL_R_ENDPAGEPRINTER.\n")); - return False; - } - - return True; + return proxy_spoolss_call(p, NDR_SPOOLSS_ENDPAGEPRINTER); } /******************************************************************** diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 092894811a..d520ead802 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5800,12 +5800,14 @@ WERROR _spoolss_StartPagePrinter(pipes_struct *p, return WERR_OK; } -/**************************************************************************** -****************************************************************************/ +/**************************************************************** + _spoolss_EndPagePrinter +****************************************************************/ -WERROR _spoolss_endpageprinter(pipes_struct *p, SPOOL_Q_ENDPAGEPRINTER *q_u, SPOOL_R_ENDPAGEPRINTER *r_u) +WERROR _spoolss_EndPagePrinter(pipes_struct *p, + struct spoolss_EndPagePrinter *r) { - POLICY_HND *handle = &q_u->handle; + POLICY_HND *handle = r->in.handle; int snum; Printer_entry *Printer = find_printer_index_by_hnd(p, handle); @@ -10141,17 +10143,6 @@ WERROR _spoolss_WritePrinter(pipes_struct *p, return WERR_NOT_SUPPORTED; } -/**************************************************************** - _spoolss_EndPagePrinter -****************************************************************/ - -WERROR _spoolss_EndPagePrinter(pipes_struct *p, - struct spoolss_EndPagePrinter *r) -{ - p->rng_fault_state = true; - return WERR_NOT_SUPPORTED; -} - /**************************************************************** _spoolss_AbortPrinter ****************************************************************/ -- cgit