summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-02-26 01:10:58 +0100
committerGünther Deschner <gd@samba.org>2009-02-26 13:17:23 +0100
commit54b529a44e4b3244f79f0c5ab3dab91925fae0d4 (patch)
tree0e5f4207210412ad01068ee990d6f9b6f7b664c3
parent76ae2022ad239394c9122f65bd35c1523874e6f9 (diff)
downloadsamba-54b529a44e4b3244f79f0c5ab3dab91925fae0d4.tar.gz
samba-54b529a44e4b3244f79f0c5ab3dab91925fae0d4.tar.xz
samba-54b529a44e4b3244f79f0c5ab3dab91925fae0d4.zip
s3-spoolss: job status defines moved to IDL.
Guenther
-rw-r--r--source3/include/rpc_spoolss.h15
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c2
2 files changed, 1 insertions, 16 deletions
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index fd46102b8ec..a26a3152242 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -124,21 +124,6 @@
#define PRINTER_STATUS_OK 0x00000000
-/* JOB status codes. */
-
-#define JOB_STATUS_QUEUED 0x0000
-#define JOB_STATUS_PAUSED 0x0001
-#define JOB_STATUS_ERROR 0x0002
-#define JOB_STATUS_DELETING 0x0004
-#define JOB_STATUS_SPOOLING 0x0008
-#define JOB_STATUS_PRINTING 0x0010
-#define JOB_STATUS_OFFLINE 0x0020
-#define JOB_STATUS_PAPEROUT 0x0040
-#define JOB_STATUS_PRINTED 0x0080
-#define JOB_STATUS_DELETED 0x0100
-#define JOB_STATUS_BLOCKED 0x0200
-#define JOB_STATUS_USER_INTERVENTION 0x0400
-
/* Notify field types */
#define PRINTER_NOTIFY_TYPE 0x00
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index c7fd52d47ba..7485a425499 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -110,7 +110,7 @@ static int nt_printj_status(int v)
case LPQ_DELETED:
return JOB_STATUS_DELETED;
case LPQ_BLOCKED:
- return JOB_STATUS_BLOCKED;
+ return JOB_STATUS_BLOCKED_DEVQ;
case LPQ_USER_INTERVENTION:
return JOB_STATUS_USER_INTERVENTION;
}