summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-04-27 09:05:50 +0200
committerStefan Metzmacher <metze@samba.org>2011-04-28 20:35:47 +0200
commit2bb637d1cfa5147000d9c2cbbbafcbbb20df26da (patch)
tree2ecd162e20d1681118584f998c4cda193addb0e4 /source4
parentc5034ac3155958c0d3e2a1cfbfc669bc2e869f29 (diff)
downloadsamba-2bb637d1cfa5147000d9c2cbbbafcbbb20df26da.tar.gz
samba-2bb637d1cfa5147000d9c2cbbbafcbbb20df26da.tar.bz2
samba-2bb637d1cfa5147000d9c2cbbbafcbbb20df26da.zip
s4:ntvfs/smb2: use sync version of smb2_connect()
We don't use it in an async fashion anyway. metze
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/smb2/vfs_smb2.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c
index 6c78997686..24f0c33b1d 100644
--- a/source4/ntvfs/smb2/vfs_smb2.c
+++ b/source4/ntvfs/smb2/vfs_smb2.c
@@ -250,17 +250,15 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
lpcfg_smbcli_options(ntvfs->ctx->lp_ctx, &options);
- creq = smb2_connect_send(p, host,
+ status = smb2_connect(p, host,
lpcfg_parm_string_list(p, ntvfs->ctx->lp_ctx, NULL, "smb2", "ports", NULL),
- remote_share,
- lpcfg_resolve_context(ntvfs->ctx->lp_ctx),
- credentials,
- ntvfs->ctx->event_ctx, &options,
- lpcfg_socket_options(ntvfs->ctx->lp_ctx),
- lpcfg_gensec_settings(p, ntvfs->ctx->lp_ctx)
- );
-
- status = smb2_connect_recv(creq, p, &tree);
+ remote_share,
+ lpcfg_resolve_context(ntvfs->ctx->lp_ctx),
+ credentials,
+ &tree,
+ ntvfs->ctx->event_ctx, &options,
+ lpcfg_socket_options(ntvfs->ctx->lp_ctx),
+ lpcfg_gensec_settings(p, ntvfs->ctx->lp_ctx));
NT_STATUS_NOT_OK_RETURN(status);
status = smb2_get_roothandle(tree, &p->roothandle);