summaryrefslogtreecommitdiff
path: root/source3/smbd/conn.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-03-18 10:09:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:40 -0500
commit2864d86b37fe29ba2e985b61e646061feb0b841f (patch)
tree3e0047ff5c881b5333372738fa52c6f00027e4c1 /source3/smbd/conn.c
parent80a78b0aa86e064701b9b43a976f26fb8143d64a (diff)
downloadsamba-2864d86b37fe29ba2e985b61e646061feb0b841f.tar.gz
samba-2864d86b37fe29ba2e985b61e646061feb0b841f.tar.bz2
samba-2864d86b37fe29ba2e985b61e646061feb0b841f.zip
r21867: Simplify calling convention of timeout_processing. lp_deadtime is only
referenced in conn_idle_all(). (This used to be commit c0aaee6d36cf1fb873cfb9ab6ee52ff097a202a0)
Diffstat (limited to 'source3/smbd/conn.c')
-rw-r--r--source3/smbd/conn.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 6c8267ceed..2d4020af39 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -187,12 +187,16 @@ void conn_close_all(void)
Idle inactive connections.
****************************************************************************/
-BOOL conn_idle_all(time_t t, int deadtime)
+BOOL conn_idle_all(time_t t)
{
+ int deadtime = lp_deadtime()*60;
pipes_struct *plist = NULL;
BOOL allidle = True;
connection_struct *conn, *next;
+ if (deadtime <= 0)
+ deadtime = DEFAULT_SMBD_TIMEOUT;
+
for (conn=Connections;conn;conn=next) {
next=conn->next;