Fix help message on sesearch -D

This commit is contained in:
Dan Walsh 2013-07-19 06:49:49 -04:00
parent af4b0ecbe6
commit 7d9f204bf2
2 changed files with 16 additions and 4 deletions

View File

@ -1,6 +1,6 @@
diff -up setools-3.3.7/man/sesearch.1.cmdline setools-3.3.7/man/sesearch.1 diff -up setools-3.3.7/man/sesearch.1.cmdline setools-3.3.7/man/sesearch.1
--- setools-3.3.7/man/sesearch.1.cmdline 2008-02-22 14:06:28.000000000 -0500 --- setools-3.3.7/man/sesearch.1.cmdline 2008-02-22 14:06:28.000000000 -0500
+++ setools-3.3.7/man/sesearch.1 2013-06-15 08:47:02.099728083 -0400 +++ setools-3.3.7/man/sesearch.1 2013-07-19 06:46:21.314068667 -0400
@@ -43,7 +43,7 @@ Search for allow rules. @@ -43,7 +43,7 @@ Search for allow rules.
Search for neverallow rules. Search for neverallow rules.
.IP "--auditallow" .IP "--auditallow"
@ -11,8 +11,8 @@ diff -up setools-3.3.7/man/sesearch.1.cmdline setools-3.3.7/man/sesearch.1
.IP "-T, --type" .IP "-T, --type"
Search for type_transition, type_member, and type_change rules. Search for type_transition, type_member, and type_change rules.
diff -up setools-3.3.7/secmds/sesearch.c.cmdline setools-3.3.7/secmds/sesearch.c diff -up setools-3.3.7/secmds/sesearch.c.cmdline setools-3.3.7/secmds/sesearch.c
--- setools-3.3.7/secmds/sesearch.c.cmdline 2013-06-15 08:47:02.096728078 -0400 --- setools-3.3.7/secmds/sesearch.c.cmdline 2013-07-19 06:46:21.291068510 -0400
+++ setools-3.3.7/secmds/sesearch.c 2013-06-17 13:41:01.623234084 -0400 +++ setools-3.3.7/secmds/sesearch.c 2013-07-19 06:48:12.962830868 -0400
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
*/ */
@ -40,6 +40,15 @@ diff -up setools-3.3.7/secmds/sesearch.c.cmdline setools-3.3.7/secmds/sesearch.c
{"role_source", required_argument, NULL, EXPR_ROLE_SOURCE}, {"role_source", required_argument, NULL, EXPR_ROLE_SOURCE},
{"role_target", required_argument, NULL, EXPR_ROLE_TARGET}, {"role_target", required_argument, NULL, EXPR_ROLE_TARGET},
{"class", required_argument, NULL, 'c'}, {"class", required_argument, NULL, 'c'},
@@ -129,7 +128,7 @@ void usage(const char *program_name, int
printf(" -A, --allow allow rules\n");
printf(" --neverallow neverallow rules\n");
printf(" --auditallow auditallow rules\n");
- printf(" --dontaudit dontaudit rules\n");
+ printf(" -D, --dontaudit dontaudit rules\n");
printf(" -T, --type type_trans, type_member, and type_change\n");
printf(" --role_allow role allow rules\n");
printf(" --role_trans role_transition rules\n");
@@ -666,10 +665,6 @@ static void print_ft_results(const apol_ @@ -666,10 +665,6 @@ static void print_ft_results(const apol_
size_t i, num_filename_trans = 0; size_t i, num_filename_trans = 0;
const qpol_filename_trans_t *filename_trans = NULL; const qpol_filename_trans_t *filename_trans = NULL;

View File

@ -3,7 +3,7 @@
Name: setools Name: setools
Version: %{setools_maj_ver}.%{setools_min_ver} Version: %{setools_maj_ver}.%{setools_min_ver}
Release: 39%{?dist} Release: 40%{?dist}
License: GPLv2 License: GPLv2
URL: http://oss.tresys.com/projects/setools URL: http://oss.tresys.com/projects/setools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -284,6 +284,9 @@ rm -rf ${RPM_BUILD_ROOT}
%postun libs-tcl -p /sbin/ldconfig %postun libs-tcl -p /sbin/ldconfig
%changelog %changelog
* Fri Jul 19 2013 Dan Walsh <dwalsh@redhat.com> - 3.3.7-40
- Fix help message on sesearch -D
* Thu May 16 2013 Dan Walsh <dwalsh@redhat.com> - 3.3.7-39 * Thu May 16 2013 Dan Walsh <dwalsh@redhat.com> - 3.3.7-39
- Remove --default and --audit from sesearch - Remove --default and --audit from sesearch
- Make -D == --dontaudit in sesearch - Make -D == --dontaudit in sesearch