Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10

This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.

Karolin

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 2c35559d215..e6f087cd448 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1272,7 +1272,14 @@ bool schedule_deferred_open_message_smb2(
 		DEBUG(10,("schedule_deferred_open_message_smb2: "
 			"can't find mid %llu\n",
 			(unsigned long long)mid ));
-		return false;
+
+		/*
+		 * Bug 10593: We have to ignore this as an error because the
+		 * request might have been cancelled. The real fix is to
+		 * discard the defer_open dbwrap_watcher at cancel
+		 * time. Working on that.... :-)
+		 */
+		return true;
 	}
 	if (!smb2req->subreq) {
 		return false;