diff options
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/oplock.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 359918c675..7130cf0f49 100644 --- a/source3/param/loadparm.c +++ b/source3/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/source3/smbd/oplock.c b/source3/smbd/oplock.c index 366b4d0fec..4f26eaf7f2 100644 --- a/source3/smbd/oplock.c +++ b/source3/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) + |