From 507000a1db596b4fd08aba1edc46e0688a32358f Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Aug 26 2010 15:03:50 +0000
Subject: reset


---

diff --git a/policy/modules/admin/amanda.if b/policy/modules/admin/amanda.if
index d1d035e..2cb11ea 100644
--- a/policy/modules/admin/amanda.if
+++ b/policy/modules/admin/amanda.if
@@ -1,8 +1,9 @@
-## <summary>Automated backup program.</summary>
+## <summary>Advanced Maryland Automatic Network Disk Archiver.</summary>
 
 ########################################
 ## <summary>
-##	Execute amrecover in the amanda_recover domain.
+##	Execute a domain transition to
+##	run Amanda Recover.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -16,12 +17,15 @@ interface(`amanda_domtrans_recover',`
 	')
 
 	domtrans_pattern($1, amanda_recover_exec_t, amanda_recover_t)
+	corecmd_search_bin($1)
 ')
 
 ########################################
 ## <summary>
-##	Execute amrecover in the amanda_recover domain, and
-##	allow the specified role the amanda_recover domain.
+##	Execute a domain transition to
+##	run Amanda Recover and allow the
+##	specified role the Amanda Recover
+##	domain.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -46,7 +50,7 @@ interface(`amanda_run_recover',`
 
 ########################################
 ## <summary>
-##	Search amanda library directories.
+##	Search Amanda lib directories.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61,11 +65,13 @@ interface(`amanda_search_lib',`
 
 	allow $1 amanda_usr_lib_t:dir search_dir_perms;
 	files_search_usr($1)
+	libs_search_lib($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to read /etc/dumpdates.
+##	Do not audit attempts to read
+##	dumpdates files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78,12 +84,12 @@ interface(`amanda_dontaudit_read_dumpdates',`
 		type amanda_dumpdates_t;
 	')
 
-	dontaudit $1 amanda_dumpdates_t:file { getattr read };
+	dontaudit $1 amanda_dumpdates_t:file read_file_perms;
 ')
 
 ########################################
 ## <summary>
-##	Allow read/writing /etc/dumpdates.
+##	Read and write dumpdates files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -97,11 +103,12 @@ interface(`amanda_rw_dumpdates_files',`
 	')
 
 	allow $1 amanda_dumpdates_t:file rw_file_perms;
+	files_search_etc($1)
 ')
 
 ########################################
 ## <summary>
-##	Search amanda library directories.
+##	Search Amanda lib directories.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -116,11 +123,12 @@ interface(`amanda_manage_lib',`
 
 	allow $1 amanda_usr_lib_t:dir manage_dir_perms;
 	files_search_usr($1)
+	libs_search_lib($1)
 ')
 
 ########################################
 ## <summary>
-##	Allow read/writing amanda logs
+##	Read and write Amanda logs.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -134,11 +142,12 @@ interface(`amanda_append_log_files',`
 	')
 
 	allow $1 amanda_log_t:file { read_file_perms append_file_perms };
+	logging_search_logs($1)
 ')
 
 #######################################
 ## <summary>
-##	Search amanda var library directories.
+##	Search Amanda lib directories.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -151,7 +160,6 @@ interface(`amanda_search_var_lib',`
 		type amanda_var_lib_t;
 	')
 
-	files_search_var_lib($1)
 	allow $1 amanda_var_lib_t:dir search_dir_perms;
-
+	files_search_var_lib($1)
 ')