diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-30 02:11:55 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-30 02:11:55 +0200 |
| commit | 4e8cb60222ea13295eaff477625164dfd61e288f (patch) | |
| tree | 8094e192079d2f3057eecc6697ceaf80700075c4 /source4 | |
| parent | 755ad80e2932f2114941adeb13f8879010484ff8 (diff) | |
| download | samba-4e8cb60222ea13295eaff477625164dfd61e288f.tar.gz samba-4e8cb60222ea13295eaff477625164dfd61e288f.tar.bz2 samba-4e8cb60222ea13295eaff477625164dfd61e288f.zip | |
Remove global_loadparm instance.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libcli/smb_composite/fsinfo.c | 10 | ||||
| -rw-r--r-- | source4/torture/raw/composite.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c index 270d71f518..cd6e98547b 100644 --- a/source4/libcli/smb_composite/fsinfo.c +++ b/source4/libcli/smb_composite/fsinfo.c @@ -127,7 +127,8 @@ static void fsinfo_composite_handler(struct composite_context *creq) composite fsinfo call - connects to a tree and queries a file system information */ struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree, - struct smb_composite_fsinfo *io) + struct smb_composite_fsinfo *io, + struct resolve_context *resolve_ctx) { struct composite_context *c; struct fsinfo_state *state; @@ -160,7 +161,7 @@ struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree, c->private_data = state; state->creq = smb_composite_connect_send(state->connect, state, - lp_resolve_context(global_loadparm), c->event_ctx); + resolve_ctx, c->event_ctx); if (state->creq == NULL) goto failed; @@ -197,9 +198,10 @@ NTSTATUS smb_composite_fsinfo_recv(struct composite_context *c, TALLOC_CTX *mem_ */ NTSTATUS smb_composite_fsinfo(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx, - struct smb_composite_fsinfo *io) + struct smb_composite_fsinfo *io, + struct resolve_context *resolve_ctx) { - struct composite_context *c = smb_composite_fsinfo_send(tree, io); + struct composite_context *c = smb_composite_fsinfo_send(tree, io, resolve_ctx); return smb_composite_fsinfo_recv(c, mem_ctx); } diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index d73ac1327e..a151854e59 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -358,7 +358,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx) c = talloc_array(tctx, struct composite_context *, torture_numops); for (i=0; i<torture_numops; i++) { - c[i] = smb_composite_fsinfo_send(cli->tree,&io1); + c[i] = smb_composite_fsinfo_send(cli->tree, &io1, lp_resolve_context(tctx->lp_ctx)); c[i]->async.fn = loadfile_complete; c[i]->async.private_data = count; } |