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 | 281e293331f20d9341ebaf555f10ef339952048c (patch) | |
| tree | d2604aff9fe096c081dc39b808644937820ca2b8 /source3/printing | |
| parent | 5fd6b5bc61234aaf977dd104d150cb074aa14dbc (diff) | |
| download | samba-281e293331f20d9341ebaf555f10ef339952048c.tar.gz samba-281e293331f20d9341ebaf555f10ef339952048c.tar.bz2 samba-281e293331f20d9341ebaf555f10ef339952048c.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
(This used to be commit fd98af75d655449a677360f6991da5caabc88b4d)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/printing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 56020f7838..ad17213c2d 100644 --- a/source3/printing/printing.c +++ b/source3/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, |