s3-serverid: call serverid_init_readonly() from commandline tools.

[samba.git] / source3 / utils / status.c

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 6d616149d708529f80d7662810ab4cfe509ffd2b..b89a77920f4eb3e3aae43a649b1a3a87424b7280 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -31,6 +31,14 @@
  */
 
 #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"
+#include "serverid.h"
 
 #define SMB_MAXPIDS            2048
 static uid_t           Ucrit_uid = 0;               /* added by OH */
@@ -232,8 +240,7 @@ static void print_brl(struct file_id id,
        TALLOC_FREE(share_mode);
 }
 
-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)
 {
@@ -252,30 +259,26 @@ static int traverse_fn1(struct db_record *rec,
        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;
 }
@@ -311,9 +314,7 @@ static int traverse_sessionid(struct db_record *db, void *state)
        sec_init();
        load_case_tables();
 
-       setup_logging(argv[0],True);
-
-       dbf = x_stderr;
+       setup_logging(argv[0], DEBUG_STDERR);
 
        if (getuid() != geteuid()) {
                d_printf("smbstatus should not be run setuid\n");
@@ -378,6 +379,12 @@ static int traverse_sessionid(struct db_record *db, void *state)
        }
 
 
+       if (!sessionid_init_readonly()) {
+               fprintf(stderr, "Can't open sessionid.tdb\n");
+               ret = -1;
+               goto done;
+       }
+
        if (lp_clustering()) {
                /*
                 * This implicitly initializes the global ctdbd
@@ -412,24 +419,16 @@ static int traverse_sessionid(struct db_record *db, void *state)
        }
 
        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;
                }
@@ -447,7 +446,7 @@ static int traverse_sessionid(struct db_record *db, void *state)
                d_printf("\nService      pid     machine       Connected at\n");
                d_printf("-------------------------------------------------------\n");
 
-               connections_forall(traverse_fn1, NULL);
+               connections_forall_read(traverse_fn1, NULL);
 
                d_printf("\n");
 
@@ -460,7 +459,7 @@ static int traverse_sessionid(struct db_record *db, void *state)
                int result;
                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) {
                        d_printf("%s not initialised\n",
@@ -478,6 +477,11 @@ static int traverse_sessionid(struct db_record *db, void *state)
                        goto done;
                }
 
+               if (!serverid_init_readonly(frame)) {
+                       d_printf("Can't initialise serverid tdb - exiting\n");
+                       ret = 1;
+                       goto done;
+               }
                result = share_mode_forall(print_share_mode, NULL);
 
                if (result == 0) {