diff options
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/printing/printing.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 48b92fec020..5d000959cc8 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -306,7 +306,7 @@ FN_GLOBAL_INTEGER(ldap_timeout, ldap_timeout) FN_GLOBAL_INTEGER(lm_announce, lm_announce) FN_GLOBAL_INTEGER(lm_interval, lm_interval) FN_GLOBAL_INTEGER(lock_spin_time, lock_spin_time) -FN_GLOBAL_INTEGER(lpqcachetime, lpqcachetime) +FN_GLOBAL_INTEGER(lpq_cache_time, lpq_cache_time) FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout) FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix) FN_GLOBAL_INTEGER(map_to_guest, map_to_guest) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index d6fc5a791e6..24bbbb9f810 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -1794,7 +1794,7 @@ static struct parm_struct parm_table[] = { .label = "lpq cache time", .type = P_INTEGER, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(lpqcachetime), + .offset = GLOBAL_VAR(lpq_cache_time), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9f18f6c261a..44aebdde631 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -810,7 +810,7 @@ static void init_globals(bool reinit_globals) /* Discovered by 2 days of pain by Don McCall @ HP :-). */ Globals.max_xmit = 0x4104; Globals.maxmux = 50; /* This is *needed* for profile support. */ - Globals.lpqcachetime = 30; /* changed to handle large print servers better -- jerry */ + Globals.lpq_cache_time = 30; /* changed to handle large print servers better -- jerry */ Globals._disable_spoolss = false; Globals.max_smbd_processes = 0;/* no limit specified */ Globals.usernamelevel = 0; diff --git a/source3/printing/printing.c b/source3/printing/printing.c index f9406f27e57..62c95f5cb35 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1316,7 +1316,7 @@ static bool print_cache_expired(const char *sharename, bool check_pending) */ if (last_qscan_time == ((time_t)-1) - || (time_now - last_qscan_time) >= lp_lpqcachetime() + || (time_now - last_qscan_time) >= lp_lpq_cache_time() || last_qscan_time > (time_now + MAX_CACHE_VALID_TIME)) { uint32 u; @@ -1325,7 +1325,7 @@ static bool print_cache_expired(const char *sharename, bool check_pending) DEBUG(4, ("print_cache_expired: cache expired for queue %s " "(last_qscan_time = %d, time now = %d, qcachetime = %d)\n", sharename, (int)last_qscan_time, (int)time_now, - (int)lp_lpqcachetime() )); + (int)lp_lpq_cache_time() )); /* check if another smbd has already sent a message to update the queue. Give the pending message one minute to clear and |