summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-06-20 13:39:36 +0000
committerKarolin Seeger <kseeger@samba.org>2014-07-15 12:46:11 +0200
commit406e412ab681ba08ffdc182e999fb73a63abbbde (patch)
treef3d1ecc6a9e4c5038cbb2f73f201d932c7ecb818
parent3390f5702296c4411c9c955565f23cbfb5896a71 (diff)
downloadsamba-406e412ab681ba08ffdc182e999fb73a63abbbde.tar.gz
smbd: Fix bug 10593
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10593 PANIC: assert failed at ../source3/smbd/open.c(1582): ret
-rw-r--r--source3/smbd/smb2_create.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 2c35559d21..e6f087cd44 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;