[selinux-policy: 2824/3172] F14

[Daniel J Walsh]

commit f9c5576c27a46fc25d329eb1f82e558ea20e885a
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Aug 26 10:54:59 2010 -0400

    F14

 policy/modules/admin/alsa.fc |   22 +++++++++++-----------
 policy/modules/admin/alsa.if |   17 ++++++++---------
 2 files changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/policy/modules/admin/alsa.fc b/policy/modules/admin/alsa.fc
index 4ea8171..1b43fbe 100644
--- a/policy/modules/admin/alsa.fc
+++ b/policy/modules/admin/alsa.fc
@@ -1,20 +1,20 @@
 HOME_DIR/\.asoundrc		--	gen_context(system_u:object_r:alsa_home_t,s0)
 
-/bin/alsaunmute			--	gen_context(system_u:object_r:alsa_exec_t,s0)
+/bin/alsaunmute		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 
-/etc/alsa/asound\.state		--	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
-/etc/alsa/pcm(/.*)?			gen_context(system_u:object_r:alsa_etc_rw_t,s0)
-/etc/asound(/.*)?			gen_context(system_u:object_r:alsa_etc_rw_t,s0)
-/etc/asound\.state		--	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/etc/alsa/asound\.state	--	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/etc/asound(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/etc/asound\.state	--	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
 
-/sbin/alsactl 			--	gen_context(system_u:object_r:alsa_exec_t,s0)
-/sbin/salsa 			--	gen_context(system_u:object_r:alsa_exec_t,s0)
+/sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
+/sbin/salsa 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 
-/usr/bin/ainit 			--	gen_context(system_u:object_r:alsa_exec_t,s0)
+/usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 
 ifdef(`distro_debian', `
-/usr/share/alsa/alsa\.conf		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
-/usr/share/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/usr/share/alsa/alsa\.conf	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/usr/share/alsa/pcm(/.*)?	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
 ')
 
-/var/lib/alsa(/.*)?			gen_context(system_u:object_r:alsa_var_lib_t,s0)
+/var/lib/alsa(/.*)?		gen_context(system_u:object_r:alsa_var_lib_t,s0)
diff --git a/policy/modules/admin/alsa.if b/policy/modules/admin/alsa.if
index 12b0452..1d6107a 100644
--- a/policy/modules/admin/alsa.if
+++ b/policy/modules/admin/alsa.if
@@ -1,9 +1,8 @@
-## <summary>Advanced Linux Sound Architecture.</summary>
+## <summary>Ainit ALSA configuration tool</summary>
 
 ########################################
 ## <summary>
-##	Execute a domain transition to
-##	run Alsa.
+##	Domain transition to alsa
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -22,7 +21,7 @@ interface(`alsa_domtrans',`
 
 ########################################
 ## <summary>
-##	Read and write Alsa semaphores.
+##	Read and write access to alsa semaphores.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -40,7 +39,7 @@ interface(`alsa_rw_semaphores',`
 
 ########################################
 ## <summary>
-##	Read and write Alsa shared memory.
+##     Allow read and write access to alsa shared memory.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58,7 +57,7 @@ interface(`alsa_rw_shared_mem',`
 
 ########################################
 ## <summary>
-##	Read Alsa writable config files.
+##	Read alsa writable config files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79,7 +78,7 @@ interface(`alsa_read_rw_config',`
 
 ########################################
 ## <summary>
-##	Manage Alsa writable config files.
+##	Manage alsa writable config files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -100,7 +99,7 @@ interface(`alsa_manage_rw_config',`
 
 ########################################
 ## <summary>
-##	Read Alsa lib files.
+##	Read alsa lib files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -119,7 +118,7 @@ interface(`alsa_read_lib',`
 
 ########################################
 ## <summary>
-##	Read Alsa home files.
+##	Read alsa home files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>