From 06c454094fc4cba0d19262e57b79596d066f9ce2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 28 Dec 2005 22:31:26 +0000
Subject: r12551: fixed oplock serialisation problem in gentest as well (This
 used to be commit 2055f978214c1a2732433efe38ebc0fb70ec4e70)

---
 source4/torture/gentest.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'source4/torture/gentest.c')

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index abd9921569..d466671252 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -708,6 +708,16 @@ static void async_notify(struct smbcli_request *req)
 	}
 }
 
+static void oplock_handler_close_recv(struct smbcli_request *req)
+{
+	NTSTATUS status;
+	status = smbcli_request_simple_recv(req);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("close failed in oplock_handler\n");
+		smb_panic("close failed in oplock_handler");
+	}
+}
+
 /*
   the oplock handler will either ack the break or close the file
 */
@@ -718,6 +728,7 @@ static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, uin
 	int i, j;
 	BOOL do_close;
 	struct smbcli_tree *tree = NULL;
+	struct smbcli_request *req;
 
 	srandom(current_op.seed);
 	do_close = gen_chance(50);
@@ -751,11 +762,17 @@ static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, uin
 	io.close.level = RAW_CLOSE_CLOSE;
 	io.close.in.fnum = fnum;
 	io.close.in.write_time = 0;
-	status = smb_raw_close(tree, &io);
+	req = smb_raw_close_send(tree, &io);
 
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("WARNING: close failed in oplock_handler_close - %s\n", nt_errstr(status));
+	if (req == NULL) {
+		printf("WARNING: close failed in oplock_handler_close - %s\n", 
+		       nt_errstr(status));
+		return False;
 	}
+
+	req->async.fn = oplock_handler_close_recv;
+	req->async.private = NULL;
+
 	return True;
 }
 
-- 
cgit