summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-05-02 19:11:52 +0200
committerVolker Lendecke <vl@samba.org>2009-05-02 19:11:52 +0200
commite2052f128f4269692aede0a082351fd0dbea8cce (patch)
tree9d99e6179080421e56777a090c37dc3e192a97c6
parentcacfd6ee01382c7d52a7cdefa30c87bfe347af23 (diff)
downloadsamba-e2052f128f4269692aede0a082351fd0dbea8cce.tar.gz
samba-e2052f128f4269692aede0a082351fd0dbea8cce.tar.bz2
samba-e2052f128f4269692aede0a082351fd0dbea8cce.zip
Attempt to fix the build on SerNet-sles8
That compiler does not like #if embedded into the macro NT_STATUS_IS_OK.
-rw-r--r--source3/torture/torture.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 50bfa61c55..1f8ef7ecfb 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;
}