Changeset 77 for trunk/samba/source/utils/status.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/utils/status.c (modified) (18 diffs)

trunk/samba/source/utils/status.c

@@ -6 +6 @@
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
@@ -15 +15 @@
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    Revision History:
@@ -36 +35 @@
 #define SMB_MAXPIDS             2048
 static uid_t            Ucrit_uid = 0;               /* added by OH */
-static pid_t            Ucrit_pid[SMB_MAXPIDS];  /* Ugly !!! */   /* added by OH */
+static struct server_id Ucrit_pid[SMB_MAXPIDS];  /* Ugly !!! */   /* added by OH */
 static int              Ucrit_MaxPid=0;                    /* added by OH */
 static unsigned int     Ucrit_IsActive = 0;                /* added by OH */
@@ -70 +69 @@
 }
 
-static unsigned int Ucrit_checkPid(pid_t pid)
+static unsigned int Ucrit_checkPid(struct server_id pid)
 {
         int i;
@@ -78 +77 @@
         
         for (i=0;i<Ucrit_MaxPid;i++) {
-                if( pid == Ucrit_pid[i] ) 
+                if (cluster_id_equal(&pid, &Ucrit_pid[i])) 
                         return 1;
         }
@@ -85 +84 @@
 }
 
-static BOOL Ucrit_addPid( pid_t pid )
+static BOOL Ucrit_addPid( struct server_id pid )
 {
         if ( !Ucrit_IsActive )
@@ -113 +112 @@
         }
 
