summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-10-05 19:13:39 +0200
committerMichael Adam <obnox@samba.org>2012-10-19 12:15:03 +0200
commitd4f369c470ec1c8c7986a73e4ee6e18a97edd834 (patch)
tree58e361f6238c5fa469a179670cabdc16906b2750 /source3
parent3eff70087005ffdee2ca579e65846ba1c33ec17f (diff)
downloadsamba-d4f369c470ec1c8c7986a73e4ee6e18a97edd834.tar.gz
samba-d4f369c470ec1c8c7986a73e4ee6e18a97edd834.tar.bz2
samba-d4f369c470ec1c8c7986a73e4ee6e18a97edd834.zip
s3:smbd: remove unused claim_connection/yield_connection
metze Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/connection.c86
-rw-r--r--source3/smbd/proto.h2
2 files changed, 0 insertions, 88 deletions
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 2dc004b3e5..0b78b9e2db 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -26,34 +26,6 @@
#include "messages.h"
#include "lib/conn_tdb.h"
-/****************************************************************************
- Delete a connection record.
-****************************************************************************/
-
-bool yield_connection(connection_struct *conn, const char *name)
-{
- struct db_record *rec;
- NTSTATUS status;
-
- DEBUG(3,("Yielding connection to %s\n",name));
-
- rec = connections_fetch_entry(talloc_tos(), conn, name);
- if (rec == NULL) {
- DEBUG(0, ("connections_fetch_entry failed\n"));
- return False;
- }
-
- status = dbwrap_record_delete(rec);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG( NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND) ? 3 : 0,
- ("deleting connection record returned %s\n",
- nt_errstr(status)));
- }
-
- TALLOC_FREE(rec);
- return NT_STATUS_IS_OK(status);
-}
-
struct count_stat {
int curr_connections;
const char *name;
@@ -122,61 +94,3 @@ bool connections_snum_used(struct smbd_server_connection *unused, int snum)
return false;
}
-
-/****************************************************************************
- Claim an entry in the connections database.
-****************************************************************************/
-
-bool claim_connection(connection_struct *conn, const char *name)
-{
- struct db_record *rec;
- struct connections_data crec;
- char *raddr;
- TDB_DATA dbuf;
- NTSTATUS status;
-
- DEBUG(5,("claiming [%s]\n", name));
-
- if (!(rec = connections_fetch_entry(talloc_tos(), conn, name))) {
- DEBUG(0, ("connections_fetch_entry failed\n"));
- return False;
- }
-
- /* Make clear that we require the optional unix_token in the source3 code */
- SMB_ASSERT(conn->session_info->unix_token);
-
- /* fill in the crec */
- ZERO_STRUCT(crec);
- crec.magic = 0x280267;
- crec.pid = messaging_server_id(conn->sconn->msg_ctx);
- crec.cnum = conn->cnum;
- crec.uid = conn->session_info->unix_token->uid;
- crec.gid = conn->session_info->unix_token->gid;
- strlcpy(crec.servicename, lp_servicename(rec, SNUM(conn)),
- sizeof(crec.servicename));
- crec.start = time(NULL);
-
- raddr = tsocket_address_inet_addr_string(conn->sconn->remote_address,
- rec);
- if (raddr == NULL) {
- return false;
- }
-
- strlcpy(crec.machine,get_remote_machine_name(),sizeof(crec.machine));
- strlcpy(crec.addr, raddr, sizeof(crec.addr));
-
- dbuf.dptr = (uint8 *)&crec;
- dbuf.dsize = sizeof(crec);
-
- status = dbwrap_record_store(rec, dbuf, TDB_REPLACE);
-
- TALLOC_FREE(rec);
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("claim_connection: tdb_store failed with error %s.\n",
- nt_errstr(status)));
- return False;
- }
-
- return True;
-}
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index ffbc8d808e..d218184024 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -160,10 +160,8 @@ void msg_force_tdis(struct messaging_context *msg,
/* The following definitions come from smbd/connection.c */
-bool yield_connection(connection_struct *conn, const char *name);
int count_current_connections(const char *sharename, bool verify);
bool connections_snum_used(struct smbd_server_connection *unused, int snum);
-bool claim_connection(connection_struct *conn, const char *name);
/* The following definitions come from smbd/dfree.c */