diff options
| author | rwatson <rwatson@FreeBSD.org> | 2002-10-24 00:00:57 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2002-10-24 00:00:57 +0000 |
| commit | c1f79de8c7e95092759b8bf882668ce50bc83a7c (patch) | |
| tree | affb696135e5bafb9ef35aa4bddc59b5f810ab27 /bin/ps/ps.c | |
| parent | f39fb18da2b62bda9a9ba207ddb60f83ec48c7e9 (diff) | |
| download | FreeBSD-src-c1f79de8c7e95092759b8bf882668ce50bc83a7c.zip FreeBSD-src-c1f79de8c7e95092759b8bf882668ce50bc83a7c.tar.gz | |
Use the MAC interface to list process MAC labels rather than using
the LOMAC-specific interface (which is being deprecated). The
revised LOMAC using the MAC framework will export levels listable
using this mechanism.
Approved by: re
Obtained from: TrustedBSD Project
Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'bin/ps/ps.c')
| -rw-r--r-- | bin/ps/ps.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 98fec49..acdade0 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -#include "lomac.h" #include "ps.h" #define SEP ", \t" /* username separators */ @@ -108,7 +107,7 @@ static char o1[] = "pid"; static char o2[] = "tt,state,time,command"; static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,%cpu,%mem,command"; -static char Zfmt[] = "lvl"; +static char Zfmt[] = "label"; static kvm_t *kd; @@ -410,7 +409,6 @@ main(int argc, char *argv[]) } } free(uids); - lomac_stop(); exit(eval); } @@ -653,7 +651,7 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ps [-aChjlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]", + "usage: ps [-aChjlmrSTuvwxZ] [-O|o fmt] [-p pid] [-t tty] [-U user]", " [-M core] [-N system]", " ps [-L]"); exit(1); |
