diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:07:28 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:07:28 +0100 |
commit | ff36c52d8c7f146eca9c6c678456708a8e2efbab (patch) | |
tree | 8ae184942009eaef07148baf6ef7f33064555b40 /source4/torture/masktest.c | |
parent | 7a0e5de08d487108c604b4bab8a2c8e689808d9f (diff) | |
download | samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.tar.gz samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.tar.bz2 samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.zip |
Remove another use of global_loadparm.
Eventually, we should move some of these parameters into a separate
struct (perhaps into smb_transport_options?), to avoid the long lists of
parameters.
Diffstat (limited to 'source4/torture/masktest.c')
-rw-r--r-- | source4/torture/masktest.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index fb1277a95a..9ff790c2b0 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -79,7 +79,8 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx, const char *socket_options, struct smbcli_options *options, struct smbcli_session_options *session_options, - struct smb_iconv_convenience *iconv_convenience) + struct smb_iconv_convenience *iconv_convenience, + struct gensec_settings *gensec_settings) { struct smbcli_state *c; char *server; @@ -100,7 +101,8 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx, socket_options, cmdline_credentials, resolve_ctx, ev, options, session_options, - iconv_convenience); + iconv_convenience, + gensec_settings); if (!NT_STATUS_IS_OK(status)) { return NULL; @@ -372,7 +374,8 @@ static void usage(poptContext pc) cli = connect_one(lp_resolve_context(lp_ctx), ev, mem_ctx, share, lp_smb_ports(lp_ctx), lp_socket_options(lp_ctx), &options, &session_options, - lp_iconv_convenience(lp_ctx)); + lp_iconv_convenience(lp_ctx), + lp_gensec_settings(mem_ctx, lp_ctx)); if (!cli) { DEBUG(0,("Failed to connect to %s\n", share)); exit(1); |