summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-10-05 19:11:31 +0200
committerMichael Adam <obnox@samba.org>2012-10-19 12:15:03 +0200
commit3eff70087005ffdee2ca579e65846ba1c33ec17f (patch)
tree7ce7f366bc64c3fcd602e8c0ae3c869cf0de2f13 /source3
parent0ccbf89bda71cdbe8d216bab0aa6aacd98cf95df (diff)
downloadsamba-3eff70087005ffdee2ca579e65846ba1c33ec17f.tar.gz
samba-3eff70087005ffdee2ca579e65846ba1c33ec17f.tar.bz2
samba-3eff70087005ffdee2ca579e65846ba1c33ec17f.zip
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>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/server.c3
-rw-r--r--source3/smbd/service.c16
2 files changed, 0 insertions, 19 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index bad67526b4..7113eaeb72 100644
--- 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 016b93f100..bb28fbfcc8 100644
--- 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, "/");