From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 Dec 2008 06:49:41 +0000 (+0100)
Subject: BASE-LOCK: fix LOCK5
X-Git-Tag: samba-4.0.0alpha6~462^2~14^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79351f75fee425fc4dd2f2d6dacd32908aa133b4;p=thirdparty%2Fsamba.git

BASE-LOCK: fix LOCK5

We need to close all 3 file handle to make the unlink work.

metze
---

diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 3f399c97efd..fcac52ca6a1 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -624,10 +624,18 @@ ret = NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 0, 4)) &&
 	torture_comment(tctx, "a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot");
 
 
-	smbcli_close(cli1->tree, fnum1);
-	smbcli_close(cli2->tree, fnum2);
-	smbcli_unlink(cli1->tree, fname);
-       
+	torture_assert_ntstatus_ok(tctx, smbcli_close(cli1->tree, fnum1),
+		talloc_asprintf(tctx, "close1 failed (%s)", smbcli_errstr(cli1->tree)));
+
+	torture_assert_ntstatus_ok(tctx, smbcli_close(cli2->tree, fnum2),
+		talloc_asprintf(tctx, "close2 failed (%s)", smbcli_errstr(cli2->tree)));
+
+	torture_assert_ntstatus_ok(tctx, smbcli_close(cli1->tree, fnum3),
+		talloc_asprintf(tctx, "close2 failed (%s)", smbcli_errstr(cli2->tree)));
+
+	torture_assert_ntstatus_ok(tctx, smbcli_unlink(cli1->tree, fname),
+		talloc_asprintf(tctx, "unlink failed (%s)", smbcli_errstr(cli1->tree)));
+
 	return correct;
 }