summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-02-23 03:59:37 +0000
committerJeremy Allison <jra@samba.org>2001-02-23 03:59:37 +0000
commited77fca1990f96dba6fe9204e551056395c6ed29 (patch)
tree955f1e173e91fbccb9a7325567373fe708640fac /source3/smbd
parent7bab8111d2b1668495b8e0411fa1de6b174aacdc (diff)
downloadsamba-ed77fca1990f96dba6fe9204e551056395c6ed29.tar.gz
samba-ed77fca1990f96dba6fe9204e551056395c6ed29.tar.bz2
samba-ed77fca1990f96dba6fe9204e551056395c6ed29.zip
include/rpc_spoolss.h: Added JOB_STATUS_XXX defines.
include/smb.h: Added LPQ_xx enums to correspond with the NT JOB_STATUS_XXX. We need these to be different as we're storing LPQ_xx enums in the tdb already. rpc_server/srv_spoolss_nt.c: Don't need to return status strings as we're now returning status codes. smbd/lanman.c: Change the RAP status codes to have "RAP" in the name. printing/printing.c: Keep track of the status of a job. Allow a job to be deleted from one smbd when being submitted by another. Made logic in mutex clearer. Jeremy. (This used to be commit 71029da7dd74eb91dd6953752bdf238f319d985d)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/lanman.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 7dba0c06f3..c29f0df434 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -413,14 +413,14 @@ static int check_printq_info(struct pack_desc* desc,
}
-#define JOB_STATUS_QUEUED 0
-#define JOB_STATUS_PAUSED 1
-#define JOB_STATUS_SPOOLING 2
-#define JOB_STATUS_PRINTING 3
-#define JOB_STATUS_PRINTED 4
+#define RAP_JOB_STATUS_QUEUED 0
+#define RAP_JOB_STATUS_PAUSED 1
+#define RAP_JOB_STATUS_SPOOLING 2
+#define RAP_JOB_STATUS_PRINTING 3
+#define RAP_JOB_STATUS_PRINTED 4
-#define QUEUE_STATUS_PAUSED 1
-#define QUEUE_STATUS_ERROR 2
+#define RAP_QUEUE_STATUS_PAUSED 1
+#define RAP_QUEUE_STATUS_ERROR 2
/* turn a print job status into a on the wire status
*/
@@ -428,13 +428,13 @@ static int printj_status(int v)
{
switch (v) {
case LPQ_QUEUED:
- return JOB_STATUS_QUEUED;
+ return RAP_JOB_STATUS_QUEUED;
case LPQ_PAUSED:
- return JOB_STATUS_PAUSED;
+ return RAP_JOB_STATUS_PAUSED;
case LPQ_SPOOLING:
- return JOB_STATUS_SPOOLING;
+ return RAP_JOB_STATUS_SPOOLING;
case LPQ_PRINTING:
- return JOB_STATUS_PRINTING;
+ return RAP_JOB_STATUS_PRINTING;
}
return 0;
}
@@ -447,9 +447,9 @@ static int printq_status(int v)
case LPQ_QUEUED:
return 0;
case LPQ_PAUSED:
- return QUEUE_STATUS_PAUSED;
+ return RAP_QUEUE_STATUS_PAUSED;
}
- return QUEUE_STATUS_ERROR;
+ return RAP_QUEUE_STATUS_ERROR;
}
static void fill_printjob_info(connection_struct *conn, int snum, int uLevel,