summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/local.h1
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/smbd/conn_idle.c2
3 files changed, 2 insertions, 3 deletions
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) {