RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-03 04:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch for Ticket #1 [1672486] (checkpolicy/checkmodule)

Browse Source 
This patch is proposed to solve Ticket #1 [1672486] (command line
binaries should support --version and --help).

It adds handling of -h, -V and the long formats --help and --version to
all binaries (checkpolicy/checkmodule).

It also adds handling of long options for some of the available options.

Manual pages have also been updated accordingly (and a few undocumented
options have been documented).

Guido Trentalancia

Signed-off-by: Joshua Brindle <method@manicmethod.com>
This commit is contained in:
Guido Trentalancia 2009-11-02 18:14:28 +01:00 committed by Joshua Brindle
parent a3ccf607a2
commit bf57d2349e
4 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkpolicy/checkmodule.8
View File

@ -21,23 +21,26 @@ the module package into the module store and load the resulting policy.
.SH OPTIONS
.TP
.B \-b
.B \-b,\-\-binary
Read an existing binary policy module file rather than a source policy
module file. This option is a development/debugging aid.
.TP
.B \-m
Generate a non-base policy module.
.TP
.B \-M
.B \-M,\-\-mls
Enable the MLS/MCS support when checking and compiling the policy module.
.TP
.B \-V
.B \-V,\-\-version
Show policy versions created by this program
.TP
.B \-o filename
.B \-o,\-\-output filename
Write a binary policy module file to the specified filename.
Otherwise, checkmodule will only check the syntax of the module source file
and will not generate a binary module at all.
.TP
.B \-U,\-\-handle-unknown <action>
Specify how the kernel should handle unknown classes or permissions (deny, allow or reject).
.SH EXAMPLE
.nf

12
checkpolicy/checkmodule.c
View File

@ -163,8 +163,18 @@ int main(int argc, char **argv)
int ch;
int show_version = 0;
policydb_t modpolicydb;
struct option long_options[] = {
{"help", no_argument, NULL, 'h'},
{"output", required_argument, NULL, 'o'},
{"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}
};
while ((ch = getopt(argc, argv, "ho:dbVU:mM")) != EOF) {
while ((ch = getopt_long(argc, argv, "ho:bVU:mM", long_options, NULL)) != -1) {
switch (ch) {
case 'h':
usage(argv[0]);

20
checkpolicy/checkpolicy.8
View File

@ -18,20 +18,32 @@ policy.conf or policy, depending on whether the -b flag is specified.
.SH OPTIONS
.TP
.B \-b
.B \-b,\-\-binary
Read an existing binary policy file rather than a source policy.conf file.
.TP
.B \-d
.B \-d,\-\-debug
Enter debug mode after loading the policy.
.TP
.B \-M
.B \-M,\-\-mls
Enable the MLS policy when checking and compiling the policy.
.TP
.B \-o filename
.B \-o,\-\-output filename
Write a binary policy file to the specified filename.
.TP
.B \-c policyvers
Specify the policy version, defaults to the latest.
.TP
.B \-t,\-\-target
Specify the target platform (selinux or xen).
.TP
.B \-U,\-\-handle-unknown <action>
Specify how the kernel should handle unknown classes or permissions (deny, allow or reject).
.TP
.B \-V,\-\-version
Show version information.
.TP
.B \-h,\-\-help
Show usage information.
.SH "SEE ALSO"
SELinux documentation at http://www.nsa.gov/selinux,

14
checkpolicy/checkpolicy.c
View File

@ -392,8 +392,19 @@ int main(int argc, char **argv)
int state;
int show_version = 0;
struct policy_file pf;
struct option long_options[] = {
{"output", required_argument, NULL, 'o'},
{"target", required_argument, NULL, 't'},
{"binary", no_argument, NULL, 'b'},
{"debug", no_argument, NULL, 'd'},
{"version", no_argument, NULL, 'V'},
{"handle-unknown", optional_argument, NULL, 'U'},
{"mls", no_argument, NULL, 'M'},
{"help", no_argument, NULL, 'h'},
{NULL, 0, NULL, 0}
};
while ((ch = getopt(argc, argv, "o:t:dbU:MVc:")) != EOF) {
while ((ch = getopt_long(argc, argv, "o:t:dbU:MVc:h", long_options, NULL)) != -1) {
switch (ch) {
case 'o':
outfile = optarg;
@ -458,6 +469,7 @@ int main(int argc, char **argv)
policyvers = n;
break;
}
case 'h':
default:
usage(argv[0]);
}