s3:smbd: fix the handling of the durable_v2_timeout

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Jun 27 05:42:05 UTC 2020 on sn-devel-184

diff --git a/selftest/knownfail.d/durable-v2-timeout b/selftest/knownfail.d/durable-v2-timeout
deleted file mode 100644 (file)
index a34c860..0000000
--- a/selftest/knownfail.d/durable-v2-timeout
+++ /dev/null
@@ -1,24 +0,0 @@
-^samba3.smb2.durable-v2-open.create-blob.nt4_dc
-^samba3.smb2.durable-v2-open.reopen1.nt4_dc
-^samba3.smb2.durable-v2-open.reopen1a.nt4_dc
-^samba3.smb2.durable-v2-open.reopen1a-lease.nt4_dc
-^samba3.smb2.durable-v2-open.reopen2.nt4_dc
-^samba3.smb2.durable-v2-open.reopen2b.nt4_dc
-^samba3.smb2.durable-v2-open.reopen2-lease.nt4_dc
-^samba3.smb2.durable-v2-open.reopen2-lease-v2.nt4_dc
-^samba3.smb2.durable-v2-open.create-blob.ad_dc
-^samba3.smb2.durable-v2-open.reopen1.ad_dc
-^samba3.smb2.durable-v2-open.reopen1a.ad_dc
-^samba3.smb2.durable-v2-open.reopen2.ad_dc
-^samba3.smb2.durable-v2-open.reopen2b.ad_dc
-^samba3.smb2.replay.replay-dhv2-oplock1.nt4_dc
-^samba3.smb2.replay.replay-dhv2-oplock2.nt4_dc
-^samba3.smb2.replay.replay-dhv2-oplock3.nt4_dc
-^samba3.smb2.replay.replay-dhv2-oplock-lease.nt4_dc
-^samba3.smb2.replay.replay-dhv2-lease1.nt4_dc
-^samba3.smb2.replay.replay-dhv2-lease2.nt4_dc
-^samba3.smb2.replay.replay-dhv2-lease3.nt4_dc
-^samba3.smb2.replay.replay-dhv2-lease-oplock.nt4_dc
-^samba3.smb2.replay.replay-dhv2-oplock1.ad_dc
-^samba3.smb2.replay.replay-dhv2-oplock2.ad_dc
-^samba3.smb2.replay.replay-dhv2-oplock3.ad_dc

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index d1ed90284a453e70c04a97e8825aa44886fd6322..05fa704da7259b9e3295c170290dad8f246b39ad 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1157,7 +1157,7 @@ static void smbd_smb2_create_before_exec(struct tevent_req *req)
                 * durable handle v2 request processed below
                 */
                state->durable_requested = true;
-               state->durable_timeout_msec = durable_v2_timeout;
+               state->durable_timeout_msec = MIN(durable_v2_timeout, 300*1000);
                if (state->durable_timeout_msec == 0) {
                        /*
                         * Set the timeout to 1 min as default.