sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

s3:net_status: use dbwrap to open sessionid.tdb

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2008-12-15 16:47:38 +01:00
parent 2f17be1f57
commit 8891b2b021
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source3/utils/net_status.c
View File

@ -28,16 +28,15 @@ int net_status_usage(struct net_context *c, int argc, const char **argv)
return -1; return -1;
} }
static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, static int show_session(struct db_record *rec, void *private_data)
void *state)
{ {
bool *parseable = (bool *)state; bool *parseable = (bool *)private_data;
struct sessionid sessionid; struct sessionid sessionid;
if (dbuf.dsize != sizeof(sessionid)) if (rec->value.dsize != sizeof(sessionid))
return 0; return 0;
memcpy(&sessionid, dbuf.dptr, sizeof(sessionid)); memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
if (!process_exists(sessionid.pid)) { if (!process_exists(sessionid.pid)) {
return 0; return 0;
@ -60,7 +59,7 @@ static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
static int net_status_sessions(struct net_context *c, int argc, const char **argv) static int net_status_sessions(struct net_context *c, int argc, const char **argv)
{ {
TDB_CONTEXT *tdb; struct db_context *db;
bool parseable; bool parseable;
if (c->display_usage) { if (c->display_usage) {
@ -87,16 +86,15 @@ static int net_status_sessions(struct net_context *c, int argc, const char **arg
"------------------------\n"); "------------------------\n");
} }
tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, db = db_open(NULL, lock_path("sessionid.tdb"), 0,
TDB_DEFAULT, O_RDONLY, 0); TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
if (db == NULL) {
if (tdb == NULL) {
d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb")); d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
return -1; return -1;
} }
tdb_traverse(tdb, show_session, &parseable); db->traverse_read(db, show_session, &parseable);
tdb_close(tdb); TALLOC_FREE(db);
return 0; return 0;
} }
@ -126,16 +124,15 @@ struct sessionids {
struct sessionid *entries; struct sessionid *entries;
}; };
static int collect_pid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, static int collect_pid(struct db_record *rec, void *private_data)
void *state)
{ {
struct sessionids *ids = (struct sessionids *)state; struct sessionids *ids = (struct sessionids *)private_data;
struct sessionid sessionid; struct sessionid sessionid;
if (dbuf.dsize != sizeof(sessionid)) if (rec->value.dsize != sizeof(sessionid))
return 0; return 0;
memcpy(&sessionid, dbuf.dptr, sizeof(sessionid)); memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
if (!process_exists(sessionid.pid)) if (!process_exists(sessionid.pid))
return 0; return 0;
@ -189,21 +186,20 @@ static int show_share_parseable(struct db_record *rec,
static int net_status_shares_parseable(struct net_context *c, int argc, const char **argv) static int net_status_shares_parseable(struct net_context *c, int argc, const char **argv)
{ {
struct sessionids ids; struct sessionids ids;
TDB_CONTEXT *tdb; struct db_context *db;
ids.num_entries = 0; ids.num_entries = 0;
ids.entries = NULL; ids.entries = NULL;
tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, db = db_open(NULL, lock_path("sessionid.tdb"), 0,
TDB_DEFAULT, O_RDONLY, 0); TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
if (db == NULL) {
if (tdb == NULL) {
d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb")); d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
return -1; return -1;
} }
tdb_traverse(tdb, collect_pid, &ids); db->traverse_read(db, collect_pid, &ids);
tdb_close(tdb); TALLOC_FREE(db);
connections_forall(show_share_parseable, &ids); connections_forall(show_share_parseable, &ids);