summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/rpc_server/srv_spoolss.c22
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c25
2 files changed, 9 insertions, 38 deletions
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 667e9ee386..61eb5c6c37 100644
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -491,27 +491,7 @@ static bool api_spoolss_schedulejob(pipes_struct *p)
static bool api_spoolss_setjob(pipes_struct *p)
{
- SPOOL_Q_SETJOB q_u;
- SPOOL_R_SETJOB 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_setjob("", &q_u, data, 0)) {
- DEBUG(0,("spoolss_io_q_setjob: unable to unmarshall SPOOL_Q_SETJOB.\n"));
- return False;
- }
-
- r_u.status = _spoolss_setjob(p, &q_u, &r_u);
-
- if(!spoolss_io_r_setjob("",&r_u,rdata,0)) {
- DEBUG(0,("spoolss_io_r_setjob: unable to marshall SPOOL_R_SETJOB.\n"));
- return False;
- }
-
- return True;
+ return proxy_spoolss_call(p, NDR_SPOOLSS_SETJOB);
}
/****************************************************************************
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 1cdba229d1..84cb3392e2 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6957,14 +6957,16 @@ WERROR _spoolss_ScheduleJob(pipes_struct *p,
return WERR_OK;
}
-/****************************************************************************
-****************************************************************************/
+/****************************************************************
+ _spoolss_SetJob
+****************************************************************/
-WERROR _spoolss_setjob(pipes_struct *p, SPOOL_Q_SETJOB *q_u, SPOOL_R_SETJOB *r_u)
+WERROR _spoolss_SetJob(pipes_struct *p,
+ struct spoolss_SetJob *r)
{
- POLICY_HND *handle = &q_u->handle;
- uint32 jobid = q_u->jobid;
- uint32 command = q_u->command;
+ POLICY_HND *handle = r->in.handle;
+ uint32 jobid = r->in.job_id;
+ uint32 command = r->in.command;
int snum;
WERROR errcode = WERR_BADFUNC;
@@ -10091,17 +10093,6 @@ WERROR _spoolss_OpenPrinter(pipes_struct *p,
}
/****************************************************************
- _spoolss_SetJob
-****************************************************************/
-
-WERROR _spoolss_SetJob(pipes_struct *p,
- struct spoolss_SetJob *r)
-{
- p->rng_fault_state = true;
- return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
_spoolss_GetJob
****************************************************************/