diff options
| author | Christof Schmitt <cs@samba.org> | 2019-04-29 11:01:44 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-05-01 03:12:07 +0000 |
| commit | 5ac626e7b0565bf880d1b18a3b414bc67d8606df (patch) | |
| tree | 3f92603bf938dacf5053d885b638cfc1a40b3775 | |
| parent | 2ee72cc6154370ed78bb1113ee0c9896d106d2f8 (diff) | |
| download | samba-5ac626e7b0565bf880d1b18a3b414bc67d8606df.tar.gz | |
smbd: Move deadtime default to parameter definition and man page
The code has a default of one week (10080 minutes) if the parameter is
set to 0. Make this the public default of the parameter, instead of
hiding it in the code. This change also has the code match the
documentation that setting this parameter to 0 disables the check.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | docs-xml/smbdotconf/tuning/deadtime.xml | 2 | ||||
| -rw-r--r-- | lib/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/include/local.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/conn_idle.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/docs-xml/smbdotconf/tuning/deadtime.xml b/docs-xml/smbdotconf/tuning/deadtime.xml index 7c60b90d097..77e0e5f9324 100644 --- a/docs-xml/smbdotconf/tuning/deadtime.xml +++ b/docs-xml/smbdotconf/tuning/deadtime.xml @@ -22,6 +22,6 @@ should be performed.</para> </description> -<value type="default">0</value> +<value type="default">10080</value> <value type="example">15</value> </samba:parameter> diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index ebbccc22b71..e03c1556d7e 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2833,6 +2833,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "passdb backend", "tdbsam"); + lpcfg_do_global_parameter(lp_ctx, "deadtime", "10080"); + lpcfg_do_global_parameter(lp_ctx, "getwd cache", "True"); lpcfg_do_global_parameter(lp_ctx, "winbind nested groups", "True"); diff --git a/source3/include/local.h b/source3/include/local.h index c2be1ff3b7f..62700aace3c 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -96,7 +96,6 @@ /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ -#define DEFAULT_SMBD_TIMEOUT (60*60*24*7) #define SMBD_RELOAD_CHECK (180) #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 703460e4c47..5af1621fb9b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -641,7 +641,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) Globals._disable_spoolss = false; Globals.max_smbd_processes = 0;/* no limit specified */ Globals.username_level = 0; - Globals.deadtime = 0; + Globals.deadtime = 10080; Globals.getwd_cache = true; Globals.large_readwrite = true; Globals.max_log_size = 5000; diff --git a/source3/smbd/conn_idle.c b/source3/smbd/conn_idle.c index 238b7bd7690..920d808862a 100644 --- a/source3/smbd/conn_idle.c +++ b/source3/smbd/conn_idle.c @@ -53,7 +53,7 @@ bool conn_idle_all(struct smbd_server_connection *sconn, time_t t) conn_lastused_update(sconn, t); if (deadtime <= 0) { - deadtime = DEFAULT_SMBD_TIMEOUT; + return false; } for (conn=sconn->connections;conn;conn=conn->next) { |