From 714ac784e183ea50ce9dab440eb4c73320227a0b Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Sat, 15 Nov 2008 00:58:36 +0100
Subject: s3-spoolss: use pidl for _spoolss_EndDocPrinter.

Guenther
---
 source3/rpc_server/srv_spoolss.c    | 22 +---------------------
 source3/rpc_server/srv_spoolss_nt.c | 24 ++++++------------------
 2 files changed, 7 insertions(+), 39 deletions(-)

(limited to 'source3/rpc_server')

diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index fa58bcd3f8..0e4e73b27d 100644
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -455,27 +455,7 @@ static bool api_spoolss_startdocprinter(pipes_struct *p)
 
 static bool api_spoolss_enddocprinter(pipes_struct *p)
 {
-	SPOOL_Q_ENDDOCPRINTER q_u;
-	SPOOL_R_ENDDOCPRINTER 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_enddocprinter("", &q_u, data, 0)) {
-		DEBUG(0,("spoolss_io_q_enddocprinter: unable to unmarshall SPOOL_Q_ENDDOCPRINTER.\n"));
-		return False;
-	}
-
-	r_u.status = _spoolss_enddocprinter(p, &q_u, &r_u);
-
-	if(!spoolss_io_r_enddocprinter("",&r_u,rdata,0)) {
-		DEBUG(0,("spoolss_io_r_enddocprinter: unable to marshall SPOOL_R_ENDDOCPRINTER.\n"));
-		return False;
-	}
-
-	return True;		
+	return proxy_spoolss_call(p, NDR_SPOOLSS_ENDDOCPRINTER);
 }
 
 /********************************************************************
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 9bfede824c..48775a8df5 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5888,15 +5888,14 @@ WERROR _spoolss_startdocprinter(pipes_struct *p, SPOOL_Q_STARTDOCPRINTER *q_u, S
 	return WERR_OK;
 }
 
-/********************************************************************
- * api_spoolss_getprinter
- * called from the spoolss dispatcher
- *
- ********************************************************************/
+/****************************************************************
+ _spoolss_EndDocPrinter
+****************************************************************/
 
-WERROR _spoolss_enddocprinter(pipes_struct *p, SPOOL_Q_ENDDOCPRINTER *q_u, SPOOL_R_ENDDOCPRINTER *r_u)
+WERROR _spoolss_EndDocPrinter(pipes_struct *p,
+			      struct spoolss_EndDocPrinter *r)
 {
-	POLICY_HND *handle = &q_u->handle;
+	POLICY_HND *handle = r->in.handle;
 
 	return _spoolss_enddocprinter_internal(p, handle);
 }
@@ -10156,17 +10155,6 @@ WERROR _spoolss_ReadPrinter(pipes_struct *p,
 	return WERR_NOT_SUPPORTED;
 }
 
-/****************************************************************
- _spoolss_EndDocPrinter
-****************************************************************/
-
-WERROR _spoolss_EndDocPrinter(pipes_struct *p,
-			      struct spoolss_EndDocPrinter *r)
-{
-	p->rng_fault_state = true;
-	return WERR_NOT_SUPPORTED;
-}
-
 /****************************************************************
  _spoolss_AddJob
 ****************************************************************/
-- 
cgit