From: Ralph Boehme <slow@samba.org>
Date: Mon, 29 Mar 2021 10:24:39 +0000 (+0200)
Subject: s3: smbd: fix deferred renames
X-Git-Tag: tevent-0.11.0~1338
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10d753868e810604d8f60673bbd48f55aaff0797;p=thirdparty%2Fsamba.git

s3: smbd: fix deferred renames

This was broken by c7a9e0e4cdfb22e66533b5c8e20af3cfdb8ae78c.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14679
CI: https://gitlab.com/samba-team/samba/-/merge_requests/1875

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@amba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Mar 31 06:13:39 UTC 2021 on sn-devel-184
---

diff --git a/selftest/knownfail.d/samba3.smb2.lease b/selftest/knownfail.d/samba3.smb2.lease
deleted file mode 100644
index 4e66e2f6539..00000000000
--- a/selftest/knownfail.d/samba3.smb2.lease
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smb2.lease.rename_wait\(nt4_dc\)
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 646e009a746..e490596a2e0 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -214,6 +214,7 @@ static bool delay_rename_lease_break_fn(
 		return false;
 	}
 
+	state->delay = true;
 	break_to = (e_lease_type & ~SMB2_LEASE_HANDLE);
 
 	send_break_message(