Fix inspited by Alan Romeril. 50% speedup in domain logins with this

change to default break response time of 10ms -> 0ms.
Jeremy.

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 359918c675932d95ce70385686581d2e3400adae..7130cf0f4988527a8ffaacaf81b6e062835b8b24 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -1248,7 +1248,7 @@ static void init_globals(void)
        Globals.bRestrictAnonymous = False;
        Globals.map_to_guest = 0;       /* By Default, "Never" */
        Globals.min_passwd_length = MINPASSWDLENGTH;    /* By Default, 5. */
-       Globals.oplock_break_wait_time = 10;    /* By Default, 10 msecs. */
+       Globals.oplock_break_wait_time = 0;     /* By Default, 0 msecs. */
 
 #ifdef WITH_LDAP
        /* default values for ldap */

diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
index 366b4d0fec6cf79cbbe5f90a5d51c20c1ad9ef00..4f26eaf7f241105bebf788fe23673684b293070c 100644 (file)
--- a/source/smbd/oplock.c
+++ b/source/smbd/oplock.c
@@ -470,6 +470,9 @@ static void wait_before_sending_break(BOOL local_request)
     struct timeval cur_tv;
     long wait_left = (long)lp_oplock_break_wait_time();
 
+       if (wait_left == 0)
+               return;
+
     GetTimeOfDay(&cur_tv);
 
     wait_left -= ((cur_tv.tv_sec - smb_last_time.tv_sec)*1000) +