s3:smbd: don't call claim/yield_connection() in make_connection_snum/close_cnum()

This was used to maintain the connections.tdb database which is being removed.
We use info from the smbXsrv_tcon instead.

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index bad67526b4ff4ff728d91852ce126cf906a0060f..7113eaeb7256ff89aeecb6ec540183bf4e072138 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1403,9 +1403,6 @@ extern void build_options(bool screen);
                exit(1);
        }
 
-       if (!connections_init(true)) {
-               exit(1);
-       }
        status = smbXsrv_tcon_global_init();
        if (!NT_STATUS_IS_OK(status)) {
                exit(1);

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 016b93f100a12b3cf320cdec020d3f0059d0d63b..bb28fbfcc8ecd660e87fc64648e18fd46ec12a2d 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -559,7 +559,6 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
        fstring dev;
        int ret;
        bool on_err_call_dis_hook = false;
-       bool claimed_connection = false;
        uid_t effuid;
        gid_t effgid;
        NTSTATUS status;
@@ -699,16 +698,6 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
                goto err_root_exit;
        }
 
-       /*
-        * Get us an entry in the connections db
-        */
-       if (!claim_connection(conn, lp_servicename(talloc_tos(), snum))) {
-               DEBUG(1, ("Could not store connections entry\n"));
-               status = NT_STATUS_INTERNAL_DB_ERROR;
-               goto err_root_exit;
-       }
-       claimed_connection = true;
-
        /* Invoke VFS make connection hook - this must be the first
           filesystem operation that we do. */
 
@@ -925,9 +914,6 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
                /* Call VFS disconnect hook */
                SMB_VFS_DISCONNECT(conn);
        }
-       if (claimed_connection) {
-               yield_connection(conn, lp_servicename(talloc_tos(), snum));
-       }
        return status;
 }
 
@@ -1180,8 +1166,6 @@ void close_cnum(connection_struct *conn, uint64_t vuid)
        /* Call VFS disconnect hook */    
        SMB_VFS_DISCONNECT(conn);
 
-       yield_connection(conn, lp_servicename(talloc_tos(), SNUM(conn)));
-
        /* make sure we leave the directory available for unmount */
        vfs_ChDir(conn, "/");