summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-02 18:39:15 -0600
committerStefan Metzmacher <metze@samba.org>2008-01-02 12:48:04 -0600
commit969b8579c755441092e27b499ecedbd7d725816d (patch)
tree2b6ed0049c7afc7624ec81b559aad1d179a6b398 /source4/torture
parent40acf23a927b7fcabad621cadabb9c7476c8d5e9 (diff)
downloadsamba-969b8579c755441092e27b499ecedbd7d725816d.tar.gz
samba-969b8579c755441092e27b499ecedbd7d725816d.tar.bz2
samba-969b8579c755441092e27b499ecedbd7d725816d.zip
r26646: libcli/smb_composite: Allow specifying SMB parameters in smb_composite_connect structure. AFAIK no global variables will now be used when doing RPC client connections.
(This used to be commit 0ef75e4e3cb0e1bd10e367a00f5e9b725587c40a)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/basic/misc.c6
-rw-r--r--source4/torture/raw/lockbench.c6
-rw-r--r--source4/torture/raw/openbench.c6
3 files changed, 18 insertions, 0 deletions
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index ccff18bfc4..f4cb47e7ba 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -821,6 +821,12 @@ static struct composite_context *torture_connect_async(
smb->in.credentials=cmdline_credentials;
smb->in.fallback_to_anonymous=false;
smb->in.workgroup=workgroup;
+ smb->in.max_xmit = lp_max_xmit(tctx->lp_ctx);
+ smb->in.max_mux = lp_maxmux(tctx->lp_ctx);
+ smb->in.ntstatus_support = lp_nt_status_support(tctx->lp_ctx);
+ 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);
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 9131128f81..28392880d7 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -193,6 +193,12 @@ static void reopen_connection(struct event_context *ev, struct timed_event *te,
io->in.credentials = cmdline_credentials;
io->in.fallback_to_anonymous = false;
io->in.workgroup = lp_workgroup(state->tctx->lp_ctx);
+ io->in.max_xmit = lp_max_xmit(state->tctx->lp_ctx);
+ io->in.max_mux = lp_maxmux(state->tctx->lp_ctx);
+ io->in.ntstatus_support = lp_nt_status_support(state->tctx->lp_ctx);
+ 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);
/* 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 881f487cb0..4b6c76488f 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -131,6 +131,12 @@ static void reopen_connection(struct event_context *ev, struct timed_event *te,
io->in.credentials = cmdline_credentials;
io->in.fallback_to_anonymous = false;
io->in.workgroup = lp_workgroup(state->tctx->lp_ctx);
+ io->in.max_xmit = lp_max_xmit(state->tctx->lp_ctx);
+ io->in.max_mux = lp_maxmux(state->tctx->lp_ctx);
+ io->in.ntstatus_support = lp_nt_status_support(state->tctx->lp_ctx);
+ 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);
/* kill off the remnants of the old connection */
talloc_free(state->tree);