diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 14:50:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 14:50:57 +0100 |
| commit | 921b17648456027b6b46a582aa1d13024a5e9a90 (patch) | |
| tree | 637fe02b288cf87c33fabd6e6875f5e6d011eae5 /source4/libcli/smb_composite | |
| parent | 37deca2d41d74faa7abe060a21340263bd6d66f7 (diff) | |
| download | samba-921b17648456027b6b46a582aa1d13024a5e9a90.tar.gz samba-921b17648456027b6b46a582aa1d13024a5e9a90.tar.bz2 samba-921b17648456027b6b46a582aa1d13024a5e9a90.zip | |
Remove more uses of global_loadparm.
(This used to be commit 47d05ecf6fef66c90994f666b8c63e2e7b5a6cd8)
Diffstat (limited to 'source4/libcli/smb_composite')
| -rw-r--r-- | source4/libcli/smb_composite/fetchfile.c | 4 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/smb_composite.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c index c7d02e323c..e4312794c9 100644 --- a/source4/libcli/smb_composite/fetchfile.c +++ b/source4/libcli/smb_composite/fetchfile.c @@ -147,8 +147,8 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc state->connect->in.fallback_to_anonymous = false; state->connect->in.workgroup = io->in.workgroup; - lp_smbcli_options(global_loadparm, &state->connect->in.options); - + state->connect->in.options = io->in.options; + state->creq = smb_composite_connect_send(state->connect, state, lp_resolve_context(global_loadparm), event_ctx); if (state->creq == NULL) goto failed; diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h index a732617f80..964ffb0936 100644 --- a/source4/libcli/smb_composite/smb_composite.h +++ b/source4/libcli/smb_composite/smb_composite.h @@ -55,6 +55,7 @@ struct smb_composite_fetchfile { struct cli_credentials *credentials; const char *workgroup; const char *filename; + struct smbcli_options options; } in; struct { uint8_t *data; |