From: Jeremy Allison <jra@samba.org>
Date: Fri, 14 Dec 2012 16:56:52 +0000 (-0800)
Subject: Fix bug #9196 - defer_open is triggered multiple times on the same request.
X-Git-Tag: samba-3.6.11~3
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=a3f5202cfeb48b64ffe9958b35c477c9d4f68788;p=samba.git

Fix bug #9196 - defer_open is triggered multiple times on the same request.

get_deferred_open_message_state_smb2() is buggy in that it is checking
the wrong things to determine if an open is in the deferred state.

It checks if (smb2req->async == NULL) which is incorrect,
as we're not always async in a deferred open - remove this.

It should check instead state->open_was_deferred as this
is explicity set to 'true' when an open is going deferred,
so add this check.

Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit a8658bcb67927282288af5a579e3e66d3eaaac7b)
---

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 5a9044d8d74..5b81099928f 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -893,9 +893,6 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
 	if (!smb2req) {
 		return false;
 	}
-	if (!smb2req->async) {
-		return false;
-	}
 	req = smb2req->subreq;
 	if (!req) {
 		return false;
@@ -904,6 +901,9 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
 	if (!state) {
 		return false;
 	}
+	if (!state->open_was_deferred) {
+		return false;
+	}
 	if (p_request_time) {
 		*p_request_time = state->request_time;
 	}