From: Björn Baumbach <bb@sernet.de>
Date: Mon, 11 Jul 2011 12:23:30 +0000 (+0200)
Subject: s3-torture: run_locktest2(): replace check_error() with check_both_error()
X-Git-Tag: talloc-2.0.6~837
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=50e2785f5e2c870485f8219c97d447b8ea89a1a7

s3-torture: run_locktest2(): replace check_error() with check_both_error()

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

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index ee84afc30b8..d40d5aa26cd 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -1692,22 +1692,26 @@ static bool run_locktest2(int dummy)
 		correct = False;
 	}
 
-	if (NT_STATUS_IS_OK(cli_unlock(cli, fnum1, 0, 4))) {
+	status = cli_unlock(cli, fnum1, 0, 4);
+	if (NT_STATUS_IS_OK(status)) {
 		printf("unlock1 succeeded! This is a locking bug\n");
-		correct = False;
+		correct = false;
 	} else {
-		if (!check_error(__LINE__, cli, 
-				 ERRDOS, ERRlock, 
-				 NT_STATUS_RANGE_NOT_LOCKED)) return False;
+		if (!check_both_error(__LINE__, status, ERRDOS, ERRlock,
+				      NT_STATUS_RANGE_NOT_LOCKED)) {
+			return false;
+		}
 	}
 
-	if (NT_STATUS_IS_OK(cli_unlock(cli, fnum1, 0, 8))) {
+	status = cli_unlock(cli, fnum1, 0, 8);
+	if (NT_STATUS_IS_OK(status)) {
 		printf("unlock2 succeeded! This is a locking bug\n");
-		correct = False;
+		correct = false;
 	} else {
-		if (!check_error(__LINE__, cli, 
-				 ERRDOS, ERRlock, 
-				 NT_STATUS_RANGE_NOT_LOCKED)) return False;
+		if (!check_both_error(__LINE__, status, ERRDOS, ERRlock,
+				      NT_STATUS_RANGE_NOT_LOCKED)) {
+			return false;
+		}
 	}
 
 	status = cli_lock32(cli, fnum3, 0, 4, 0, WRITE_LOCK);