summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-01-22 09:25:05 +0000
committerJeremy Allison <jra@samba.org>1998-01-22 09:25:05 +0000
commit118213c059501d384be9a6dcaf02d13a681bedc3 (patch)
tree064ecc31b3044bc2c82e3abd7f297947d4427469 /source3/printing
parenta7a312a32da8cc6d915dd423af841029416c9f1f (diff)
downloadsamba-118213c059501d384be9a6dcaf02d13a681bedc3.tar.gz
samba-118213c059501d384be9a6dcaf02d13a681bedc3.tar.bz2
samba-118213c059501d384be9a6dcaf02d13a681bedc3.zip
printing.c: Bug fix for lpng reporting.
server.c: Large fix for oplock deadlock bug. util.c: Fix for oplock deadlock bug. Jeremy. (This used to be commit 4cae830ab3a942b2f2868173a492d02f6332651d)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/printing.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 76b962606b..629b3ad496 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -436,7 +436,12 @@ A long spool-path will just waste significant chars of the file name.
buf->job = atoi(tok[LPRNG_JOBTOK]);
buf->size = atoi(tok[LPRNG_TOTALTOK]);
- buf->status = strequal(tok[LPRNG_RANKTOK],"active")?LPQ_PRINTING:LPQ_QUEUED;
+ if (strequal(tok[LPRNG_RANKTOK],"active"))
+ buf->status = LPQ_PRINTING;
+ else if (strequal(tok[LPRNG_RANKTOK],"hold"))
+ buf->status = LPQ_PAUSED;
+ else
+ buf->status = LPQ_QUEUED;
/* buf->time = time(NULL); */
buf->time = LPRng_time(tok,LPRNG_TIMETOK);
DEBUG(3,("Time reported for job %d is %s", buf->job, ctime(&buf->time)));