diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 10:56:56 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 10:56:56 +1100 |
commit | f6b2a57c9517202c554fa5a60bbe7ffd49b431f5 (patch) | |
tree | b3a1e27af97c0871bf8a518b0f2aa5c823c7e8ec /source4/libcli/smb_composite/fetchfile.c | |
parent | f5b0f7a5fe6811c49661577540aaed248eda33a4 (diff) | |
parent | d115497478a4c60bc273d8f63756222eb135aa09 (diff) | |
download | samba-f6b2a57c9517202c554fa5a60bbe7ffd49b431f5.tar.gz samba-f6b2a57c9517202c554fa5a60bbe7ffd49b431f5.tar.bz2 samba-f6b2a57c9517202c554fa5a60bbe7ffd49b431f5.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 124d2ee788f1ac4b201a2843b58be21de358deb0)
Diffstat (limited to 'source4/libcli/smb_composite/fetchfile.c')
-rw-r--r-- | source4/libcli/smb_composite/fetchfile.c | 2 |
1 files changed, 1 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; |