summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-03-20 00:52:37 +0000
committerJeremy Allison <jra@samba.org>2003-03-20 00:52:37 +0000
commit3be18a1fba5b008e55a4497470165de62aa15054 (patch)
tree4adf72ee173185d4a392154b8a01b3d97c161786 /source3/printing
parent4377376832b9ce40c7a7b99e04c23c25d96915ca (diff)
downloadsamba-3be18a1fba5b008e55a4497470165de62aa15054.tar.gz
samba-3be18a1fba5b008e55a4497470165de62aa15054.tar.bz2
samba-3be18a1fba5b008e55a4497470165de62aa15054.zip
lib/messages.c: Check return from chainlock before modifying message queue.
Apply the job returned limit across all requests for job queues. Jeremy. (This used to be commit bf795b684e608f82db822e0759e7b69afd451b65)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/printing.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 26ea52e35a..99578975ca 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1959,6 +1959,7 @@ int print_queue_status(int snum,
TDB_DATA data, key;
const char *printername;
struct tdb_print_db *pdb;
+ int max_reported_jobs = lp_max_reported_jobs(snum);
/* make sure the database is up to date */
@@ -2033,6 +2034,10 @@ int print_queue_status(int snum,
QSORT_CAST(printjob_comp));
*queue = tstruct.queue;
+
+ if (max_reported_jobs && tstruct.qcount > max_reported_jobs)
+ tstruct.qcount = max_reported_jobs;
+
return tstruct.qcount;
}