diff options
| -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) { |