summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-02-10 00:08:11 +0100
committerGünther Deschner <gd@samba.org>2009-02-10 11:09:51 +0100
commitee469585eb11e9964d0f490fde94ee00e55879fa (patch)
tree83cc7a0d2167ccd5563c03bb19120fd7be2ea63b
parent9d05e91ec062e6c745a1b51c99b9d4c3df0961f1 (diff)
downloadsamba-ee469585eb11e9964d0f490fde94ee00e55879fa.tar.gz
samba-ee469585eb11e9964d0f490fde94ee00e55879fa.tar.bz2
samba-ee469585eb11e9964d0f490fde94ee00e55879fa.zip
s3-spoolss: use SPOOLSS_JOB_CONTROL bits defined in IDL.
Guenther
-rw-r--r--source3/include/rpc_spoolss.h6
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c10
2 files changed, 5 insertions, 11 deletions
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index d0fac59bbf..63bc5ee796 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -1022,12 +1022,6 @@ typedef struct spool_r_enumports
}
SPOOL_R_ENUMPORTS;
-#define JOB_CONTROL_PAUSE 1
-#define JOB_CONTROL_RESUME 2
-#define JOB_CONTROL_CANCEL 3
-#define JOB_CONTROL_RESTART 4
-#define JOB_CONTROL_DELETE 5
-
typedef struct job_info_info
{
union
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index a0b689c8a4..a39770a5ef 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6903,19 +6903,19 @@ WERROR _spoolss_setjob(pipes_struct *p, SPOOL_Q_SETJOB *q_u, SPOOL_R_SETJOB *r_u
}
switch (command) {
- case JOB_CONTROL_CANCEL:
- case JOB_CONTROL_DELETE:
+ case SPOOLSS_JOB_CONTROL_CANCEL:
+ case SPOOLSS_JOB_CONTROL_DELETE:
if (print_job_delete(p->server_info, snum, jobid, &errcode)) {
errcode = WERR_OK;
}
break;
- case JOB_CONTROL_PAUSE:
+ case SPOOLSS_JOB_CONTROL_PAUSE:
if (print_job_pause(p->server_info, snum, jobid, &errcode)) {
errcode = WERR_OK;
}
break;
- case JOB_CONTROL_RESTART:
- case JOB_CONTROL_RESUME:
+ case SPOOLSS_JOB_CONTROL_RESTART:
+ case SPOOLSS_JOB_CONTROL_RESUME:
if (print_job_resume(p->server_info, snum, jobid, &errcode)) {
errcode = WERR_OK;
}