diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-27 09:08:17 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-04-02 09:03:45 +0200 |
| commit | 0e6169626a2be3e127b6a7f1a7d06ed722e7d9b6 (patch) | |
| tree | 322b8138d4c715d16566887a339fce4f61ff144f /source4/torture/smbtorture.c | |
| parent | 0aba6770a16f45c5a4dcf54fba8de457cddddaf6 (diff) | |
| download | samba-0e6169626a2be3e127b6a7f1a7d06ed722e7d9b6.tar.gz | |
s4:torture: avoid const warnings in smbtorture.c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture/smbtorture.c')
| -rw-r--r-- | source4/torture/smbtorture.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 869947f3cdc..fc50436933f 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -158,13 +158,16 @@ bool torture_parse_target(struct loadparm_context *lp_ctx, const char *target) /* see if its a RPC transport specifier */ if (!smbcli_parse_unc(target, NULL, &host, &share)) { + const char *h; + status = dcerpc_parse_binding(talloc_autofree_context(), target, &binding_struct); if (NT_STATUS_IS_ERR(status)) { d_printf("Invalid option: %s is not a valid torture target (share or binding string)\n\n", target); return false; } - host = dcerpc_binding_get_string_option(binding_struct, "host"); + h = dcerpc_binding_get_string_option(binding_struct, "host"); + host = discard_const_p(char, h); if (host != NULL) { lpcfg_set_cmdline(lp_ctx, "torture:host", host); } @@ -378,7 +381,7 @@ int main(int argc, const char *argv[]) const char *extra_module = NULL; static int list_tests = 0, list_testsuites = 0; int num_extra_users = 0; - char **restricted = NULL; + const char **restricted = NULL; int num_restricted = -1; const char *load_list = NULL; enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, OPT_LIST, @@ -479,8 +482,9 @@ int main(int argc, const char *argv[]) } if (load_list != NULL) { - restricted = file_lines_load(load_list, &num_restricted, 0, - talloc_autofree_context()); + char **r; + r = file_lines_load(load_list, &num_restricted, 0, talloc_autofree_context()); + restricted = discard_const_p(const char *, r); if (restricted == NULL) { printf("Unable to read load list file '%s'\n", load_list); exit(1); |