Minor fixup of checkmodule man page.

Minor fixup of checkmodule man page.

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quality Engineering is going through all commands on the system looking
for mismatches between man page/usage and actual code.

It found that checkmodule had a -d option that is unused and undocumented -h
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAkvfC7oACgkQrlYvE4MpobNPrACg0uP02CWYPs9YcdU87jts9YqT
hMAAn2QA1UWZpGLvvU4yxStmhUU1Kg1+
=topF
-----END PGP SIGNATURE-----

[-- Attachment #2: checkpolicy-getopt.patch --]
[-- Type: text/plain, Size: 2093 bytes --]

diff --git a/checkpolicy/checkmodule.8 b/checkpolicy/checkmodule.8
index 550b32b..a25f25c 100644
--- a/checkpolicy/checkmodule.8
+++ b/checkpolicy/checkmodule.8
@@ -3,7 +3,7 @@
 checkmodule \- SELinux policy module compiler
 .SH SYNOPSIS
 .B checkmodule
-.I "[-b] [-m] [-M] [-V] [-o output_file] [input_file]"
+.I "[-h] [-b] [-m] [-M] [-U handle_unknown ] [-V] [-o output_file] [input_file]"
 .SH "DESCRIPTION"
 This manual page describes the
 .BR checkmodule
@@ -25,6 +25,9 @@ the module package into the module store and load the resulting policy.
 Read an existing binary policy module file rather than a source policy
 module file.  This option is a development/debugging aid.
 .TP
+.B \-h
+Print usage.
+.TP
 .B \-m
 Generate a non-base policy module.
 .TP
diff --git a/checkpolicy/checkmodule.c b/checkpolicy/checkmodule.c
index ad5a3d4..47603e0 100644
--- a/checkpolicy/checkmodule.c
+++ b/checkpolicy/checkmodule.c
@@ -139,13 +139,14 @@ static int write_binary_policy(policydb_t * p, char *file, char *progname)
 
 static void usage(char *progname)
 {
-	printf("usage:  %s [-V] [-b] [-U handle_unknown] [-m] [-M] [-o FILE] [INPUT]\n", progname);
+	printf("usage:  %s [-h] [-V] [-b] [-U handle_unknown] [-m] [-M] [-o FILE] [INPUT]\n", progname);
 	printf("Build base and policy modules.\n");
 	printf("Options:\n");
 	printf("  INPUT      build module from INPUT (else read from \"%s\")\n",
 	       txtfile);
 	printf("  -V         show policy versions created by this program\n");
 	printf("  -b         treat input as a binary policy file\n");
+	printf("  -h         print usage\n");
 	printf("  -U OPTION  How to handle unknown classes and permissions\n");
 	printf("               deny: Deny unknown kernel checks\n");
 	printf("               reject: Reject loading of policy with unknowns\n");
@@ -169,7 +170,6 @@ int main(int argc, char **argv)
 		{"binary", no_argument, NULL, 'b'},
 		{"version", no_argument, NULL, 'V'},
 		{"handle-unknown", optional_argument, NULL, 'U'},
-		{"debug", no_argument, NULL, 'd'},
 		{"mls", no_argument, NULL, 'M'},
 		{NULL, 0, NULL, 0}
 	};

[-- Attachment #3: checkpolicy-getopt.patch.sig --]
[-- Type: application/pgp-signature, Size: 72 bytes --]

Re: Minor fixup of checkmodule man page.

[Steve Lawrence]

On Mon, 2010-05-03 at 13:45 -0400, Daniel J Walsh wrote:
> Quality Engineering is going through all commands on the system looking
> for mismatches between man page/usage and actual code.
> 
> It found that checkmodule had a -d option that is unused and undocumented -h

Reviewed-by: Steve Lawrence <slawrence@tresys.com>

I'd just add the long --help option to the man page for completeness:

diff --git a/checkpolicy/checkmodule.8 b/checkpolicy/checkmodule.8
index a25f25c..54680e3 100644
--- a/checkpolicy/checkmodule.8
+++ b/checkpolicy/checkmodule.8
@@ -25,7 +25,7 @@ the module package into the module store and load the resulting policy.
 Read an existing binary policy module file rather than a source policy
 module file.  This option is a development/debugging aid.
 .TP
-.B \-h
+.B \-h,\-\-help
 Print usage.
 .TP
 .B \-m


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: Minor fixup of checkmodule man page.

[Chad Sellers]

On 6/11/10 3:25 PM, "Steve Lawrence" <slawrence@tresys.com> wrote:

> On Mon, 2010-05-03 at 13:45 -0400, Daniel J Walsh wrote:
>> Quality Engineering is going through all commands on the system looking
>> for mismatches between man page/usage and actual code.
>> 
>> It found that checkmodule had a -d option that is unused and undocumented -h
> 
> Reviewed-by: Steve Lawrence <slawrence@tresys.com>
> 
> I'd just add the long --help option to the man page for completeness:
> 
> diff --git a/checkpolicy/checkmodule.8 b/checkpolicy/checkmodule.8
> index a25f25c..54680e3 100644
> --- a/checkpolicy/checkmodule.8
> +++ b/checkpolicy/checkmodule.8
> @@ -25,7 +25,7 @@ the module package into the module store and load the
> resulting policy.
>  Read an existing binary policy module file rather than a source policy
>  module file.  This option is a development/debugging aid.
>  .TP
> -.B \-h
> +.B \-h,\-\-help
>  Print usage.
>  .TP
>  .B \-m
> 
> 
> --

Acked-by: Chad Sellers <csellers@tresys.com>

Merged as of checkpolicy 2.0.22


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: Minor fixup of checkmodule man page.

[Chad Sellers]

On 5/3/10 1:45 PM, "Daniel J Walsh" <dwalsh@redhat.com> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Quality Engineering is going through all commands on the system looking
> for mismatches between man page/usage and actual code.
> 
> It found that checkmodule had a -d option that is unused and undocumented -h
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.14 (GNU/Linux)
> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
> 
> iEYEARECAAYFAkvfC7oACgkQrlYvE4MpobNPrACg0uP02CWYPs9YcdU87jts9YqT
> hMAAn2QA1UWZpGLvvU4yxStmhUU1Kg1+
> =topF
> -----END PGP SIGNATURE-----

Acked-by: Chad Sellers <csellers@tresys.com>

Merged as of checkpolicy 2.0.22


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.