sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

smbd: Move deadtime default to parameter definition and man page

Browse Source 
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>
This commit is contained in:
Christof Schmitt 2019-04-29 11:01:44 -07:00 committed by Andrew Bartlett
parent 2ee72cc615
commit 5ac626e7b0
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-xml/smbdotconf/tuning/deadtime.xml
View File

@ -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>

2
lib/param/loadparm.c
View File

@ -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");

1
source3/include/local.h
View File

@ -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)

2
source3/param/loadparm.c
View File

@ -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;

2
source3/smbd/conn_idle.c
View File

@ -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) {