diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-30 17:26:42 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-30 17:26:42 +1000 |
| commit | be1927cd80838a6807827cef4431c03160d52582 (patch) | |
| tree | 759fdea9f2c65277f56209494511d24b6f7f1270 /source4/ntvfs | |
| parent | 9c1519c065a4411b3eb37e8d7738269238950227 (diff) | |
| parent | beaa01e403dda7557a6acdf0181d79d58a33bbbe (diff) | |
| download | samba-be1927cd80838a6807827cef4431c03160d52582.tar.gz samba-be1927cd80838a6807827cef4431c03160d52582.tar.bz2 samba-be1927cd80838a6807827cef4431c03160d52582.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 31308caad0a83a487341307e4e810a69c08ff371)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/smb2/vfs_smb2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c index cc09daf83f..68b475a084 100644 --- a/source4/ntvfs/smb2/vfs_smb2.c +++ b/source4/ntvfs/smb2/vfs_smb2.c @@ -162,9 +162,9 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, struct composite_context *creq; struct share_config *scfg = ntvfs->ctx->config; struct smb2_tree *tree; - struct cli_credentials *credentials; bool machine_account; + struct smbcli_options options; /* Here we need to determine which server to connect to. * For now we use parametric options, type cifs. @@ -224,10 +224,12 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, return NT_STATUS_INVALID_PARAMETER; } + lp_smbcli_options(ntvfs->ctx->lp_ctx, &options); + creq = smb2_connect_send(private, host, remote_share, lp_resolve_context(ntvfs->ctx->lp_ctx), credentials, - ntvfs->ctx->event_ctx); + ntvfs->ctx->event_ctx, &options); status = smb2_connect_recv(creq, private, &tree); NT_STATUS_NOT_OK_RETURN(status); |