From 8e867659e61bd6ca98720ab83af83be3e426ec6f Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Thu, 27 Sep 2012 21:46:46 +1000 Subject: [PATCH] SELinux spelling (rhbz#859900) We got a bug report, that our project doesn't spell "SELinux" consistently/correctly. I've fixed that and the patch is attached. Signed-off-by: Craig Small --- NEWS | 2 +- ps/help.c | 4 ++-- ps/parser.c | 2 +- ps/ps.1 | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 3cdb8952..6b3ef01d 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 028d1867..b536f1a3 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 preloaded with default columns\n" " O as -O, with BSD personality\n" " -o, o, --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 \n" diff --git a/ps/parser.c b/ps/parser.c index eaba306a..0fc28d23 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 e5380099..41c11681 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.