Attempt to fix the build on SerNet-sles8
authorVolker Lendecke <vl@samba.org>
Sat, 2 May 2009 17:11:52 +0000 (19:11 +0200)
committerVolker Lendecke <vl@samba.org>
Sat, 2 May 2009 17:11:52 +0000 (19:11 +0200)
That compiler does not like #if embedded into the macro NT_STATUS_IS_OK.

source3/torture/torture.c

index 50bfa61c55794380058312601cc2b638b8ba9069..1f8ef7ecfb7d9dd75436dca5c3a9f72d0a696d75 100644 (file)
@@ -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;
        }