diff options
| author | Jeremy Allison <jra@samba.org> | 2017-05-09 16:10:03 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-05-11 20:30:13 +0200 |
| commit | b2de5a81bf2e5a79b101859c738fc057af7308ed (patch) | |
| tree | 439e0d660e3ab059deb4b0108170f3a31a9a8d70 /source4/client | |
| parent | dd4a3ce92792c4687f92d4b9e88f7bbee6cad593 (diff) | |
| download | samba-b2de5a81bf2e5a79b101859c738fc057af7308ed.tar.gz | |
s4: popt: Global replace of cmdline_credentials -> popt_get_cmdline_credentials().
Add one use of popt_set_cmdline_credentials().
Fix 80 column limits when cmdline_credentials changes
to popt_get_cmdline_credentials().
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/client')
| -rw-r--r-- | source4/client/cifsddio.c | 13 | ||||
| -rw-r--r-- | source4/client/client.c | 14 |
2 files changed, 17 insertions, 10 deletions
diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c index 0ceb69e3b15..19d7dc82dbc 100644 --- a/source4/client/cifsddio.c +++ b/source4/client/cifsddio.c @@ -236,12 +236,13 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct * each connection, but for now, we just use the same one for both. */ ret = smbcli_full_connection(NULL, &cli, host, ports, share, - NULL /* devtype */, - socket_options, - cmdline_credentials, resolve_ctx, - ev, options, - session_options, - gensec_settings); + NULL /* devtype */, + socket_options, + popt_get_cmdline_credentials(), + resolve_ctx, + ev, options, + session_options, + gensec_settings); if (!NT_STATUS_IS_OK(ret)) { fprintf(stderr, "%s: connecting to //%s/%s: %s\n", diff --git a/source4/client/client.c b/source4/client/client.c index 1182e5be013..9b2115acc31 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -174,7 +174,11 @@ static void send_message(struct smbcli_state *cli, const char *desthost) int total_len = 0; int grp_id; - if (!smbcli_message_start(cli->tree, desthost, cli_credentials_get_username(cmdline_credentials), &grp_id)) { + if (!smbcli_message_start(cli->tree, + desthost, + cli_credentials_get_username( + popt_get_cmdline_credentials()), + &grp_id)) { d_printf("message start: %s\n", smbcli_errstr(cli->tree)); return; } @@ -2702,7 +2706,7 @@ static bool browse_host(struct loadparm_context *lp_ctx, status = dcerpc_pipe_connect(mem_ctx, &p, binding, &ndr_table_srvsvc, - cmdline_credentials, ev_ctx, + popt_get_cmdline_credentials(), ev_ctx, lp_ctx); if (!NT_STATUS_IS_OK(status)) { d_printf("Failed to connect to %s - %s\n", @@ -3395,7 +3399,8 @@ static int do_message_op(const char *netbios_name, const char *desthost, } if (poptPeekArg(pc)) { - cli_credentials_set_password(cmdline_credentials, poptGetArg(pc), CRED_SPECIFIED); + cli_credentials_set_password(popt_get_cmdline_credentials(), + poptGetArg(pc), CRED_SPECIFIED); } /*init_names(); */ @@ -3439,7 +3444,8 @@ static int do_message_op(const char *netbios_name, const char *desthost, if (!do_connect(ctx, ev_ctx, lpcfg_resolve_context(cmdline_lp_ctx), desthost, lpcfg_smb_ports(cmdline_lp_ctx), service, lpcfg_socket_options(cmdline_lp_ctx), - cmdline_credentials, &smb_options, &smb_session_options, + popt_get_cmdline_credentials(), + &smb_options, &smb_session_options, lpcfg_gensec_settings(ctx, cmdline_lp_ctx))) return 1; |