s4:ntvfs/smb2: use sync version of smb2_connect()
authorStefan Metzmacher <metze@samba.org>
Wed, 27 Apr 2011 07:05:50 +0000 (09:05 +0200)
committerStefan Metzmacher <metze@samba.org>
Thu, 28 Apr 2011 18:35:47 +0000 (20:35 +0200)
We don't use it in an async fashion anyway.

metze

source4/ntvfs/smb2/vfs_smb2.c

index 6c789976869d61cc1abb0fe8abcaec6d5e529a6a..24f0c33b1d9e73e784dc2e9f5ed06a8e37fdf5da 100644 (file)
@@ -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);