libsmb/clisigning.o libsmb/smb_signing.o \
lib/iconv.o lib/pam_errors.o intl/lang_tdb.o \
lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
+ lib/sessionid_tdb.o \
lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \
lib/ldap_escape.o @CHARSET_STATIC@ \
lib/secdesc.o lib/util_seaccess.o ../libcli/security/secace.o \
void session_yield(user_struct *vuser);
int list_sessions(TALLOC_CTX *mem_ctx, struct sessionid **session_list);
+/* The following definitions come from lib/sessionid_tdb.c */
+
+bool sessionid_init(void);
+struct db_record *sessionid_fetch_record(TALLOC_CTX *mem_ctx, const char *key);
+int sessionid_traverse(int (*fn)(struct db_record *rec, const char *key,
+ struct sessionid *session,
+ void *private_data),
+ void *private_data);
+int sessionid_traverse_read(int (*fn)(const char *key,
+ struct sessionid *session,
+ void *private_data),
+ void *private_data);
+
/* The following definitions come from smbd/sesssetup.c */
NTSTATUS parse_spnego_mechanisms(DATA_BLOB blob_in,
--- /dev/null
+/*
+ Unix SMB/CIFS implementation.
+ Low-level sessionid.tdb access functions
+ Copyright (C) Volker Lendecke 2010
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+
+static struct db_context *session_db_ctx(void)
+{
+ static struct db_context *session_db_ctx_ptr;
+
+ if (session_db_ctx_ptr != NULL) {
+ return session_db_ctx_ptr;
+ }
+
+ session_db_ctx_ptr = db_open(NULL, lock_path("sessionid.tdb"), 0,
+ TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
+ O_RDWR | O_CREAT, 0644);
+ return session_db_ctx_ptr;
+}
+
+bool sessionid_init(void)
+{
+ if (session_db_ctx() == NULL) {
+ DEBUG(1,("session_init: failed to open sessionid tdb\n"));
+ return False;
+ }
+
+ return True;
+}
+
+struct db_record *sessionid_fetch_record(TALLOC_CTX *mem_ctx, const char *key)
+{
+ struct db_context *db;
+
+ db = session_db_ctx();
+ if (db == NULL) {
+ return NULL;
+ }
+ return db->fetch_locked(db, mem_ctx, string_term_tdb_data(key));
+}
+
+struct sessionid_traverse_state {
+ int (*fn)(struct db_record *rec, const char *key,
+ struct sessionid *session, void *private_data);
+ void *private_data;
+};
+
+static int sessionid_traverse_fn(struct db_record *rec, void *private_data)
+{
+ struct sessionid_traverse_state *state =
+ (struct sessionid_traverse_state *)private_data;
+ struct sessionid session;
+
+ if ((rec->key.dptr[rec->key.dsize-1] != '\0')
+ || (rec->value.dsize != sizeof(struct sessionid))) {
+ DEBUG(1, ("Found invalid record in sessionid.tdb\n"));
+ return 0;
+ }
+
+ memcpy(&session, rec->value.dptr, sizeof(session));
+
+ return state->fn(rec, (char *)rec->key.dptr, &session,
+ state->private_data);
+}
+
+int sessionid_traverse(int (*fn)(struct db_record *rec, const char *key,
+ struct sessionid *session,
+ void *private_data),
+ void *private_data)
+{
+ struct db_context *db;
+ struct sessionid_traverse_state state;
+
+ db = session_db_ctx();
+ if (db == NULL) {
+ return -1;
+ }
+ state.fn = fn;
+ state.private_data = private_data;
+ return db->traverse(db, sessionid_traverse_fn, &state);
+}
+
+struct sessionid_traverse_read_state {
+ int (*fn)(const char *key, struct sessionid *session,
+ void *private_data);
+ void *private_data;
+};
+
+static int sessionid_traverse_read_fn(struct db_record *rec,
+ void *private_data)
+{
+ struct sessionid_traverse_read_state *state =
+ (struct sessionid_traverse_read_state *)private_data;
+ struct sessionid session;
+
+ if ((rec->key.dptr[rec->key.dsize-1] != '\0')
+ || (rec->value.dsize != sizeof(struct sessionid))) {
+ DEBUG(1, ("Found invalid record in sessionid.tdb\n"));
+ return 0;
+ }
+
+ memcpy(&session, rec->value.dptr, sizeof(session));
+
+ return state->fn((char *)rec->key.dptr, &session,
+ state->private_data);
+}
+
+int sessionid_traverse_read(int (*fn)(const char *key,
+ struct sessionid *session,
+ void *private_data),
+ void *private_data)
+{
+ struct db_context *db;
+ struct sessionid_traverse_read_state state;
+
+ db = session_db_ctx();
+ if (db == NULL) {
+ return -1;
+ }
+ state.fn = fn;
+ state.private_data = private_data;
+ return db->traverse(db, sessionid_traverse_read_fn, &state);
+}
connection_struct *last_conn = NULL;
uint16_t last_flags = 0;
-struct db_context *session_db_ctx_ptr = NULL;
-
uint32_t global_client_caps = 0;
uint16_t fnf_handle = 257;
extern connection_struct *last_conn;
extern uint16_t last_flags;
-extern struct db_context *session_db_ctx_ptr;
-
extern uint32_t global_client_caps;
extern uint16_t fnf_handle;
exit(1);
}
- if (!session_init())
+ if (!sessionid_init()) {
exit(1);
+ }
if (!connections_init(True))
exit(1);
#include "includes.h"
#include "smbd/globals.h"
-/********************************************************************
-********************************************************************/
-
-static struct db_context *session_db_ctx(void)
-{
- if (session_db_ctx_ptr)
- return session_db_ctx_ptr;
-
- session_db_ctx_ptr = db_open(NULL, lock_path("sessionid.tdb"), 0,
- TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
- O_RDWR | O_CREAT, 0644);
- return session_db_ctx_ptr;
-}
-
-bool session_init(void)
-{
- if (session_db_ctx() == NULL) {
- DEBUG(1,("session_init: failed to open sessionid tdb\n"));
- return False;
- }
-
- return True;
-}
-
/********************************************************************
called when a session is created
********************************************************************/
bool session_claim(user_struct *vuser)
{
- TDB_DATA key, data;
+ TDB_DATA data;
int i = 0;
struct sessionid sessionid;
struct server_id pid = procid_self();
fstring keystr;
const char * hostname;
- struct db_context *ctx;
struct db_record *rec;
NTSTATUS status;
char addr[INET6_ADDRSTRLEN];
return True;
}
- if (!(ctx = session_db_ctx())) {
+ if (!sessionid_init()) {
return False;
}
struct server_id sess_pid;
snprintf(keystr, sizeof(keystr), "ID/%d", i);
- key = string_term_tdb_data(keystr);
-
- rec = ctx->fetch_locked(ctx, NULL, key);
+ rec = sessionid_fetch_record(NULL, keystr);
if (rec == NULL) {
DEBUG(1, ("Could not lock \"%s\"\n", keystr));
return False;
{
snprintf(keystr, sizeof(keystr), "ID/%s/%u",
procid_str_static(&pid), vuser->vuid);
- key = string_term_tdb_data(keystr);
-
- rec = ctx->fetch_locked(ctx, NULL, key);
+ rec = sessionid_fetch_record(NULL, keystr);
if (rec == NULL) {
DEBUG(1, ("Could not lock \"%s\"\n", keystr));
return False;
void session_yield(user_struct *vuser)
{
- TDB_DATA key;
struct sessionid sessionid;
- struct db_context *ctx;
struct db_record *rec;
- if (!(ctx = session_db_ctx())) return;
-
if (!vuser->session_keystr) {
return;
}
- key = string_term_tdb_data(vuser->session_keystr);
-
- if (!(rec = ctx->fetch_locked(ctx, NULL, key))) {
+ rec = sessionid_fetch_record(NULL, vuser->session_keystr);
+ if (rec == NULL) {
return;
}
/********************************************************************
********************************************************************/
-static bool session_traverse(int (*fn)(struct db_record *db,
- void *private_data),
- void *private_data)
-{
- struct db_context *ctx;
-
- if (!(ctx = session_db_ctx())) {
- DEBUG(3, ("No tdb opened\n"));
- return False;
- }
-
- ctx->traverse_read(ctx, fn, private_data);
- return True;
-}
-
-/********************************************************************
-********************************************************************/
-
struct session_list {
TALLOC_CTX *mem_ctx;
int count;
struct sessionid *sessions;
};
-static int gather_sessioninfo(struct db_record *rec, void *state)
+static int gather_sessioninfo(const char *key, struct sessionid *session,
+ void *private_data)
{
- struct session_list *sesslist = (struct session_list *) state;
- const struct sessionid *current =
- (const struct sessionid *) rec->value.dptr;
+ struct session_list *sesslist = (struct session_list *)private_data;
sesslist->sessions = TALLOC_REALLOC_ARRAY(
sesslist->mem_ctx, sesslist->sessions, struct sessionid,
return -1;
}
- memcpy(&sesslist->sessions[sesslist->count], current,
+ memcpy(&sesslist->sessions[sesslist->count], session,
sizeof(struct sessionid));
sesslist->count++;
- DEBUG(7,("gather_sessioninfo session from %s@%s\n",
- current->username, current->remote_machine));
+ DEBUG(7, ("gather_sessioninfo session from %s@%s\n",
+ session->username, session->remote_machine));
return 0;
}
int list_sessions(TALLOC_CTX *mem_ctx, struct sessionid **session_list)
{
struct session_list sesslist;
+ int ret;
sesslist.mem_ctx = mem_ctx;
sesslist.count = 0;
sesslist.sessions = NULL;
-
- if (!session_traverse(gather_sessioninfo, (void *) &sesslist)) {
+
+ ret = sessionid_traverse_read(gather_sessioninfo, (void *) &sesslist);
+ if (ret == -1) {
DEBUG(3, ("Session traverse failed\n"));
SAFE_FREE(sesslist.sessions);
*session_list = NULL;
return -1;
}
-static int show_session(struct db_record *rec, void *private_data)
+static int show_session(const char *key, struct sessionid *session,
+ void *private_data)
{
bool *parseable = (bool *)private_data;
- struct sessionid sessionid;
- if (rec->value.dsize != sizeof(sessionid))
- return 0;
-
- memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
-
- if (!process_exists(sessionid.pid)) {
+ if (!process_exists(session->pid)) {
return 0;
}
if (*parseable) {
d_printf("%s\\%s\\%s\\%s\\%s\n",
- procid_str_static(&sessionid.pid), uidtoname(sessionid.uid),
- gidtoname(sessionid.gid),
- sessionid.remote_machine, sessionid.hostname);
+ procid_str_static(&session->pid),
+ uidtoname(session->uid),
+ gidtoname(session->gid),
+ session->remote_machine, session->hostname);
} else {
d_printf("%7s %-12s %-12s %-12s (%s)\n",
- procid_str_static(&sessionid.pid), uidtoname(sessionid.uid),
- gidtoname(sessionid.gid),
- sessionid.remote_machine, sessionid.hostname);
+ procid_str_static(&session->pid),
+ uidtoname(session->uid),
+ gidtoname(session->gid),
+ session->remote_machine, session->hostname);
}
return 0;
static int net_status_sessions(struct net_context *c, int argc, const char **argv)
{
- struct db_context *db;
bool parseable;
if (c->display_usage) {
"------------------------\n"));
}
- db = db_open(NULL, lock_path("sessionid.tdb"), 0,
- TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
- if (db == NULL) {
- d_fprintf(stderr, _("%s not initialised\n"),
- lock_path("sessionid.tdb"));
- return -1;
- }
-
- db->traverse_read(db, show_session, &parseable);
- TALLOC_FREE(db);
-
+ sessionid_traverse_read(show_session, &parseable);
return 0;
}
struct sessionid *entries;
};
-static int collect_pid(struct db_record *rec, void *private_data)
+static int collect_pids(const char *key, struct sessionid *session,
+ void *private_data)
{
struct sessionids *ids = (struct sessionids *)private_data;
- struct sessionid sessionid;
- if (rec->value.dsize != sizeof(sessionid))
- return 0;
-
- memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
-
- if (!process_exists(sessionid.pid))
+ if (!process_exists(session->pid))
return 0;
ids->num_entries += 1;
ids->num_entries = 0;
return 0;
}
- ids->entries[ids->num_entries-1] = sessionid;
+ ids->entries[ids->num_entries-1] = *session;
return 0;
}
static int net_status_shares_parseable(struct net_context *c, int argc, const char **argv)
{
struct sessionids ids;
- struct db_context *db;
ids.num_entries = 0;
ids.entries = NULL;
- db = db_open(NULL, lock_path("sessionid.tdb"), 0,
- TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
- if (db == NULL) {
- d_fprintf(stderr, _("%s not initialised\n"),
- lock_path("sessionid.tdb"));
- return -1;
- }
-
- db->traverse_read(db, collect_pid, &ids);
- TALLOC_FREE(db);
+ sessionid_traverse_read(collect_pids, &ids);
connections_forall_read(show_share_parseable, &ids);
return 0;
}
-static int traverse_sessionid(struct db_record *db, void *state)
+static int traverse_sessionid(const char *key, struct sessionid *session,
+ void *private_data)
{
- struct sessionid sessionid;
fstring uid_str, gid_str;
- if (db->value.dsize != sizeof(sessionid))
- return 0;
-
- memcpy(&sessionid, db->value.dptr, sizeof(sessionid));
-
- if (!process_exists(sessionid.pid) || !Ucrit_checkUid(sessionid.uid)) {
+ if (!process_exists(session->pid)
+ || !Ucrit_checkUid(session->uid)) {
return 0;
}
- Ucrit_addPid( sessionid.pid );
+ Ucrit_addPid(session->pid);
- fstr_sprintf(uid_str, "%u", (unsigned int)sessionid.uid);
- fstr_sprintf(gid_str, "%u", (unsigned int)sessionid.gid);
+ fstr_sprintf(uid_str, "%u", (unsigned int)session->uid);
+ fstr_sprintf(gid_str, "%u", (unsigned int)session->gid);
d_printf("%-7s %-12s %-12s %-12s (%s)\n",
- procid_str_static(&sessionid.pid),
- numeric_only ? uid_str : uidtoname(sessionid.uid),
- numeric_only ? gid_str : gidtoname(sessionid.gid),
- sessionid.remote_machine, sessionid.hostname);
+ procid_str_static(&session->pid),
+ numeric_only ? uid_str : uidtoname(session->uid),
+ numeric_only ? gid_str : gidtoname(session->gid),
+ session->remote_machine, session->hostname);
return 0;
}
}
if ( show_processes ) {
- struct db_context *db;
- db = db_open(NULL, lock_path("sessionid.tdb"), 0,
- TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
- if (!db) {
- d_printf("sessionid.tdb not initialised\n");
- } else {
- d_printf("\nSamba version %s\n",samba_version_string());
- d_printf("PID Username Group Machine \n");
- d_printf("-------------------------------------------------------------------\n");
- if (lp_security() == SEC_SHARE) {
- d_printf(" <processes do not show up in "
- "anonymous mode>\n");
- }
-
- db->traverse_read(db, traverse_sessionid, NULL);
- TALLOC_FREE(db);
+ d_printf("\nSamba version %s\n",samba_version_string());
+ d_printf("PID Username Group Machine \n");
+ d_printf("-------------------------------------------------------------------\n");
+ if (lp_security() == SEC_SHARE) {
+ d_printf(" <processes do not show up in "
+ "anonymous mode>\n");
}
+ sessionid_traverse_read(traverse_sessionid, NULL);
+
if (processes_only) {
goto done;
}
git.samba.org / ira / wip.git / commitdiff