From patchwork Tue May 24 08:02:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Lautrbach X-Patchwork-Id: 9132957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3ED6F6075E for ; Tue, 24 May 2016 08:04:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 341912824F for ; Tue, 24 May 2016 08:04:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28D7828293; Tue, 24 May 2016 08:04:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00 autolearn=ham version=3.3.1 Received: from emsm-gh1-uea10.nsa.gov (emsm-gh1-uea10.nsa.gov [8.44.101.8]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E980B28287 for ; Tue, 24 May 2016 08:04:03 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.26,359,1459814400"; d="scan'208";a="13974111" IronPort-PHdr: =?us-ascii?q?9a23=3A4+/drRanVnqyLCDZGHW0IO3/LSx+4OfEezUN459i?= =?us-ascii?q?sYplN5qZpcm8bnLW6fgltlLVR4KTs6sC0LqH9fy4EjBcqb+681k8M7V0Hycfjs?= =?us-ascii?q?sXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aJBzzOEJP?= =?us-ascii?q?K/jvHcaK1oLsh7H0p8WYP1kArQH+SI0xBS3+lR/WuMgSjNkqAYcK4TyNnEF1ff?= =?us-ascii?q?9Lz3hjP1OZkkW0zM6x+Jl+73YY4Kp5pIZ9S6GyQ4AUBfwdVWxnYCgJ45jwuB3C?= =?us-ascii?q?SxafzmcNWWUR1BxTCk7K6w+pcI32t37Cu/ZnkA2TINHsR7k/WXz296NiVQPygi?= =?us-ascii?q?4vLTM18GjLzMd3ifQI81qauxVjztuMM8muP/1kc/aYJIsX?= X-IPAS-Result: =?us-ascii?q?A2EOBQB2CkRX/wHyM5BcgzeBU7t4IYcvTAEBAQEBAQICYie?= =?us-ascii?q?CLYIWAgQBAjcUIA4DCQEBFykICAMBLQwJEQ4LBRgEiA7EPgEkhieIXREBaIRyH?= =?us-ascii?q?AWYN44gAolWhUICj0xiggYcgU1siByBNQEBAQ?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 May 2016 08:03:32 +0000 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 u4O82hdC017536; Tue, 24 May 2016 04:02:55 -0400 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 u4O82eMs100814 for ; Tue, 24 May 2016 04:02:40 -0400 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 u4O82dxu017532 for ; Tue, 24 May 2016 04:02:39 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1A3AgAWCkRXgBy3hNFchQq3b4QThhECgTNMAQEBAQEBEwEBCwsJCSGEcgIBA3kQUT0aGYgvxC4BAQgnhieJV4RyHAWYN44gAo8YAo9MgmgcgU06MolRAQEB X-IPAS-Result: A1A3AgAWCkRXgBy3hNFchQq3b4QThhECgTNMAQEBAQEBEwEBCwsJCSGEcgIBA3kQUT0aGYgvxC4BAQgnhieJV4RyHAWYN44gAo8YAo9MgmgcgU06MolRAQEB X-IronPort-AV: E=Sophos;i="5.26,359,1459828800"; d="scan'208";a="5465313" Received: from emsm-gh1-uea10.corp.nsa.gov (HELO emsm-gh1-uea10.nsa.gov) ([10.208.41.36]) by goalie.tycho.ncsc.mil with ESMTP; 24 May 2016 04:02:39 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AAXDSChUjvjhvBGYU/5KB5zs4PgzV8LGtZVwlr6E/?= =?us-ascii?q?grcLSJyIuqrYZhCGt8tkgFKBZ4jH8fUM07OQ6PCxHzBYqsrd+Fk5M7VyFDY9wf?= =?us-ascii?q?0MmAIhBMPXQWbaF9XNKxIAIcJZSVV+9Gu6O0UGUOz3ZlnVv2HgpWVKQka3CwN5?= =?us-ascii?q?K6zPF5LIiIzvjqbpq8yVP10D2Gb1SIgxBSv1hD2ZjtMRj4pmJ/R54TryiVwMRd?= =?us-ascii?q?5rw3h1L0mYhRf265T41pdi9yNNp6BprJYYAu2pN5g/GKdVCDUgLnAd+NzgtR6F?= =?us-ascii?q?SxCGoHQbTDY4iB1NVjDI8Auyep7srjHwv+F9kH2COcTrUao+UBy44qtrQQOugy?= =?us-ascii?q?ACYW1quFrLg9B92foI6CmqoAZyltbZ?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0GmAQBfCURXgBy3hNFchQq3b4QThhECg?= =?us-ascii?q?TNMAQEBAQEBAgIPAQELCwkJIS+CLYIWAgEDeRBRPRoZiC/ELQEBCAIlhieJV4R?= =?us-ascii?q?yHAWYN44gAo8YAo9MgmgcgU06MolRAQEB?= X-IPAS-Result: =?us-ascii?q?A0GmAQBfCURXgBy3hNFchQq3b4QThhECgTNMAQEBAQEBAgI?= =?us-ascii?q?PAQELCwkJIS+CLYIWAgEDeRBRPRoZiC/ELQEBCAIlhieJV4RyHAWYN44gAo8YA?= =?us-ascii?q?o9MgmgcgU06MolRAQEB?= X-IronPort-AV: E=Sophos;i="5.26,359,1459814400"; d="scan'208";a="13974096" Received: from mx1.redhat.com ([209.132.183.28]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 May 2016 08:02:38 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 269D6C09725F for ; Tue, 24 May 2016 08:02:37 +0000 (UTC) Received: from hulk.com ([10.40.3.79]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4O82Zur030946; Tue, 24 May 2016 04:02:36 -0400 From: Petr Lautrbach To: selinux@tycho.nsa.gov Subject: [PATCH] policycoreutils/semodule: Fix the documentation of -l, --list Date: Tue, 24 May 2016 10:02:29 +0200 Message-Id: <1464076949-27068-1-git-send-email-plautrba@redhat.com> In-Reply-To: <6a2dd3fa-1b9d-f2a8-a39d-7b72ac9570a0@tycho.nsa.gov> References: <6a2dd3fa-1b9d-f2a8-a39d-7b72ac9570a0@tycho.nsa.gov> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 24 May 2016 08:02:37 +0000 (UTC) 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-Virus-Scanned: ClamAV using ClamSMTP It wasn't clear how to use -l option with full/standard KIND and the example in semodule.8 man page was wrong. Based on a patch by Laurent Bigonville Signed-off-by: Petr Lautrbach --- policycoreutils/semodule/semodule.8 | 4 ++-- policycoreutils/semodule/semodule.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/policycoreutils/semodule/semodule.8 b/policycoreutils/semodule/semodule.8 index 68e95ab..0c5fdf7 100644 --- a/policycoreutils/semodule/semodule.8 +++ b/policycoreutils/semodule/semodule.8 @@ -38,7 +38,7 @@ deprecated, alias for --install .B \-r,\-\-remove=MODULE_NAME remove existing module .TP -.B \-l,\-\-list-modules=[KIND] +.B \-l[KIND],\-\-list-modules[=KIND] display list of installed modules (other than base) .TP .B \-E,\-\-extract=MODULE_PKG @@ -116,7 +116,7 @@ $ semodule \-d alsa # Install a module at a specific priority. $ semodule \-X 100 \-i alsa.pp # List all modules. -$ semodule \-l full +$ semodule \-\-list=full # Set an alternate path for the policy root $ semodule \-B \-p "/tmp" # Set an alternate path for the policy store root diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c index bcfaa2b..63900f4 100644 --- a/policycoreutils/semodule/semodule.c +++ b/policycoreutils/semodule/semodule.c @@ -127,7 +127,7 @@ static void usage(char *progname) printf(" -B, --build build and reload policy\n"); printf(" -i,--install=MODULE_PKG install a new module\n"); printf(" -r,--remove=MODULE_NAME remove existing module\n"); - printf(" -l,--list-modules=[KIND] display list of installed modules\n"); + printf(" -l[KIND],--list-modules[=KIND] display list of installed modules\n"); printf(" KIND: standard list highest priority, enabled modules\n"); printf(" full list all modules\n"); printf(" -X,--priority=PRIORITY set priority for following operations (1-999)\n");