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 dee1326a1d8a0bf8977df22a0fe014dd5d8dc769)

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;
 }