From dcc282590b34537fc1ead61c3300172528273b44 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 3 Jan 2008 17:22:12 -0600 Subject: r26654: libcli/smb_composite: Rather than specifying each of the gazillion options for SMB individually, just specify the smbcli_options struct. (This used to be commit 8a97886e24a4b969aa91409c06f423b71a45f6eb) --- source4/torture/masktest.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source4/torture/masktest.c') diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 28dfe27960e..d1b853de725 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -74,7 +74,8 @@ static char *reg_test(struct smbcli_state *cli, char *pattern, char *long_name, return a connection to a server *******************************************************/ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx, - char *share, const char **ports) + char *share, const char **ports, + struct smbcli_options *options) { struct smbcli_state *c; fstring server; @@ -92,7 +93,8 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx, server, ports, share, NULL, - credentials, resolve_ctx, NULL); + credentials, resolve_ctx, NULL, + options); if (!NT_STATUS_IS_OK(status)) { return NULL; @@ -303,6 +305,7 @@ static void usage(void) int opt; int seed; struct loadparm_context *lp_ctx; + struct smbcli_options options; setlinebuf(stdout); @@ -382,7 +385,10 @@ static void usage(void) argc -= optind; argv += optind; - cli = connect_one(lp_resolve_context(lp_ctx), share, lp_smb_ports(lp_ctx)); + lp_smbcli_options(lp_ctx, &options); + + cli = connect_one(lp_resolve_context(lp_ctx), share, + lp_smb_ports(lp_ctx), &options); if (!cli) { DEBUG(0,("Failed to connect to %s\n", share)); exit(1); -- cgit v1.2.1