* [PATCH 2/2] Added missing descriptions for --*-key params in secon man page.
2016-01-11 9:30 [PATCH 1/2] Add description of missing newrole parameter -p in newrole man page Lukas Vrabec
@ 2016-01-11 9:30 ` Lukas Vrabec
2016-01-12 13:51 ` [PATCH 1/2] Add description of missing newrole parameter -p in newrole " Steve Lawrence
1 sibling, 0 replies; 3+ messages in thread
From: Lukas Vrabec @ 2016-01-11 9:30 UTC (permalink / raw)
To: selinux
Fixed secon help, merged descriptions for --current-* and --self-*
params.
Signed-off-by: Lukas Vrabec <lvrabec@redhat.com>
---
policycoreutils/secon/secon.1 | 9 ++++++++
policycoreutils/secon/secon.c | 53 +++++++++++++++++++++----------------------
2 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/policycoreutils/secon/secon.1 b/policycoreutils/secon/secon.1
index 3a8e0dd..a0ff795 100644
--- a/policycoreutils/secon/secon.1
+++ b/policycoreutils/secon/secon.1
@@ -69,6 +69,9 @@ gets the exec context from the specified process PID
\fB\-\-pid\-fs\fR
gets the fscreate context from the specified process PID
.TP
+\fB\-\-pid\-key\fR
+gets the key context from the specified process PID
+.TP
\fB\-\-current\fR, \fB\-\-self\fR
gets the context from the current process
.TP
@@ -78,6 +81,9 @@ gets the exec context from the current process
\fB\-\-current\-fs\fR, \fB\-\-self\-fs\fR
gets the fscreate context from the current process
.TP
+\fB\-\-current\-key\fR, \fB\-\-self\-key\fR
+gets the key context from the current process
+.TP
\fB\-\-parent\fR
gets the context from the parent of the current process
.TP
@@ -86,6 +92,9 @@ gets the exec context from the parent of the current process
.TP
\fB\-\-parent\-fs\fR
gets the fscreate context from the parent of the current process
+.TP
+\fB\-\-parent\-key\fR
+gets the key context from the parent of the current process
.PP
Additional argument
.I CONTEXT
diff --git a/policycoreutils/secon/secon.c b/policycoreutils/secon/secon.c
index ab4f7d0..134f4ee 100644
--- a/policycoreutils/secon/secon.c
+++ b/policycoreutils/secon/secon.c
@@ -77,33 +77,32 @@ static void usage(const char *name, int exit_code)
{
fprintf(exit_code ? stderr : stdout,
" Usage: %s [-%s] [ context | - ]\n"
- " --help -h Show this message.\n"
- " --version -V Show the version.\n"
- " --prompt -P Output in a format good for a prompt.\n"
- " --user -u Show the user of the context.\n"
- " --role -r Show the role of the context.\n"
- " --type -t Show the type of the context.\n"
- " --sensitivity -s Show the sensitivity level of the context.\n"
- " --clearance -c Show the clearance level of the context.\n"
- " --mls-range -m Show the sensitivity to clearance range of \n"
- " the context.\n"
- " --raw -R Show the context in \"raw\" format.\n"
- " --color -C Output using ANSI color codes (requires -P).\n"
- " --current Get the context for the current process.\n"
- " --self Get the context for the current process.\n"
- " --self-exec Get the exec context for the current process.\n"
- " --self-fs Get the fs context for the current process.\n"
- " --self-key Get the key context for the current process.\n"
- " --parent Get the context for the parent process.\n"
- " --parent-exec Get the exec context for the parent process.\n"
- " --parent-fs Get the fs context for the parent process.\n"
- " --parent-key Get the key context for the parent process.\n"
- " --pid -p <arg> Use the context from the specified pid.\n"
- " --pid-exec <arg> Use the exec context from the specified pid.\n"
- " --pid-fs <arg> Use the fs context from the specified pid.\n"
- " --pid-key <arg> Use the key context from the specified pid.\n"
- " --file -f <arg> Use the context from the specified file.\n"
- " --link -L <arg> Use the context from the specified link.\n",
+ " --help -h Show this message.\n"
+ " --version -V Show the version.\n"
+ " --prompt -P Output in a format good for a prompt.\n"
+ " --user -u Show the user of the context.\n"
+ " --role -r Show the role of the context.\n"
+ " --type -t Show the type of the context.\n"
+ " --sensitivity -s Show the sensitivity level of the context.\n"
+ " --clearance -c Show the clearance level of the context.\n"
+ " --mls-range -m Show the sensitivity to clearance range of \n"
+ " the context.\n"
+ " --raw -R Show the context in \"raw\" format.\n"
+ " --color -C Output using ANSI color codes (requires -P).\n"
+ " --current, --self Get the context for the current process.\n"
+ " --current-exec, --self-exec Get the exec context for the current process.\n"
+ " --current-fs, --self-fs Get the fs context for the current process.\n"
+ " --current-key, --self-key Get the key context for the current process.\n"
+ " --parent Get the context for the parent process.\n"
+ " --parent-exec Get the exec context for the parent process.\n"
+ " --parent-fs Get the fs context for the parent process.\n"
+ " --parent-key Get the key context for the parent process.\n"
+ " --pid -p <arg> Use the context from the specified pid.\n"
+ " --pid-exec <arg> Use the exec context from the specified pid.\n"
+ " --pid-fs <arg> Use the fs context from the specified pid.\n"
+ " --pid-key <arg> Use the key context from the specified pid.\n"
+ " --file -f <arg> Use the context from the specified file.\n"
+ " --link -L <arg> Use the context from the specified link.\n",
name, SECON_OPTS_SM);
exit(exit_code);
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] Add description of missing newrole parameter -p in newrole man page.
2016-01-11 9:30 [PATCH 1/2] Add description of missing newrole parameter -p in newrole man page Lukas Vrabec
2016-01-11 9:30 ` [PATCH 2/2] Added missing descriptions for --*-key params in secon " Lukas Vrabec
@ 2016-01-12 13:51 ` Steve Lawrence
1 sibling, 0 replies; 3+ messages in thread
From: Steve Lawrence @ 2016-01-12 13:51 UTC (permalink / raw)
To: Lukas Vrabec, selinux
On 01/11/2016 04:30 AM, Lukas Vrabec wrote:
> Signed-off-by: Lukas Vrabec <lvrabec@redhat.com>
I fixed a minor typo in this patch. Otherwise looks good. Both patches
applied. Thanks!
> ---
> policycoreutils/newrole/newrole.1 | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/policycoreutils/newrole/newrole.1 b/policycoreutils/newrole/newrole.1
> index c47bc52..3bd57e7 100644
> --- a/policycoreutils/newrole/newrole.1
> +++ b/policycoreutils/newrole/newrole.1
> @@ -8,6 +8,7 @@ newrole \- run a shell with a new SELinux role
> [\fB-t\fR|\fB--type\fR]
> \fITYPE\fR
> [\fB-l\fR|\fB--level\fR]
> +[\fB-p\fR|\fB--preserve-environment\fR]
> \fILEVEL\fR [-- [\fIARGS\fR]...]
> .SH DESCRIPTION
> .PP
> @@ -38,7 +39,12 @@ specified by
> If
> \fILEVEL\fR
> is a range, the new context will have the sensitivity level and clearance
> -specified by that range.
> +specified by that range. If the
> +.B -p
> +or
> +.B --preserve-environment
> +option is specified, then shell with new SELinux context will preserve environment variables,
> +otherwise new minimal enviroment is created.
> .PP
> Additional arguments
> .I ARGS
>
^ permalink raw reply [flat|nested] 3+ messages in thread