From: Michael Adam <obnox@samba.org>
Date: Wed, 8 Aug 2012 10:18:16 +0000 (+0200)
Subject: s3:torture:delete: untangle function call from result check
X-Git-Tag: samba-4.0.0beta6~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e75b0c717506b0cb392083f6ff07d581a9cf6eb;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 1ba915a853b..bb0f1bbfce5 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4246,8 +4246,12 @@ static bool run_deletetest(int dummy)
 		printf("eighth delete on close test succeeded.\n");
 
 	/* This should fail - we need to set DELETE_ACCESS. */
-	if (NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0,FILE_READ_DATA|FILE_WRITE_DATA,
-				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE, 0, &fnum1))) {
+	status = cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA,
+			      FILE_ATTRIBUTE_NORMAL,
+			      FILE_SHARE_NONE,
+			      FILE_OVERWRITE_IF,
+			      FILE_DELETE_ON_CLOSE, 0, &fnum1);
+	if (NT_STATUS_IS_OK(status)) {
 		printf("[9] open of %s succeeded should have failed!\n", fname);
 		correct = False;
 		goto fail;