diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:20:00 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 16:20:00 +0100 |
| commit | 29a20af75f150a1774b187ce64199e5f0bcc2361 (patch) | |
| tree | fe7e41923244415c154d11ad79fc9338453fe41d /source4/client | |
| parent | ff36c52d8c7f146eca9c6c678456708a8e2efbab (diff) | |
| download | samba-29a20af75f150a1774b187ce64199e5f0bcc2361.tar.gz samba-29a20af75f150a1774b187ce64199e5f0bcc2361.tar.bz2 samba-29a20af75f150a1774b187ce64199e5f0bcc2361.zip | |
Remove use of global_loadparm for SMB2 client connections.
Diffstat (limited to 'source4/client')
| -rw-r--r-- | source4/client/cifsdd.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c index 3e0ab7af78..8d0b87d722 100644 --- a/source4/client/cifsdd.c +++ b/source4/client/cifsdd.c @@ -360,7 +360,8 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx, struct smbcli_options *smb_options, const char *socket_options, struct smbcli_session_options *smb_session_options, - struct smb_iconv_convenience *iconv_convenience) + struct smb_iconv_convenience *iconv_convenience, + struct gensec_settings *gensec_settings) { int options = 0; const char * path = NULL; @@ -384,7 +385,8 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx, check_arg_numeric("ibs"), options, socket_options, smb_options, smb_session_options, - iconv_convenience); + iconv_convenience, + gensec_settings); } else if (strcmp(which, "of") == 0) { options |= DD_WRITE; path = check_arg_pathname("of"); @@ -392,7 +394,8 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx, check_arg_numeric("obs"), options, socket_options, smb_options, smb_session_options, - iconv_convenience); + iconv_convenience, + gensec_settings); } else { SMB_ASSERT(0); return(NULL); @@ -447,7 +450,8 @@ 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, lp_socket_options(lp_ctx), - &session_options, lp_iconv_convenience(lp_ctx)))) { + &session_options, lp_iconv_convenience(lp_ctx), + lp_gensec_settings(lp_ctx, lp_ctx)))) { return(FILESYS_EXIT_CODE); } @@ -455,7 +459,8 @@ static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx) lp_smb_ports(lp_ctx), &options, lp_socket_options(lp_ctx), &session_options, - lp_iconv_convenience(lp_ctx)))) { + lp_iconv_convenience(lp_ctx), + lp_gensec_settings(lp_ctx, lp_ctx)))) { return(FILESYS_EXIT_CODE); } |