summaryrefslogtreecommitdiffstats
path: root/source3/printing
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-02-07 12:15:20 +0000
committerJeremy Allison <jra@samba.org>1998-02-07 12:15:20 +0000
commit5546e28e69b1a43dbb48e024e233d8ebf7fa667a (patch)
treec2a05cb21a5d1d420f7b7690980539f0896564c2 /source3/printing
parenteefff40c6796638695e93b0503cff8ffdfc06596 (diff)
downloadsamba-5546e28e69b1a43dbb48e024e233d8ebf7fa667a.tar.gz
samba-5546e28e69b1a43dbb48e024e233d8ebf7fa667a.tar.xz
samba-5546e28e69b1a43dbb48e024e233d8ebf7fa667a.zip
A small raft of changes, I will sync up with 1.9.18 also.
chgpasswd.c: Fixed typo in debug message. includes.h: Fix include for aix. kanji.c: Added cap_to_sj as inverse of sj_to_cap. loadparm.c: local.h: password.c: Added code for "networkstation user login" parameter. - patch from Rob Nielsen <ran@adc.com>. printing.c: Added further aix printing fixes. reply.c: Changed access time fetch to a function. trans2.c: Changed access time fetch to a function. time.c: Changed access time fetch to a function. server.c: Made NT redirector workaround final. util.c: Added debug for write_socket failing. Jeremy. (This used to be commit a031404623c22d62f8de035be2239f609af08112)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/printing.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 71b89022e6e..bf49a372030 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -486,7 +486,7 @@ static BOOL parse_lpq_aix(char *line,print_queue_struct *buf,BOOL first)
/* we must get 6 tokens */
if (count < 10)
{
- if ((count == 7) && (strcmp(tok[0],"QUEUED") == 0))
+ if ((count == 7) && ((strcmp(tok[0],"QUEUED") == 0) || (strcmp(tok[0],"HELD") == 0)))
{
/* the 2nd and 5th columns must be integer */
if (!isdigit(*tok[1]) || !isdigit(*tok[4])) return(False);
@@ -508,7 +508,7 @@ static BOOL parse_lpq_aix(char *line,print_queue_struct *buf,BOOL first)
buf->job = atoi(tok[1]);
- buf->status = LPQ_QUEUED;
+ buf->status = strequal(tok[0],"HELD")?LPQ_PAUSED:LPQ_QUEUED;
buf->priority = 0;
buf->time = time(NULL);
StrnCpy(buf->user,tok[3],sizeof(buf->user)-1);