From 5cbb573fa5f9fc7dd0f866d64b9968c240a96874 Mon Sep 17 00:00:00 2001 From: Joshua Brindle Date: Mon, 5 Jan 2009 13:33:03 -0500 Subject: [PATCH] Author: Daniel J Walsh Email: dwalsh@redhat.com Subject: Small fixes for audit2allow Date: Mon, 01 Dec 2008 15:19:09 -0500 Signed-off-by: Joshua Brindle --- policycoreutils/audit2allow/audit2allow | 10 +++++----- policycoreutils/audit2allow/audit2allow.1 | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/policycoreutils/audit2allow/audit2allow b/policycoreutils/audit2allow/audit2allow index 11aaaedb..91869656 100644 --- a/policycoreutils/audit2allow/audit2allow +++ b/policycoreutils/audit2allow/audit2allow @@ -42,10 +42,10 @@ class AuditToPolicy: from optparse import OptionParser parser = OptionParser(version=self.VERSION) - parser.add_option("-a", "--audit", action="store_true", dest="audit", default=False, + parser.add_option("-a", "--all", action="store_true", dest="audit", default=False, help="read input from audit log - conflicts with -i") parser.add_option("-d", "--dmesg", action="store_true", dest="dmesg", default=False, - help="read input from dmesg - conflicts with --audit and --input") + help="read input from dmesg - conflicts with --all and --input") parser.add_option("-i", "--input", dest="input", help="read input from - conflicts with -a") parser.add_option("-l", "--lastreload", action="store_true", dest="lastreload", default=False, @@ -82,9 +82,9 @@ class AuditToPolicy: # Make -d, -a, and -i conflict if options.audit is True: if options.input is not None: - sys.stderr.write("error: --audit conflicts with --input\n") + sys.stderr.write("error: --all conflicts with --input\n") if options.dmesg is True: - sys.stderr.write("error: --audit conflicts with --dmesg\n") + sys.stderr.write("error: --all conflicts with --dmesg\n") if options.input is not None and options.dmesg is True: sys.stderr.write("error: --input conflicts with --dmesg\n") @@ -200,7 +200,7 @@ class AuditToPolicy: try: fd = open(filename, "w") except IOError, e: - sys.stderr.write("could not write output file: %s\n", str(e)) + sys.stderr.write("could not write output file: %s\n" % str(e)) sys.exit(1) writer.write(generator.get_module(), fd) diff --git a/policycoreutils/audit2allow/audit2allow.1 b/policycoreutils/audit2allow/audit2allow.1 index 83c0a904..abb8a9ba 100644 --- a/policycoreutils/audit2allow/audit2allow.1 +++ b/policycoreutils/audit2allow/audit2allow.1 @@ -44,9 +44,6 @@ Read input from output of Note that all audit messages are not available via dmesg when auditd is running; use "ausearch -m avc | audit2allow" or "-a" instead. .TP -.B "\-f" | "\-\-fcfile" -Add File Context File to generated Module Package. Requires -M option. -.TP .B "\-h" | "\-\-help" Print a short usage message .TP