diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-03 17:21:58 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-03 12:33:36 -0600 |
| commit | 425732f688865ebe2bfe568c8278edec50cbdedf (patch) | |
| tree | 6b8a847c85af4edc38b4e58cd3e82a9baeb8ed18 /source4/client/client.c | |
| parent | 5d0e4f2147d4d1d0104d55756e91ffc13d25c1f3 (diff) | |
| download | samba-425732f688865ebe2bfe568c8278edec50cbdedf.tar.gz samba-425732f688865ebe2bfe568c8278edec50cbdedf.tar.bz2 samba-425732f688865ebe2bfe568c8278edec50cbdedf.zip | |
r26651: libsmb: Allow specifying signing policy from higher up.
The number of arguments is getting a bit excessive now, so it
probably makes sense to pass in the smbcli_options struct rather than
all members individually and add a convenience function for obtaining a
smbcli_options struct from a loadparm context.
(This used to be commit 9f64213463b5bf3bcbf36913139e9a5042e967a2)
Diffstat (limited to 'source4/client/client.c')
| -rw-r--r-- | source4/client/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 7ce3268d3a..259966ddaa 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3065,7 +3065,7 @@ static int do_host_query(struct loadparm_context *lp_ctx, const char *query_host /**************************************************************************** handle a message operation ****************************************************************************/ -static int do_message_op(const char *netbios_name, const char *desthost, const char **destports, const char *destip, int name_type, struct resolve_context *resolve_ctx, int max_xmit, int max_mux, bool use_spnego) +static int do_message_op(const char *netbios_name, const char *desthost, const char **destports, const char *destip, int name_type, struct resolve_context *resolve_ctx, int max_xmit, int max_mux, bool use_spnego, enum smb_signing_state signing) { struct nbt_name called, calling; const char *server_name; @@ -3077,7 +3077,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c server_name = destip ? destip : desthost; - if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, destports, resolve_ctx, max_xmit, max_mux, use_spnego)) { + if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, destports, resolve_ctx, max_xmit, max_mux, use_spnego, signing)) { d_printf("Connection to %s failed\n", server_name); return 1; } @@ -3225,7 +3225,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c } if (message) { - return do_message_op(lp_netbios_name(cmdline_lp_ctx), desthost, lp_smb_ports(cmdline_lp_ctx), dest_ip, name_type, lp_resolve_context(cmdline_lp_ctx), lp_max_xmit(cmdline_lp_ctx), lp_maxmux(cmdline_lp_ctx), lp_nt_status_support(cmdline_lp_ctx) && lp_use_spnego(cmdline_lp_ctx)); + return do_message_op(lp_netbios_name(cmdline_lp_ctx), desthost, lp_smb_ports(cmdline_lp_ctx), dest_ip, name_type, lp_resolve_context(cmdline_lp_ctx), lp_max_xmit(cmdline_lp_ctx), lp_maxmux(cmdline_lp_ctx), lp_nt_status_support(cmdline_lp_ctx) && lp_use_spnego(cmdline_lp_ctx), lp_client_signing(cmdline_lp_ctx)); } if (!do_connect(ctx, lp_resolve_context(cmdline_lp_ctx), desthost, lp_smb_ports(cmdline_lp_ctx), service, cmdline_credentials)) |