From: Michael Adam <obnox@samba.org>
Date: Wed, 8 Aug 2012 09:24:29 +0000 (+0200)
Subject: s3:torture:delete: untangle function call from result check
X-Git-Tag: samba-4.0.0beta6~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a70a4ad73142600d8033e9d427b24c3452a56432;p=thirdparty%2Fsamba.git

s3:torture:delete: untangle function call from result check
---

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 306bca1237f..fb0da0281ae 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3950,8 +3950,11 @@ static bool run_deletetest(int dummy)
 	/* This should fail with a sharing violation - open for delete is only compatible
 	   with SHARE_DELETE. */
 
-	if (NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
-			FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, 0, &fnum2))) {
+	status = cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS,
+			      FILE_ATTRIBUTE_NORMAL,
+			      FILE_SHARE_READ|FILE_SHARE_WRITE,
+			      FILE_OPEN, 0, 0, &fnum2);
+	if (NT_STATUS_IS_OK(status)) {
 		printf("[3] open  - 2 of %s succeeded - should have failed.\n", fname);
 		correct = False;
 		goto fail;