diff options
| author | Michael Adam <obnox@samba.org> | 2013-04-18 13:11:03 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-04-18 13:15:10 +0200 |
| commit | beb9a27180e5570337381d03fac55bbe6d1637e0 (patch) | |
| tree | e2177156fe650f14610ebaa5d64e8899ac215482 | |
| parent | bb7c6a0bd0d194e62d2c861edaff1dd6a0e071f6 (diff) | |
| download | samba-beb9a27180e5570337381d03fac55bbe6d1637e0.tar.gz samba-beb9a27180e5570337381d03fac55bbe6d1637e0.tar.bz2 samba-beb9a27180e5570337381d03fac55bbe6d1637e0.zip | |
s3:smbd:smb2: fix setting of scavenge timeout when reconnecting durable handles
The bug fixed with this commit led to reconnected durable handles
having a disconnect timeout of 0 msec. This fix re-establishes the
original timeout for the reconnected handle.
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/smbd/smb2_create.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index c239ccb143..fe0c4e48d2 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -839,11 +839,10 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx, op->status = NT_STATUS_OK; op->global->disconnect_time = 0; - status = smbXsrv_open_update(op); - if (!NT_STATUS_IS_OK(status)) { - tevent_req_nterror(req, status); - return tevent_req_post(req, ev); - } + /* save the timout for later update */ + durable_timeout_msec = op->global->durable_timeout_msec; + + update_open = true; info = FILE_WAS_OPENED; } else { |