Changeset 232 for branches/samba-3.2.x/source/utils/net_status.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/utils/net_status.c (modified) (5 diffs)

branches/samba-3.2.x/source/utils/net_status.c

@@ -20 +20 @@
 #include "utils/net.h"
 
-static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
-                        void *state)
-{
-        bool *parseable = (bool *)state;
+static int show_session(struct db_record *rec, void *private_data)
+{
+        bool *parseable = (bool *)private_data;
         struct sessionid sessionid;
 
-        if (dbuf.dsize != sizeof(sessionid))
-                return 0;
-
-        memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
+        if (rec->value.dsize != sizeof(sessionid))
+                return 0;
+
+        memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
 
         if (!process_exists(sessionid.pid)) {
@@ -52 +51 @@
 static int net_status_sessions(int argc, const char **argv)
 {
-        TDB_CONTEXT *tdb;
+        struct db_context *db;
         bool parseable;
 
@@ -70 +69 @@
         }
 
-        tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
-                           TDB_DEFAULT, O_RDONLY, 0);
-
-        if (tdb == 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;
         }
 
-        tdb_traverse(tdb, show_session, &parseable);
-        tdb_close(tdb);
+        db->traverse_read(db, show_session, &parseable);
+        TALLOC_FREE(db);
 
         return 0;
@@ -109 +107 @@
 };
 
-static int collect_pid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
-                       void *state)
-{
-        struct sessionids *ids = (struct sessionids *)state;
+static int collect_pid(struct db_record *rec, void *private_data)
+{
+        struct sessionids *ids = (struct sessionids *)private_data;
         struct sessionid sessionid;
 
-        if (dbuf.dsize != sizeof(sessionid))
-                return 0;
-
-        memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
+        if (rec->value.dsize != sizeof(sessionid))
+                return 0;
+
+        memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
 
         if (!process_exists(sessionid.pid)) 
@@ -172 +169 @@
 {
         struct sessionids ids;
-        TDB_CONTEXT *tdb;
+        struct db_context *db;
 
         ids.num_entries = 0;
         ids.entries = NULL;
 
-        tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
-                           TDB_DEFAULT, O_RDONLY, 0);
-
-        if (tdb == 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;
         }
 
-        tdb_traverse(tdb, collect_pid, &ids);
-        tdb_close(tdb);
+        db->traverse_read(db, collect_pid, &ids);
+        TALLOC_FREE(db);
 
         connections_forall(show_share_parseable, &ids);