summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-11-13 12:10:46 +0100
committerStefan Metzmacher <metze@samba.org>2014-11-27 16:45:05 +0100
commitfe0ad5c66884da5e7cba5c7b0d40a8c41cf6a63b (patch)
treeaf1c47e4b809f7c1434f2a917513b611cf81bf96
parent334089c1015ca35ee37d4c9bf5da455e72c3e86e (diff)
downloadsamba-fe0ad5c66884da5e7cba5c7b0d40a8c41cf6a63b.tar.gz
s3:smb2_create: send interim responses after 0.5 milliseconds
We don't have to care about delayed NT_STATUS_SHARING_VIOLATION anymore after the following commit: commit 4111fcfd4f570d39d46a0d414546ca62c7b609be Author: Jeremy Allison <jra@samba.org> Date: Thu May 2 11:12:47 2013 -0700 Only do the 1 second delay for sharing violations for SMB1, not SMB2. Match Windows behavior. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/smbd/smb2_create.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 31dc3ac2234..1e31cbf3510 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -241,13 +241,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
}
tevent_req_set_callback(tsubreq, smbd_smb2_request_create_done, smb2req);
- /*
- * For now we keep the logic that we do not send STATUS_PENDING
- * for sharing violations, so we just wait 2 seconds.
- *
- * TODO: we need more tests for this.
- */
- return smbd_smb2_request_pending_queue(smb2req, tsubreq, 2000000);
+ return smbd_smb2_request_pending_queue(smb2req, tsubreq, 500);
}
static uint64_t get_mid_from_smb2req(struct smbd_smb2_request *smb2req)