diff options
| -rw-r--r-- | lib/param/loadparm.c | 4 | ||||
| -rw-r--r-- | lib/param/loadparm.h | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 3d96bffd98a..fe67f757533 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2372,7 +2372,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lp_ctx->sDefault = talloc_zero(lp_ctx, struct loadparm_service); lp_ctx->flags = talloc_zero_array(lp_ctx, unsigned int, num_parameters()); - lp_ctx->sDefault->iMaxPrintJobs = 1000; + lp_ctx->sDefault->max_print_jobs = 1000; lp_ctx->sDefault->bAvailable = true; lp_ctx->sDefault->browseable = true; lp_ctx->sDefault->read_only = true; @@ -3089,7 +3089,7 @@ 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->iMaxPrintJobs : sDefault->iMaxPrintJobs; + int maxjobs = (service != NULL) ? service->max_print_jobs : sDefault->max_print_jobs; if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID) maxjobs = PRINT_MAX_JOBID - 1; diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index f7f9a715b6d..2aca895b182 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -235,7 +235,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; bool valid; \ int usershare; \ struct timespec usershare_last_mod; \ - int iMaxPrintJobs; \ + int max_print_jobs; \ char *szCopy; \ char *szService; \ char *szInclude; \ diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 986def536cc..a6a96d467e6 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -1893,7 +1893,7 @@ struct parm_struct parm_table[] = { .label = "max print jobs", .type = P_INTEGER, .p_class = P_LOCAL, - .offset = LOCAL_VAR(iMaxPrintJobs), + .offset = LOCAL_VAR(max_print_jobs), .special = NULL, .enum_list = NULL, }, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0f645b6b914..7c1abdea174 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -158,7 +158,7 @@ static struct loadparm_service sDefault = .aio_write_behind = NULL, .dfree_command = NULL, .min_print_space = 0, - .iMaxPrintJobs = 1000, + .max_print_jobs = 1000, .max_reported_print_jobs = 0, .write_cache_size = 0, .create_mask = 0744, @@ -4143,7 +4143,7 @@ void lp_set_logfile(const char *name) int lp_maxprintjobs(int snum) { - int maxjobs = LP_SNUM_OK(snum) ? ServicePtrs[snum]->iMaxPrintJobs : sDefault.iMaxPrintJobs; + int maxjobs = LP_SNUM_OK(snum) ? ServicePtrs[snum]->max_print_jobs : sDefault.max_print_jobs; if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID) maxjobs = PRINT_MAX_JOBID - 1; |