summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-28 20:30:03 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-28 20:30:03 +0100
commit2946a11dc7d367128d8c002966ac19e3e36450dd (patch)
tree53740f663e7fd42fc4c5d488a3922254e0b51e68
parent2ba62662f8e2578153be3125eb557b9349ccfd3b (diff)
downloadsamba-2946a11dc7d367128d8c002966ac19e3e36450dd.tar.gz
samba-2946a11dc7d367128d8c002966ac19e3e36450dd.tar.bz2
samba-2946a11dc7d367128d8c002966ac19e3e36450dd.zip
Remove use of global_loadparm.
(This used to be commit 4472d7e1e47d4fe6b1c60e28d168cce99b237979)
-rw-r--r--source4/libcli/smb_composite/fetchfile.c2
-rw-r--r--source4/libcli/smb_composite/smb_composite.h1
-rw-r--r--source4/torture/raw/composite.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c
index e4312794c9..d8d7481270 100644
--- a/source4/libcli/smb_composite/fetchfile.c
+++ b/source4/libcli/smb_composite/fetchfile.c
@@ -150,7 +150,7 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc
state->connect->in.options = io->in.options;
state->creq = smb_composite_connect_send(state->connect, state,
- lp_resolve_context(global_loadparm), event_ctx);
+ io->in.resolve_ctx, event_ctx);
if (state->creq == NULL) goto failed;
state->creq->async.private_data = c;
diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index 964ffb0936..e7e131869c 100644
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -56,6 +56,7 @@ struct smb_composite_fetchfile {
const char *workgroup;
const char *filename;
struct smbcli_options options;
+ struct resolve_context *resolve_ctx;
} in;
struct {
uint8_t *data;
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 7238a2fd46..1f31fbc515 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -31,6 +31,7 @@
#include "lib/cmdline/popt_common.h"
#include "torture/util.h"
#include "param/param.h"
+#include "libcli/resolve/resolve.h"
#define BASEDIR "\\composite"
@@ -161,6 +162,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct
io2.in.credentials = cmdline_credentials;
io2.in.workgroup = lp_workgroup(tctx->lp_ctx);
io2.in.filename = fname;
+ io2.in.resolve_ctx = lp_resolve_context(tctx->lp_ctx);
lp_smbcli_options(tctx->lp_ctx, &io2.in.options);
printf("testing parallel fetchfile with %d ops\n", torture_numops);