89 lines
3.2 KiB
Diff
89 lines
3.2 KiB
Diff
diff --git a/NEWS b/NEWS
|
|
index 3cdb895..6b3ef01 100644
|
|
--- a/NEWS
|
|
+++ b/NEWS
|
|
@@ -247,7 +247,7 @@ procps-3.2.0 --> procps-3.2.1
|
|
build even w/ curses in an odd location -- thanks to Segher Boessenkool
|
|
ps: STAT flags for fg process group and session leader
|
|
ps: STAT flags for swapped out process dropped (was broken)
|
|
-ps: new -M and Z options for security data (SE Linux, etc.)
|
|
+ps: new -M and Z options for security data (SELinux, etc.)
|
|
slabtop: detect broken /proc/slabinfo -- thanks to Fabian Frederick
|
|
slabtop: ensure that error messages show up on the screen -- FF again
|
|
|
|
diff --git a/ps/help.c b/ps/help.c
|
|
index 028d186..b536f1a 100644
|
|
--- a/ps/help.c
|
|
+++ b/ps/help.c
|
|
@@ -135,7 +135,7 @@ void do_help (const char *opt, int rc) {
|
|
" j BSD job control format\n"
|
|
" -l long format\n"
|
|
" l BSD long format\n"
|
|
- " -M, Z add security data (for SE Linux)\n"
|
|
+ " -M, Z add security data (for SELinux)\n"
|
|
" -O <format> preloaded with default columns\n"
|
|
" O <format> as -O, with BSD personality\n"
|
|
" -o, o, --format <format>\n"
|
|
@@ -145,7 +145,7 @@ void do_help (const char *opt, int rc) {
|
|
" v virtual memory format\n"
|
|
" X register format\n"
|
|
" -y do not show flags, show rrs vs. addr (used with -l)\n"
|
|
- " --context display security context (for SE Linux)\n"
|
|
+ " --context display security context (for SELinux)\n"
|
|
" --headers repeat header lines, one per page\n"
|
|
" --no-headers do not print header at all\n"
|
|
" --cols, --columns, --width <num>\n"
|
|
diff --git a/ps/parser.c b/ps/parser.c
|
|
index eaba306..0fc28d2 100644
|
|
--- a/ps/parser.c
|
|
+++ b/ps/parser.c
|
|
@@ -284,7 +284,7 @@ static const char *parse_sysv_option(void){
|
|
thread_flags |= TF_U_L;
|
|
// format_modifiers |= FM_L;
|
|
break;
|
|
- case 'M': // typically the SE Linux context
|
|
+ case 'M': // typically the SELinux context
|
|
trace("-M print security label for Mandatory Access Control\n");
|
|
format_modifiers |= FM_M;
|
|
break;
|
|
diff --git a/ps/ps.1 b/ps/ps.1
|
|
index e538009..41c1168 100644
|
|
--- a/ps/ps.1
|
|
+++ b/ps/ps.1
|
|
@@ -401,7 +401,7 @@ Show different scheduler information for the
|
|
option.
|
|
.TP
|
|
.B \-\-context
|
|
-Display security context format (for SE Linux).
|
|
+Display security context format (for SELinux).
|
|
.TP
|
|
.B \-f
|
|
Do full\-format listing. This option can be combined with many other
|
|
@@ -446,7 +446,7 @@ option is often useful with this.
|
|
.B \-M
|
|
Add a column of security data. Identical to
|
|
.B Z
|
|
-(for SE Linux).
|
|
+(for SELinux).
|
|
.TP
|
|
.BI O \ format
|
|
is preloaded
|
|
@@ -530,7 +530,7 @@ with
|
|
.B Z
|
|
Add a column of security data. Identical to
|
|
.B \-M
|
|
-(for SE Linux).
|
|
+(for SELinux).
|
|
.\" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
.PD
|
|
.PP
|
|
@@ -1301,7 +1301,7 @@ format is displayed. (alias
|
|
T}
|
|
|
|
label LABEL T{
|
|
-security label, most commonly used for SE Linux context data. This is for
|
|
+security label, most commonly used for SELinux context data. This is for
|
|
the
|
|
.I Mandatory Access Control
|
|
("MAC") found on high\-security systems.
|