From 425732f688865ebe2bfe568c8278edec50cbdedf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 3 Jan 2008 17:21:58 -0600 Subject: 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) --- source4/torture/basic/base.c | 2 +- source4/torture/basic/misc.c | 1 + source4/torture/raw/lockbench.c | 1 + source4/torture/raw/openbench.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) (limited to 'source4/torture') 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); diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c index ea570e5bf5..5093816a31 100644 --- a/source4/torture/raw/lockbench.c +++ b/source4/torture/raw/lockbench.c @@ -199,6 +199,7 @@ static void reopen_connection(struct event_context *ev, struct timed_event *te, io->in.max_protocol = lp_cli_maxprotocol(state->tctx->lp_ctx); io->in.unicode = lp_unicode(state->tctx->lp_ctx); io->in.use_spnego = lp_use_spnego(state->tctx->lp_ctx) && lp_nt_status_support(state->tctx->lp_ctx); + io->in.signing = lp_client_signing(state->tctx->lp_ctx); /* kill off the remnants of the old connection */ talloc_free(state->tree); diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c index 0582905816..7f4752cdf7 100644 --- a/source4/torture/raw/openbench.c +++ b/source4/torture/raw/openbench.c @@ -137,6 +137,7 @@ static void reopen_connection(struct event_context *ev, struct timed_event *te, io->in.max_protocol = lp_cli_maxprotocol(state->tctx->lp_ctx); io->in.unicode = lp_unicode(state->tctx->lp_ctx); io->in.use_spnego = lp_use_spnego(state->tctx->lp_ctx) && lp_nt_status_support(state->tctx->lp_ctx); + io->in.signing = lp_client_signing(state->tctx->lp_ctx); /* kill off the remnants of the old connection */ talloc_free(state->tree); -- cgit