diff options
| author | Gerald Carter <jerry@samba.org> | 2003-11-13 20:15:17 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-11-13 20:15:17 +0000 |
| commit | fd98af75d655449a677360f6991da5caabc88b4d (patch) | |
| tree | c9628b0b9f17510110b745a6be8dc866f07e33e4 /source/printing/printing.c | |
| parent | 00d5136ea0456115c25bf3c791616ef4bbbb8fc1 (diff) | |
| download | samba-fd98af75d655449a677360f6991da5caabc88b4d.tar.gz samba-fd98af75d655449a677360f6991da5caabc88b4d.tar.xz samba-fd98af75d655449a677360f6991da5caabc88b4d.zip | |
* Fix from SATOH Fumiyasu for bug 660 (failing to view print
jobs) by only enforce the 'max reported print jobs' parameter
when it is non-zero.
* Fixed bug 338 by making sure that data values are written
out when we are marshalling an EnumPrinterDataEx() reply.
This probably fixes other bugs reported against point-n-print
feature in 3.0.0
Diffstat (limited to 'source/printing/printing.c')
| -rw-r--r-- | source/printing/printing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/printing/printing.c b/source/printing/printing.c index 56020f78384..ad17213c2d6 100644 --- a/source/printing/printing.c +++ b/source/printing/printing.c @@ -850,7 +850,7 @@ static void store_queue_struct(struct tdb_print_db *pdb, struct traverse_struct size_t i; uint qcount; - if (max_reported_jobs < pts->qcount) + if (max_reported_jobs && (max_reported_jobs < pts->qcount)) pts->qcount = max_reported_jobs; qcount = pts->qcount; @@ -2147,7 +2147,7 @@ static BOOL get_stored_queue_info(struct tdb_print_db *pdb, int snum, int *pcoun len = 0; for( i = 0; i < qcount; i++) { uint32 qjob, qsize, qpage_count, qstatus, qpriority, qtime; - len += tdb_unpack(data.dptr + 4 + len, data.dsize - len, NULL, "ddddddff", + len += tdb_unpack(data.dptr + 4 + len, data.dsize - len, "ddddddff", &qjob, &qsize, &qpage_count, |