git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fdce4b7
)
smbd:smb2: only honour the durable v2 timeout when persistent is requested
author
Michael Adam
<obnox@samba.org>
Wed, 22 Jan 2014 14:21:56 +0000
(15:21 +0100)
committer
Michael Adam
<obnox@samba.org>
Fri, 9 May 2014 10:58:21 +0000
(12:58 +0200)
This is according to [MS-SMB2], 3.3.5.9.10.
source3/smbd/smb2_create.c
patch
|
blob
|
history
diff --git
a/source3/smbd/smb2_create.c
b/source3/smbd/smb2_create.c
index aa690768fab6f9685b656425659873a1be540358..328c020703c832f7a26509a8d01a17d9f5e5d185 100644
(file)
--- a/
source3/smbd/smb2_create.c
+++ b/
source3/smbd/smb2_create.c
@@
-727,7
+727,10
@@
static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
* durable handle v2 request processed below
*/
durable_requested = true;
- durable_timeout_msec = durable_v2_timeout;
+
+ if (persistent_requested) {
+ durable_timeout_msec = durable_v2_timeout;
+ }
if (durable_timeout_msec == 0) {
/*
* Set the timeout to 1 min as default.