[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-718-gee46958

[Günther Deschner]

The branch, master has been updated
       via  ee469585eb11e9964d0f490fde94ee00e55879fa (commit)
      from  9d05e91ec062e6c745a1b51c99b9d4c3df0961f1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ee469585eb11e9964d0f490fde94ee00e55879fa
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 10 00:08:11 2009 +0100

    s3-spoolss: use SPOOLSS_JOB_CONTROL bits defined in IDL.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/rpc_spoolss.h       |    6 ------
 source3/rpc_server/srv_spoolss_nt.c |   10 +++++-----
 2 files changed, 5 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index d0fac59..63bc5ee 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 a0b689c..a39770a 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;
 		}


-- 
Samba Shared Repository