Changeset 745 for trunk/server/source3/utils/status.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/status.c (modified) (7 diffs)

trunk/server/source3/utils/status.c

@@ -32 +32 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
+#include "dbwrap.h"
+#include "../libcli/security/security.h"
+#include "session.h"
+#include "locking/proto.h"
+#include "messages.h"
 
 #define SMB_MAXPIDS             2048
@@ -233 +240 @@
 }
 
-static int traverse_fn1(struct db_record *rec,
-                        const struct connections_key *key,
+static int traverse_fn1(const struct connections_key *key,
                         const struct connections_data *crec,
                         void *state)
@@ -253 +259 @@
 }
 
-static int traverse_sessionid(struct db_record *db, void *state)
-{
-        struct sessionid sessionid;
+static int traverse_sessionid(const char *key, struct sessionid *session,
+                              void *private_data)
+{
         fstring uid_str, gid_str;
 
-        if (db->value.dsize != sizeof(sessionid))
+        if (!process_exists(session->pid)
+            || !Ucrit_checkUid(session->uid)) {
                 return 0;
-
-        memcpy(&sessionid, db->value.dptr, sizeof(sessionid));
-
-        if (!process_exists(sessionid.pid) || !Ucrit_checkUid(sessionid.uid)) {
-                return 0;
-        }
-
-        Ucrit_addPid( sessionid.pid );
-
-        fstr_sprintf(uid_str, "%u", (unsigned int)sessionid.uid);
-        fstr_sprintf(gid_str, "%u", (unsigned int)sessionid.gid);
+        }
+
+        Ucrit_addPid(session->pid);
+
+        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;
@@ -312 +314 @@
         load_case_tables();
 
-        setup_logging(argv[0],True);
-
-        dbf = x_stderr;
+        setup_logging(argv[0], DEBUG_STDERR);
 
         if (getuid() != geteuid()) {
@@ -413 +413 @@
 
         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) {
@@ -448 +440 @@
                 d_printf("-------------------------------------------------------\n");
 
-                connections_forall(traverse_fn1, NULL);
+                connections_forall_read(traverse_fn1, NULL);
 
                 d_printf("\n");
@@ -461 +453 @@
                 struct db_context *db;
                 db = db_open(NULL, lock_path("locking.tdb"), 0,
-                             TDB_CLEAR_IF_FIRST, O_RDONLY, 0);
+                             TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDONLY, 0);
 
                 if (!db) {