From: Michael Adam <obnox@samba.org>
Date: Thu, 18 Apr 2013 11:11:03 +0000 (+0200)
Subject: s3:smbd:smb2: fix setting of scavenge timeout when reconnecting durable handles
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=beb9a27180e5570337381d03fac55bbe6d1637e0;p=obnox%2Fsamba%2Fsamba-obnox.git

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>
---

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index c239ccb1432..fe0c4e48d29 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 {