Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

1 files changed, 1 insertions, 20 deletions

diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index 52471c09c9..85d169fc13 100644
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -27,6 +27,7 @@
 /****************************************************************************
   Make a connection, given the snum to connect to, and the vuser of the
   connecting user if appropriate.
+  Does note invoke the NTVFS connection hook
 ****************************************************************************/
 static NTSTATUS make_connection_scfg(struct smbsrv_request *req,
 				     struct share_config *scfg,
@@ -88,23 +89,6 @@ static NTSTATUS make_connection_scfg(struct smbsrv_request *req,
 		goto failed;
 	}
 
-	req->ntvfs = ntvfs_request_create(req->tcon->ntvfs, req,
-					  req->session->session_info,
-					  SVAL(req->in.hdr,HDR_PID),
-					  req->request_time,
-					  req, NULL, 0);
-	if (!req->ntvfs) {
-		status = NT_STATUS_NO_MEMORY;
-		goto failed;
-	}
-
-	/* Invoke NTVFS connection hook */
-	status = ntvfs_connect(req->ntvfs, scfg->name);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("make_connection: NTVFS make connection failed!\n"));
-		goto failed;
-	}
-
 	return NT_STATUS_OK;
 
 failed:
@@ -204,9 +188,6 @@ NTSTATUS smbsrv_tcon_backend(struct smbsrv_request *req, union smb_tcon *con)
 		return status;
 	}
 
-	con->tconx.out.tid = req->tcon->tid;
-	con->tconx.out.dev_type = talloc_strdup(req, req->tcon->ntvfs->dev_type);
-	con->tconx.out.fs_type = talloc_strdup(req, req->tcon->ntvfs->fs_type);
 	con->tconx.out.options = SMB_SUPPORT_SEARCH_BITS | (share_int_option(req->tcon->ntvfs->config, SHARE_CSC_POLICY, SHARE_CSC_POLICY_DEFAULT) << 2);
 	if (share_bool_option(req->tcon->ntvfs->config, SHARE_MSDFS_ROOT, SHARE_MSDFS_ROOT_DEFAULT) && lp_host_msdfs(req->smb_conn->lp_ctx)) {
 		con->tconx.out.options |= SMB_SHARE_IN_DFS;