summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-10-23 10:18:21 +0200
committerJeremy Allison <jra@samba.org>2014-11-25 07:25:45 +0100
commitc55a4e0b81ab3f87b7fa0d323d0752aa5ff71c1c (patch)
treed1ae2a5df38480537942dc4f896212dd39483347
parent655d6b508afe6bbb031a4637b3a310b480181136 (diff)
downloadsamba-c55a4e0b81ab3f87b7fa0d323d0752aa5ff71c1c.tar.gz
samba-c55a4e0b81ab3f87b7fa0d323d0752aa5ff71c1c.tar.xz
samba-c55a4e0b81ab3f87b7fa0d323d0752aa5ff71c1c.zip
s3:torture: avoid nesting of macros and function calls in torture_cli_session_setup2()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/torture/torture.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 2cd63e113c..f90f882093 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -416,10 +416,11 @@ bool torture_cli_session_setup2(struct cli_state *cli, uint16 *new_vuid)
bool ret;
cli_state_set_uid(cli, 0);
- ret = NT_STATUS_IS_OK(cli_session_setup(cli, username,
- password, passlen,
- password, passlen,
- workgroup));
+ status = cli_session_setup(cli, username,
+ password, passlen,
+ password, passlen,
+ workgroup);
+ ret = NT_STATUS_IS_OK(status);
*new_vuid = cli_state_get_uid(cli);
cli_state_set_uid(cli, old_vuid);
return ret;