summaryrefslogtreecommitdiffstats
path: root/source4/torture
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-02-27 09:08:17 +0100
committerAndrew Bartlett <abartlet@samba.org>2014-04-02 09:03:45 +0200
commit0aba6770a16f45c5a4dcf54fba8de457cddddaf6 (patch)
tree0a75ec3fb0fcf9929829b2914f054bbd64f804ab /source4/torture
parente444aca4b3979f5e4b5258320a31a67eb6814177 (diff)
downloadsamba-0aba6770a16f45c5a4dcf54fba8de457cddddaf6.tar.gz
samba-0aba6770a16f45c5a4dcf54fba8de457cddddaf6.tar.xz
samba-0aba6770a16f45c5a4dcf54fba8de457cddddaf6.zip
s4:torture/rpc: avoid declaration after code warnings
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/drsuapi_cracknames.c3
-rw-r--r--source4/torture/rpc/forest_trust.c3
-rw-r--r--source4/torture/rpc/samsync.c14
3 files changed, 10 insertions, 10 deletions
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index ac39d1d5b29..c03f6bd1ca9 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -939,13 +939,14 @@ bool test_DsCrackNames(struct torture_context *tctx,
int i;
for (i=0; i < ARRAY_SIZE(crack); i++) {
+ const char *comment;
+
torture_comment(tctx, "Testing DsCrackNames with name '%s'"
" offered format: %d desired format:%d\n",
crack[i].str,
crack[i].format_offered,
crack[i].format_desired);
- const char *comment;
r.in.req->req1.format_flags = crack[i].flags;
r.in.req->req1.format_offered = crack[i].format_offered;
r.in.req->req1.format_desired = crack[i].format_desired;
diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c
index 47940e05277..74a56ef639b 100644
--- a/source4/torture/rpc/forest_trust.c
+++ b/source4/torture/rpc/forest_trust.c
@@ -598,6 +598,7 @@ static bool test_validate_trust(struct torture_context *tctx,
struct lsa_ForestTrustInformation *forest_trust_info;
int i;
struct samr_Password nt_hash;
+ char *dummy;
status = dcerpc_parse_binding(tctx, binding, &b);
torture_assert_ntstatus_ok(tctx, status, "Bad binding string");
@@ -607,7 +608,7 @@ static bool test_validate_trust(struct torture_context *tctx,
return false;
}
- char *dummy = talloc_asprintf(tctx, "%s$", trusted_dom_name);
+ dummy = talloc_asprintf(tctx, "%s$", trusted_dom_name);
cli_credentials_set_username(credentials, dummy,
CRED_SPECIFIED);
cli_credentials_set_domain(credentials, trusting_dom_name,
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index be026173828..2c18e0d502e 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -472,6 +472,12 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
const char *username = user->account_name.string;
NTSTATUS nt_status;
bool ret = true;
+ struct samr_OpenUser r;
+ struct samr_QueryUserInfo q;
+ union samr_UserInfo *info;
+ struct policy_handle user_handle;
+ struct samr_GetGroupsForUser getgr;
+ struct samr_RidWithAttributeArray *rids;
switch (database_id) {
case SAM_DATABASE_DOMAIN:
@@ -484,14 +490,6 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
domain = samsync_state->domain_name[database_id];
- struct samr_OpenUser r;
- struct samr_QueryUserInfo q;
- union samr_UserInfo *info;
- struct policy_handle user_handle;
-
- struct samr_GetGroupsForUser getgr;
- struct samr_RidWithAttributeArray *rids;
-
if (domain == NULL ||
samsync_state->domain_handle[database_id] == NULL) {
torture_comment(tctx, "SamSync needs domain information before the users\n");