param: use lp[cfg]_max_print_jobs() in lp[cfg]_maxprintjobs()

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index fe67f757533710de7235d3f370bd73042a67caf8..7c440938ca8073ea77254912a8121c8cfedfa4d4 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -3089,7 +3089,8 @@ const char *lpcfg_printername(struct loadparm_service *service, struct loadparm_
  */
 int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault)
 {
-       int maxjobs = (service != NULL) ? service->max_print_jobs : sDefault->max_print_jobs;
+       int maxjobs = lpcfg_max_print_jobs(service, sDefault);
+
        if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID)
                maxjobs = PRINT_MAX_JOBID - 1;
 

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7c1abdea17472ae96b569842928052fa9a3909bb..28dba0504948b9fc2ec8edeb4377e25c048da9ab 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4143,7 +4143,8 @@ void lp_set_logfile(const char *name)
 
 int lp_maxprintjobs(int snum)
 {
-       int maxjobs = LP_SNUM_OK(snum) ? ServicePtrs[snum]->max_print_jobs : sDefault.max_print_jobs;
+       int maxjobs = lp_max_print_jobs(snum);
+
        if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID)
                maxjobs = PRINT_MAX_JOBID - 1;