diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 01:03:26 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 01:03:26 +0100 |
| commit | 7a6190e9a7cc176ebd428c1e3edde1328ebca3e3 (patch) | |
| tree | 3c4ef46b2d735dafc6c4add9d99270f6d5341dd8 /source4/torture | |
| parent | cb7d085ec34442db25e6c5a5d4b4547e0718fb92 (diff) | |
| download | samba-7a6190e9a7cc176ebd428c1e3edde1328ebca3e3.tar.gz samba-7a6190e9a7cc176ebd428c1e3edde1328ebca3e3.tar.bz2 samba-7a6190e9a7cc176ebd428c1e3edde1328ebca3e3.zip | |
Remove another use of global_loadparm.
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/basic/misc.c | 1 | ||||
| -rw-r--r-- | source4/torture/raw/composite.c | 1 | ||||
| -rw-r--r-- | source4/torture/raw/lockbench.c | 2 | ||||
| -rw-r--r-- | source4/torture/raw/openbench.c | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 89e7169883..c19b08e617 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -817,6 +817,7 @@ static struct composite_context *torture_connect_async( smb->in.dest_host=talloc_strdup(mem_ctx,host); smb->in.service=talloc_strdup(mem_ctx,share); smb->in.dest_ports=lp_smb_ports(tctx->lp_ctx); + smb->in.socket_options = lp_socket_options(tctx->lp_ctx); smb->in.called_name = strupper_talloc(mem_ctx, host); smb->in.service_type=NULL; smb->in.credentials=cmdline_credentials; diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index 16de4308bb..6eb4fe0e67 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -347,6 +347,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx) io1.in.dest_host = torture_setting_string(tctx, "host", NULL); io1.in.dest_ports = lp_smb_ports(tctx->lp_ctx); + io1.in.socket_options = lp_socket_options(tctx->lp_ctx); io1.in.called_name = torture_setting_string(tctx, "host", NULL); io1.in.service = torture_setting_string(tctx, "share", NULL); io1.in.service_type = "A:"; diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c index a6dce8a926..681d37bddb 100644 --- a/source4/torture/raw/lockbench.c +++ b/source4/torture/raw/lockbench.c @@ -188,6 +188,7 @@ static void reopen_connection(struct event_context *ev, struct timed_event *te, io->in.dest_host = state->dest_host; io->in.dest_ports = state->dest_ports; + io->in.socket_options = lp_socket_options(state->tctx->lp_ctx); io->in.called_name = state->called_name; io->in.service = share; io->in.service_type = state->service_type; @@ -340,6 +341,7 @@ bool torture_bench_lock(struct torture_context *torture) } talloc_steal(mem_ctx, state); state[i].tree = cli->tree; + state[i].socket_options = lp_socket_options(torture->lp_ctx); state[i].dest_host = talloc_strdup(state[i].mem_ctx, cli->tree->session->transport->socket->hostname); state[i].dest_ports = talloc_array(state[i].mem_ctx, diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c index ec94637445..9e9f27af6b 100644 --- a/source4/torture/raw/openbench.c +++ b/source4/torture/raw/openbench.c @@ -130,6 +130,7 @@ static void reopen_connection(struct event_context *ev, struct timed_event *te, io->in.dest_host = state->dest_host; io->in.dest_ports = state->dest_ports; + io->in.socket_options = lp_socket_options(state->tctx->lp_ctx); io->in.called_name = state->called_name; io->in.service = share; io->in.service_type = state->service_type; @@ -400,6 +401,7 @@ bool torture_bench_open(struct torture_context *torture) state[i].dest_ports[0] = talloc_asprintf(state[i].dest_ports, "%u", state[i].cli->tree->session->transport->socket->port); state[i].dest_ports[1] = NULL; + state[i].socket_options = lp_socket_options(torture->lp_ctx); state[i].called_name = talloc_strdup(state[i].mem_ctx, state[i].cli->tree->session->transport->called.name); state[i].service_type = talloc_strdup(state[i].mem_ctx, |