From 36d83cb6513c80e9f8efba9c7962aab530527e0b Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Sep 08 2010 13:10:48 +0000
Subject: cleanup alsa patch to match upstream


---

diff --git a/policy/modules/admin/alsa.if b/policy/modules/admin/alsa.if
index c5e156e..69aa742 100644
--- a/policy/modules/admin/alsa.if
+++ b/policy/modules/admin/alsa.if
@@ -74,7 +74,6 @@ interface(`alsa_read_rw_config',`
 	allow $1 alsa_etc_rw_t:dir list_dir_perms;
 	read_files_pattern($1, alsa_etc_rw_t, alsa_etc_rw_t)
 	read_lnk_files_pattern($1, alsa_etc_rw_t, alsa_etc_rw_t)
-	files_search_etc($1)
 
 	ifdef(`distro_debian',`
 		files_search_usr($1)
@@ -100,7 +99,6 @@ interface(`alsa_manage_rw_config',`
 	allow $1 alsa_etc_rw_t:dir list_dir_perms;
 	manage_files_pattern($1, alsa_etc_rw_t, alsa_etc_rw_t)
 	read_lnk_files_pattern($1, alsa_etc_rw_t, alsa_etc_rw_t)
-	files_search_etc($1)
 
 	ifdef(`distro_debian',`
 		files_search_usr($1)
@@ -124,7 +122,6 @@ interface(`alsa_read_home_files',`
 
 	userdom_search_user_home_dirs($1)
 	allow $1 alsa_home_t:file read_file_perms;
->>>>>>> .merge_file_D1FKe3
 ')
 
 ########################################
@@ -144,5 +141,4 @@ interface(`alsa_read_lib',`
 
 	files_search_var_lib($1)
 	read_files_pattern($1, alsa_var_lib_t, alsa_var_lib_t)
-	files_search_var_lib($1)
 ')