summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-01-20 16:27:38 +1300
committerJelmer Vernooij <jelmer@samba.org>2010-01-21 16:15:11 +1300
commitf679def4f2c4d878c8fac49ea248cfadb665168c (patch)
tree95f46b925fdb5cb80b99aa650f845aa32e736430 /source4/torture
parent4b11e0c67cbd611b7f295256f0aa6c55a8b88699 (diff)
downloadsamba-f679def4f2c4d878c8fac49ea248cfadb665168c.tar.gz
samba-f679def4f2c4d878c8fac49ea248cfadb665168c.tar.bz2
samba-f679def4f2c4d878c8fac49ea248cfadb665168c.zip
s4: Fix a few warnings.
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/samba3rpc.c1
-rw-r--r--source4/torture/smb2/acls.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 7cae8db344..86f41b058b 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -3551,7 +3551,6 @@ bool torture_samba3_getaliasmembership_0(struct torture_context *torture)
{
struct dcerpc_pipe *p;
NTSTATUS status;
- bool ret;
struct samr_Connect2 c;
struct samr_OpenDomain o;
struct dom_sid sid;
diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c
index c746d96110..8177a1ab2e 100644
--- a/source4/torture/smb2/acls.c
+++ b/source4/torture/smb2/acls.c
@@ -47,13 +47,13 @@
status = smb2_getinfo_file(tree, tctx, &_q); \
CHECK_STATUS(status, NT_STATUS_OK); \
/* Handle a Vista bug where SEC_STD_SYNCHRONIZE doesn't come back. */ \
- if (((flags & CHECK_ACCESS_IGNORE) == CHECK_ACCESS_IGNORE) && \
+ if ((((flags) & CHECK_ACCESS_IGNORE) == CHECK_ACCESS_IGNORE) && \
((_q.access_information.out.access_flags & CHECK_ACCESS_IGNORE) != CHECK_ACCESS_IGNORE)) { \
torture_comment(tctx, "SKIPPING (Vista bug): (%s) Incorrect access_flags 0x%08x - should be 0x%08x\n", \
__location__, _q.access_information.out.access_flags, (flags)); \
} \
if ((_q.access_information.out.access_flags & ~CHECK_ACCESS_IGNORE) != \
- ((flags & ~CHECK_ACCESS_IGNORE))) { \
+ (((flags) & ~CHECK_ACCESS_IGNORE))) { \
torture_result(tctx, TORTURE_FAIL, "(%s) Incorrect access_flags 0x%08x - should be 0x%08x\n", \
__location__, _q.access_information.out.access_flags, (flags)); \
ret = false; \