diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 13:13:27 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 13:13:27 +0200 |
commit | 8b06312f7eeff5ea8625677478792888774bd2be (patch) | |
tree | cd1d662f3e7e43a0c5ed667d396592f6aa6c941a /source4/client/cifsdd.c | |
parent | 5d146d0178d7da8d8f14f340dacb5b01fd03fab8 (diff) | |
download | samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.gz samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.bz2 samba-8b06312f7eeff5ea8625677478792888774bd2be.zip |
Eliminate another instance of global_loadparm.
Diffstat (limited to 'source4/client/cifsdd.c')
-rw-r--r-- | source4/client/cifsdd.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c index 5f07826d06..6d35dc6b82 100644 --- a/source4/client/cifsdd.c +++ b/source4/client/cifsdd.c @@ -358,7 +358,8 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx, struct event_context *ev, const char * which, const char **ports, struct smbcli_options *smb_options, - struct smbcli_session_options *smb_session_options) + struct smbcli_session_options *smb_session_options, + struct smb_iconv_convenience *iconv_convenience) { int options = 0; const char * path = NULL; @@ -380,13 +381,15 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx, path = check_arg_pathname("if"); handle = dd_open_path(resolve_ctx, ev, path, ports, check_arg_numeric("ibs"), options, - smb_options, smb_session_options); + smb_options, smb_session_options, + iconv_convenience); } else if (strcmp(which, "of") == 0) { options |= DD_WRITE; path = check_arg_pathname("of"); handle = dd_open_path(resolve_ctx, ev, path, ports, check_arg_numeric("obs"), options, - smb_options, smb_session_options); + smb_options, smb_session_options, + iconv_convenience); } else { SMB_ASSERT(0); return(NULL); @@ -440,13 +443,14 @@ static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx) if (!(ifile = open_file(lp_resolve_context(lp_ctx), ev, "if", lp_smb_ports(lp_ctx), &options, - &session_options))) { + &session_options, lp_iconv_convenience(lp_ctx)))) { return(FILESYS_EXIT_CODE); } if (!(ofile = open_file(lp_resolve_context(lp_ctx), ev, "of", lp_smb_ports(lp_ctx), &options, - &session_options))) { + &session_options, + lp_iconv_convenience(lp_ctx)))) { return(FILESYS_EXIT_CODE); } |