+        if (!process_exists(e->pid)) {
+                return;
+        }
+
         if (count==0) {
                 d_printf("Locked files:\n");
@@ -120 +123 @@
         count++;
 
-        if (Ucrit_checkPid(procid_to_pid(&e->pid))) {
+        if (Ucrit_checkPid(e->pid)) {
                 d_printf("%-11s  ",procid_str_static(&e->pid));
                 d_printf("%-9u  ", (unsigned int)e->uid);
@@ -167 +170 @@
 }
 
-static void print_brl(SMB_DEV_T dev,
-                        SMB_INO_T ino,
-                        struct process_id pid, 
+static void print_brl(struct file_id id,
+                        struct server_id pid, 
                         enum brl_type lock_type,
                         enum brl_flavour lock_flav,
                         br_off start,
-                        br_off size)
+                        br_off size,
+                        void *private_data)
 {
         static int count;
+        int i;
+        static const struct {
+                enum brl_type lock_type;
+                const char *desc;
+        } lock_types[] = {
+                { READ_LOCK, "R" },
+                { WRITE_LOCK, "W" },
+                { PENDING_READ_LOCK, "PR" },
+                { PENDING_WRITE_LOCK, "PW" },
+                { UNLOCK_LOCK, "U" }
+        };
+        const char *desc="X";
+        const char *sharepath = "";
+        const char *fname = "";
+        struct share_mode_lock *share_mode;
+
         if (count==0) {
                 d_printf("Byte range locks:\n");
-                d_printf("   Pid     dev:inode  R/W      start        size\n");
-                d_printf("------------------------------------------------\n");
+                d_printf("Pid        dev:inode       R/W  start     size      SharePath               Name\n");
+                d_printf("--------------------------------------------------------------------------------\n");
         }
         count++;
 
-        d_printf("%8s   %05x:%05x    %s  %9.0f   %9.0f\n", 
-               procid_str_static(&pid), (int)dev, (int)ino, 
-               lock_type==READ_LOCK?"R":"W",
-               (double)start, (double)size);
-}
-
-static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *state)
-{
-        struct connections_data crec;
-
-        if (dbuf.dsize != sizeof(crec))
+        share_mode = fetch_share_mode_unlocked(NULL, id, "__unspecified__", "__unspecified__");
+        if (share_mode) {
+                sharepath = share_mode->servicepath;
+                fname = share_mode->filename;
+        }
+
+        for (i=0;i<ARRAY_SIZE(lock_types);i++) {
+                if (lock_type == lock_types[i].lock_type) {
+                        desc = lock_types[i].desc;
+                }
+        }
+
+        d_printf("%-10s %-15s %-4s %-9.0f %-9.0f %-24s %-24s\n", 
+                 procid_str_static(&pid), file_id_string_tos(&id),
+                 desc,
+                 (double)start, (double)size,
+                 sharepath, fname);
+
+        TALLOC_FREE(share_mode);
+}
+
+static int traverse_fn1(struct db_record *rec,
+                        const struct connections_key *key,
+                        const struct connections_data *crec,
+                        void *state)
+{
+        if (crec->cnum == -1)
                 return 0;
 
-        memcpy(&crec, dbuf.dptr, sizeof(crec));
-
-        if (crec.cnum == -1)
+        if (!process_exists(crec->pid) || !Ucrit_checkUid(crec->uid)) {
                 return 0;
-
-        if (!process_exists(crec.pid) || !Ucrit_checkUid(crec.uid)) {
-                return 0;
         }
 
         d_printf("%-10s   %s   %-12s  %s",
-               crec.servicename,procid_str_static(&crec.pid),
-               crec.machine,
-               time_to_asc(crec.start));
+                 crec->servicename,procid_str_static(&crec->pid),
+                 crec->machine,
+                 time_to_asc(crec->start));
 
         return 0;
 }
 
-static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *state)
+static int traverse_sessionid(struct db_record *db, void *state)
 {
         struct sessionid sessionid;
         fstring uid_str, gid_str;
 
-        if (dbuf.dsize != sizeof(sessionid))
+        if (db->value.dsize != sizeof(sessionid))
                 return 0;
 
-        memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
-
-        if (!process_exists_by_pid(sessionid.pid) || !Ucrit_checkUid(sessionid.uid)) {
+        memcpy(&sessionid, db->value.dptr, sizeof(sessionid));
+
+        if (!process_exists(sessionid.pid) || !Ucrit_checkUid(sessionid.uid)) {
                 return 0;
         }
@@ -232 +262 @@
         fstr_sprintf(gid_str, "%d", sessionid.gid);
 
-        d_printf("%5d   %-12s  %-12s  %-12s (%s)\n",
-                 (int)sessionid.pid,
+        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), 
@@ -248 +278 @@
         int c;
         int profile_only = 0;
-        TDB_CONTEXT *tdb;
         BOOL show_processes, show_locks, show_shares;
         poptContext pc;
@@ -266 +295 @@
                 POPT_TABLEEND
         };
+        TALLOC_CTX *frame = talloc_stackframe();
+        int ret = 0;
 
         sec_init();
@@ -276 +307 @@
         if (getuid() != geteuid()) {
                 d_printf("smbstatus should not be run setuid\n");
-                return(1);
+                ret = 1;
+                goto done;
         }
 
@@ -308 +340 @@
         if (!lp_load(dyn_CONFIGFILE,False,False,False,True)) {
                 fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
-                return (-1);
-        }
-
+                ret = -1;
+                goto done;
+        }
+
+        /*
+         * This implicitly initializes the global ctdbd connection, usable by
+         * the db_open() calls further down.
+         */
+
+        messaging_init(NULL, procid_self(), event_context_init(NULL));
+        
         switch (profile_only) {
                 case 'P':
@@ -323 +363 @@
 
         if ( show_processes ) {
-                tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
-                if (!tdb) {
+                struct db_context *db;
+                db = db_open(NULL, lock_path("sessionid.tdb"), 0,
+                             TDB_DEFAULT, O_RDWR, 0644);
+                if (!db) {
                         d_printf("sessionid.tdb not initialised\n");
                 } else {
@@ -331 +373 @@
                         d_printf("-------------------------------------------------------------------\n");
 
-                        tdb_traverse(tdb, traverse_sessionid, NULL);
-                        tdb_close(tdb);
-                }
-
-                if (processes_only) 
-                        exit(0);        
+                        db->traverse_read(db, traverse_sessionid, NULL);
+                        TALLOC_FREE(db);
+                }
+
+                if (processes_only) {
+                        goto done;
+                }
         }
   
         if ( show_shares ) {
-                tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
-                if (!tdb) {
-                        d_printf("%s not initialised\n", lock_path("connections.tdb"));
-                        d_printf("This is normal if an SMB client has never connected to your server.\n");
-                }  else  {
-                        if (verbose) {
-                                d_printf("Opened %s\n", lock_path("connections.tdb"));
-                        }
-
-                        if (brief) 
-                                exit(0);
+                if (verbose) {
+                        d_printf("Opened %s\n", lock_path("connections.tdb"));
+                }
+
+                if (brief) {
+                        goto done;
+                }
                 
-                        d_printf("\nService      pid     machine       Connected at\n");
-                        d_printf("-------------------------------------------------------\n");
-        
-                        tdb_traverse(tdb, traverse_fn1, NULL);
-                        tdb_close(tdb);
-
-                        d_printf("\n");
-                }
-
-                if ( shares_only )
-                        exit(0);
+                d_printf("\nService      pid     machine       Connected at\n");
+                d_printf("-------------------------------------------------------\n");
+        
+                connections_forall(traverse_fn1, NULL);
+
+                d_printf("\n");
+
+                if ( shares_only ) {
+                        goto done;
+                }
         }
 
         if ( show_locks ) {
-                int ret;
+                int result;
 
                 if (!locking_init(1)) {
                         d_printf("Can't initialise locking module - exiting\n");
-                        exit(1);
+                        ret = 1;
+                        goto done;
                 }
                 
-                ret = share_mode_forall(print_share_mode, NULL);
-
-                if (ret == 0) {
+                result = share_mode_forall(print_share_mode, NULL);
+
+                if (result == 0) {
                         d_printf("No locked files\n");
-                } else if (ret == -1) {
+                } else if (result == -1) {
                         d_printf("locked file list truncated\n");
                 }
@@ -384 +423 @@
 
                 if (show_brl) {
-                        brl_forall(print_brl);
+                        brl_forall(print_brl, NULL);
                 }
                 
@@ -390 +429 @@
         }
 
-        return (0);
-}
+done:
+        TALLOC_FREE(frame);
+        return ret;
+}