diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-07 15:31:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:54 -0500 |
| commit | 76ce309234adbe0a6a56b849a91714cab148c4a7 (patch) | |
| tree | 0fe73b35a0c08fbc9b347dfeb23ce89f0bc08885 /source3/utils/net_status.c | |
| parent | 71921605995fa95d84301534760a6bc2db3fa74b (diff) | |
| download | samba-76ce309234adbe0a6a56b849a91714cab148c4a7.tar.gz samba-76ce309234adbe0a6a56b849a91714cab148c4a7.tar.bz2 samba-76ce309234adbe0a6a56b849a91714cab148c4a7.zip | |
r22751: Next step for the cluster merge: sessionid.tdb should contain a 'struct
server_id' instead of a 'uint32 pid'
(This used to be commit be7bac55c37676a8137c59a22dfb2e4c4821ac21)
Diffstat (limited to 'source3/utils/net_status.c')
| -rw-r--r-- | source3/utils/net_status.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c index 72ea645896..af6952389c 100644 --- a/source3/utils/net_status.c +++ b/source3/utils/net_status.c @@ -31,18 +31,18 @@ static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, memcpy(&sessionid, dbuf.dptr, sizeof(sessionid)); - if (!process_exists_by_pid(sessionid.pid)) { + if (!process_exists(sessionid.pid)) { return 0; } if (*parseable) { - d_printf("%d\\%s\\%s\\%s\\%s\n", - (int)sessionid.pid, uidtoname(sessionid.uid), + d_printf("%s\\%s\\%s\\%s\\%s\n", + procid_str_static(&sessionid.pid), uidtoname(sessionid.uid), gidtoname(sessionid.gid), sessionid.remote_machine, sessionid.hostname); } else { - d_printf("%5d %-12s %-12s %-12s (%s)\n", - (int)sessionid.pid, uidtoname(sessionid.uid), + d_printf("%7s %-12s %-12s %-12s (%s)\n", + procid_str_static(&sessionid.pid), uidtoname(sessionid.uid), gidtoname(sessionid.gid), sessionid.remote_machine, sessionid.hostname); } @@ -102,7 +102,7 @@ static int show_share(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, } d_printf("%-10.10s %s %-12s %s", - crec.servicename,procid_str_static(&crec.pid), + crec.servicename, procid_str_static(&crec.pid), crec.machine, time_to_asc(crec.start)); @@ -125,7 +125,7 @@ static int collect_pid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, memcpy(&sessionid, dbuf.dptr, sizeof(sessionid)); - if (!process_exists_by_pid(sessionid.pid)) + if (!process_exists(sessionid.pid)) return 0; ids->num_entries += 1; @@ -160,7 +160,7 @@ static int show_share_parseable(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, } for (i=0; i<ids->num_entries; i++) { - struct server_id id = pid_to_procid(ids->entries[i].pid); + struct server_id id = ids->entries[i].pid; if (procid_equal(&id, &crec.pid)) { guest = False; break; |