diff options
| -rw-r--r-- | docs/manpages/smb.conf.5 | 7 | ||||
| -rw-r--r-- | source3/include/local.h | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 9a6788baba..da254f8244 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -1666,13 +1666,8 @@ between 'keepalive' packets. If this parameter is zero, no keepalive packets will be sent. Keepalive packets, if sent, allow the server to tell whether a client is still present and responding. -Keepalives should, in general, not be needed if the socket being used -has the SO_KEEPALIVE attribute set on it (see "socket -options"). Basically you should only use this option if you strike -difficulties. - .B Default: - keep alive = 0 + keep alive = 300 .B Example: keep alive = 60 diff --git a/source3/include/local.h b/source3/include/local.h index 22862a9a1f..d9e12e506b 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -159,6 +159,8 @@ #define LONG_CONNECT_TIMEOUT 30 #define SHORT_CONNECT_TIMEOUT 5 +/* the default netbios keepalive timeout */ +#define DEFAULT_KEEPALIVE 300 /* the directory to sit in when idle */ /* #define IDLE_DIR "/" */ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 27cbc8c8dd..52914ffd5d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -89,7 +89,7 @@ extern pstring myname; #define LP_SNUM_OK(iService) (((iService) >= 0) && ((iService) < iNumServices) && iSERVICE(iService).valid) #define VALID(i) iSERVICE(i).valid -int keepalive=0; +int keepalive=DEFAULT_KEEPALIVE; extern BOOL use_getwd_cache; extern int extra_time_offset; |