emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

SELinux spelling (rhbz#859900)

Browse Source 
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 <csmall@enc.com.au>
This commit is contained in:
Jaromir Capik 2012-09-27 21:46:46 +10:00 committed by Craig Small
parent beb0982b28
commit 8e867659e6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -247,7 +247,7 @@ procps-3.2.0 --> procps-3.2.1
build even w/ curses in an odd location -- thanks to Segher Boessenkool 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 fg process group and session leader
ps: STAT flags for swapped out process dropped (was broken) 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: detect broken /proc/slabinfo -- thanks to Fabian Frederick
slabtop: ensure that error messages show up on the screen -- FF again slabtop: ensure that error messages show up on the screen -- FF again

4
ps/help.c
View File

@ -135,7 +135,7 @@ void do_help (const char *opt, int rc) {
" j BSD job control format\n" " j BSD job control format\n"
" -l long format\n" " -l long format\n"
" l BSD 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> preloaded with default columns\n"
" O <format> as -O, with BSD personality\n" " O <format> as -O, with BSD personality\n"
" -o, o, --format <format>\n" " -o, o, --format <format>\n"
@ -145,7 +145,7 @@ void do_help (const char *opt, int rc) {
" v virtual memory format\n" " v virtual memory format\n"
" X register format\n" " X register format\n"
" -y do not show flags, show rrs vs. addr (used with -l)\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" " --headers repeat header lines, one per page\n"
" --no-headers do not print header at all\n" " --no-headers do not print header at all\n"
" --cols, --columns, --width <num>\n" " --cols, --columns, --width <num>\n"

2
ps/parser.c
View File

@ -284,7 +284,7 @@ static const char *parse_sysv_option(void){
thread_flags |= TF_U_L; thread_flags |= TF_U_L;
// format_modifiers |= FM_L; // format_modifiers |= FM_L;
break; break;
case 'M': // typically the SE Linux context case 'M': // typically the SELinux context
trace("-M print security label for Mandatory Access Control\n"); trace("-M print security label for Mandatory Access Control\n");
format_modifiers |= FM_M; format_modifiers |= FM_M;
break; break;

8
ps/ps.1
View File

@ -401,7 +401,7 @@ Show different scheduler information for the
option. option.
.TP .TP
.B \-\-context .B \-\-context
Display security context format (for SE Linux). Display security context format (for SELinux).
.TP .TP
.B \-f .B \-f
Do full\-format listing. This option can be combined with many other Do full\-format listing. This option can be combined with many other
@ -446,7 +446,7 @@ option is often useful with this.
.B \-M .B \-M
Add a column of security data. Identical to Add a column of security data. Identical to
.B Z .B Z
(for SE Linux). (for SELinux).
.TP .TP
.BI O \ format .BI O \ format
is preloaded is preloaded
@ -530,7 +530,7 @@ with
.B Z .B Z
Add a column of security data. Identical to Add a column of security data. Identical to
.B \-M .B \-M
(for SE Linux). (for SELinux).
.\" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .\" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.PD .PD
.PP .PP
@ -1301,7 +1301,7 @@ format is displayed. (alias
T} T}
label LABEL 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 the
.I Mandatory Access Control .I Mandatory Access Control
("MAC") found on high\-security systems. ("MAC") found on high\-security systems.