smbd: force sync rename with lease break

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15697

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit bc2d87981967bc65155ba09eb5b3e3f913bec50e)

diff --git a/selftest/knownfail.d/samba3.smb2.compound_async b/selftest/knownfail.d/samba3.smb2.compound_async
index 20de45d5061fc44ec4b0ccdd5386827e31c63136..2d956ba45b0869abf15ca7b21f4aa7c44c54c61b 100644 (file)
--- a/selftest/knownfail.d/samba3.smb2.compound_async
+++ b/selftest/knownfail.d/samba3.smb2.compound_async
@@ -1,4 +1 @@
-^samba3.smb2.compound_async.rename_non_compound_no_async\(fileserver\)
-^samba3.smb2.compound_async.rename_same_srcdst_non_compound_no_async\(fileserver\)
-^samba3.smb2.compound_async.rename_last\(fileserver\)
 ^samba3.smb2.compound_async.rename_middle\(fileserver\)

diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index dd0ba880fd1dcf946be3ed2c30d64ad53d139773..b43dedfec18e4f43ce68ebb6bc51415ef0d488b4 100644 (file)
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -120,7 +120,11 @@ NTSTATUS smbd_smb2_request_process_setinfo(struct smbd_smb2_request *req)
        }
        tevent_req_set_callback(subreq, smbd_smb2_request_setinfo_done, req);
 
-       return smbd_smb2_request_pending_queue(req, subreq, 500);
+       /*
+        * Windows never sends async interim responses if a rename triggers a
+        * lease break. See test smb2.lease.compound_rename_middle.
+        */
+       return smbd_smb2_request_pending_queue(req, subreq, 0);
 }
 
 static void smbd_smb2_request_setinfo_done(struct tevent_req *subreq)