From patchwork Mon Jan 11 09:30:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Vrabec X-Patchwork-Id: 8000871 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 769DE9F3F6 for ; Mon, 11 Jan 2016 09:36:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ACDDB20204 for ; Mon, 11 Jan 2016 09:36:39 +0000 (UTC) Received: from emvm-gh1-uea09.nsa.gov (emvm-gh1-uea09.nsa.gov [63.239.67.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C195201BC for ; Mon, 11 Jan 2016 09:36:38 +0000 (UTC) X-TM-IMSS-Message-ID: <73975bc50003e709@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1) id 73975bc50003e709 ; Mon, 11 Jan 2016 04:37:01 -0500 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u0B9YuhI006784; Mon, 11 Jan 2016 04:34:57 -0500 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u0B9V0ao068326 for ; Mon, 11 Jan 2016 04:31:00 -0500 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u0B9Uv74006631 for ; Mon, 11 Jan 2016 04:31:00 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1C7AwBmdZNWfxy3hNFeGQEBAQEPAQEChCMmiFmxS4QHhg8CgWoBAQEBAQESAQELCwoIIYRjAQEBA3kQUS0qGYguvl4BLIZWjjsFh2SFW4lUjVmOfY5RgnUcgV49NIYoAQEB X-IPAS-Result: A1C7AwBmdZNWfxy3hNFeGQEBAQEPAQEChCMmiFmxS4QHhg8CgWoBAQEBAQESAQELCwoIIYRjAQEBA3kQUS0qGYguvl4BLIZWjjsFh2SFW4lUjVmOfY5RgnUcgV49NIYoAQEB X-IronPort-AV: E=Sophos;i="5.20,551,1444708800"; d="scan'208";a="5088765" Received: from emvm-gh1-uea08.nsa.gov ([10.208.42.193]) by goalie.tycho.ncsc.mil with ESMTP; 11 Jan 2016 04:31:00 -0500 X-TM-IMSS-Message-ID: <07080c7300005b82@nsa.gov> Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 ADH-AES256-SHA (256/256)) id 07080c7300005b82 ; Mon, 11 Jan 2016 04:30:40 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id CE6A58DFF8 for ; Mon, 11 Jan 2016 09:30:57 +0000 (UTC) Received: from lvrabecPC.brq.redhat.com. (dhcp-10-40-3-90.brq.redhat.com [10.40.3.90]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0B9UrlA005424; Mon, 11 Jan 2016 04:30:56 -0500 From: Lukas Vrabec To: selinux@tycho.nsa.gov Subject: [PATCH 2/2] Added missing descriptions for --*-key params in secon man page. Date: Mon, 11 Jan 2016 10:30:41 +0100 Message-Id: <1452504641-26411-2-git-send-email-lvrabec@redhat.com> In-Reply-To: <1452504641-26411-1-git-send-email-lvrabec@redhat.com> References: <1452504641-26411-1-git-send-email-lvrabec@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-TM-AS-MML: disable X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixed secon help, merged descriptions for --current-* and --self-* params. Signed-off-by: Lukas Vrabec --- 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 Use the context from the specified pid.\n" - " --pid-exec Use the exec context from the specified pid.\n" - " --pid-fs Use the fs context from the specified pid.\n" - " --pid-key Use the key context from the specified pid.\n" - " --file -f Use the context from the specified file.\n" - " --link -L 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 Use the context from the specified pid.\n" + " --pid-exec Use the exec context from the specified pid.\n" + " --pid-fs Use the fs context from the specified pid.\n" + " --pid-key Use the key context from the specified pid.\n" + " --file -f Use the context from the specified file.\n" + " --link -L Use the context from the specified link.\n", name, SECON_OPTS_SM); exit(exit_code);