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/torture/basic | |
| 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/torture/basic')
| -rw-r--r-- | source4/torture/basic/base.c | 2 | ||||
| -rw-r--r-- | source4/torture/basic/misc.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 9820a02f27..fcd788481b 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -51,7 +51,7 @@ static struct smbcli_state *open_nbt_connection(struct torture_context *tctx) goto failed; } - if (!smbcli_socket_connect(cli, host, lp_smb_ports(tctx->lp_ctx), lp_resolve_context(tctx->lp_ctx), lp_max_xmit(tctx->lp_ctx), lp_maxmux(tctx->lp_ctx), lp_nt_status_support(tctx->lp_ctx) && lp_use_spnego(tctx->lp_ctx))) { + if (!smbcli_socket_connect(cli, host, lp_smb_ports(tctx->lp_ctx), lp_resolve_context(tctx->lp_ctx), lp_max_xmit(tctx->lp_ctx), lp_maxmux(tctx->lp_ctx), lp_nt_status_support(tctx->lp_ctx) && lp_use_spnego(tctx->lp_ctx), lp_client_signing(tctx->lp_ctx))) { torture_comment(tctx, "Failed to connect with %s\n", host); goto failed; } diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index f4cb47e7ba..986a4574a9 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -827,6 +827,7 @@ static struct composite_context *torture_connect_async( smb->in.max_protocol = lp_cli_maxprotocol(tctx->lp_ctx); smb->in.unicode = lp_unicode(tctx->lp_ctx); smb->in.use_spnego = lp_use_spnego(tctx->lp_ctx) && lp_nt_status_support(tctx->lp_ctx); + smb->in.signing = lp_client_signing(tctx->lp_ctx); return smb_composite_connect_send(smb,mem_ctx, lp_resolve_context(tctx->lp_ctx),ev); |