From 592fce7fb149ca5e82b14d9c8f13a4da1babe2b7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 13 Jan 2005 18:49:10 +0000 Subject: r4726: - use the name tcon and tid instead of conn and cnum - make use of talloc destructors metze (This used to be commit 8308da6ce4a95f8c10e22949ef00e9e64f2dbb85) --- source4/smb_server/service.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'source4/smb_server/service.c') diff --git a/source4/smb_server/service.c b/source4/smb_server/service.c index 12a983e41b..1aa41d17a8 100644 --- a/source4/smb_server/service.c +++ b/source4/smb_server/service.c @@ -152,7 +152,7 @@ static NTSTATUS make_connection_snum(struct smbsrv_request *req, return NT_STATUS_ACCESS_DENIED; } - tcon = conn_new(req->smb_conn); + tcon = smbsrv_tcon_new(req->smb_conn); if (!tcon) { DEBUG(0,("Couldn't find free connection.\n")); return NT_STATUS_INSUFFICIENT_RESOURCES; @@ -165,18 +165,16 @@ static NTSTATUS make_connection_snum(struct smbsrv_request *req, status = ntvfs_init_connection(req, type); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("ntvfs_init_connection failed for service %s\n", lp_servicename(SNUM(tcon)))); - conn_free(req->smb_conn, tcon); return status; } - + /* Invoke NTVFS connection hook */ status = ntvfs_connect(req, lp_servicename(snum)); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("make_connection: NTVFS make connection failed!\n")); - conn_free(req->smb_conn, tcon); return status; } - + return NT_STATUS_OK; } @@ -229,23 +227,6 @@ static NTSTATUS make_connection(struct smbsrv_request *req, return make_connection_snum(req, snum, type, password, dev); } -/**************************************************************************** -close a cnum -****************************************************************************/ -void close_cnum(struct smbsrv_tcon *tcon) -{ - DEBUG(3,("%s closed connection to service %s\n", - socket_get_peer_addr(tcon->smb_conn->connection->socket, tcon), - lp_servicename(SNUM(tcon)))); - - /* tell the ntvfs backend that we are disconnecting */ - ntvfs_disconnect(tcon); - - conn_free(tcon->smb_conn, tcon); -} - - - /* backend for tree connect call */ @@ -274,8 +255,8 @@ NTSTATUS tcon_backend(struct smbsrv_request *req, union smb_tcon *con) } con->tcon.out.max_xmit = req->smb_conn->negotiate.max_recv; - con->tcon.out.cnum = req->tcon->cnum; - + con->tcon.out.tid = req->tcon->tid; + return status; } @@ -285,7 +266,7 @@ NTSTATUS tcon_backend(struct smbsrv_request *req, union smb_tcon *con) return status; } - con->tconx.out.cnum = req->tcon->cnum; + con->tconx.out.tid = req->tcon->tid; con->tconx.out.dev_type = talloc_strdup(req, req->tcon->dev_type); con->tconx.out.fs_type = talloc_strdup(req, req->tcon->fs_type); con->tconx.out.options = SMB_SUPPORT_SEARCH_BITS | (lp_csc_policy(req->tcon->service) << 2); -- cgit