changed the default "keepalive" value to 300 seconds.

This is more important now that oplocks are being used.
(This used to be commit 7bccd2c360a270df227c140aeecb943d8d187855)

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 9a6788babad5fe50c96d6c6e0ac8ba87761bc13e..da254f8244a9ab99c4915bef4138136061a97a6f 100644 (file)
--- 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 22862a9a1ffa7b38f367f9378bcfb0c7ff270538..d9e12e506b9d548fee76e2aa0bb42bf5ead25300 100644 (file)
--- 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 27cbc8c8ddd8b047abc11b0f40cbb087d70eabc2..52914ffd5d4a42e7c88bafb6cda60e28bb479a7f 100644 (file)
--- 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;