From 4111fcfd4f570d39d46a0d414546ca62c7b609be Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 2 May 2013 11:12:47 -0700 Subject: Only do the 1 second delay for sharing violations for SMB1, not SMB2. Match Windows behavior. Signed-off-by: Jeremy Allison Reviewed-by: Richard Sharpe --- source3/smbd/open.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 7d02e52108..53f8b8e093 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2526,10 +2526,11 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, /* * If we're returning a share violation, ensure we - * cope with the braindead 1 second delay. + * cope with the braindead 1 second delay (SMB1 only). */ if (!(oplock_request & INTERNAL_OPEN_ONLY) && + !conn->sconn->using_smb2 && lp_defer_sharing_violations()) { struct timeval timeout; struct deferred_open_record state; -- cgit