[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1413-ge2052f1

[Volker Lendecke]

The branch, master has been updated
       via  e2052f128f4269692aede0a082351fd0dbea8cce (commit)
      from  cacfd6ee01382c7d52a7cdefa30c87bfe347af23 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e2052f128f4269692aede0a082351fd0dbea8cce
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 2 19:11:52 2009 +0200

    Attempt to fix the build on SerNet-sles8
    
    That compiler does not like #if embedded into the macro NT_STATUS_IS_OK.

-----------------------------------------------------------------------

Summary of changes:
 source3/torture/torture.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 50bfa61..1f8ef7e 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3492,6 +3492,7 @@ static bool run_rename(int dummy)
 	const char *fname1 = "\\test1.txt";
 	bool correct = True;
 	uint16_t fnum1;
+	NTSTATUS status;
 
 	printf("starting rename test\n");
 
@@ -3521,12 +3522,14 @@ static bool run_rename(int dummy)
 
 	cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
 	cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
-	if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	status = cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
 #if 0
-				   FILE_SHARE_DELETE|FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
+			      FILE_SHARE_DELETE|FILE_SHARE_NONE,
 #else
-				   FILE_SHARE_DELETE|FILE_SHARE_READ, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
+			      FILE_SHARE_DELETE|FILE_SHARE_READ,
 #endif
+			      FILE_OVERWRITE_IF, 0, 0, &fnum1);
+	if (!NT_STATUS_IS_OK(status)) {
 		printf("Second open failed - %s\n", cli_errstr(cli1));
 		return False;
 	}


-- 
Samba Shared Repository