From 9e0566104a40a676f420964d3ec40cad136d15a0 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <pebenito@ieee.org>
Date: Sun, 14 Aug 2016 14:34:19 -0400
Subject: [PATCH] Update alsa module use from Guido Trentalancia.

---
 policy/modules/services/xserver.fc  | 1 +
 policy/modules/services/xserver.te  | 4 ++++
 policy/modules/system/init.te       | 2 +-
 policy/modules/system/udev.te       | 2 +-
 policy/modules/system/userdomain.if | 4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc
index f80e919ce..e588faba2 100644
--- a/policy/modules/services/xserver.fc
+++ b/policy/modules/services/xserver.fc
@@ -74,6 +74,7 @@ HOME_DIR/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
 /usr/lib/xorg/Xorg\.wrap	--	gen_context(system_u:object_r:xserver_exec_t,s0)
 /usr/lib/xorg-server/Xorg	--	gen_context(system_u:object_r:xserver_exec_t,s0)
 /usr/lib/xorg-server/Xorg\.wrap	--	gen_context(system_u:object_r:xserver_exec_t,s0)
+/usr/lib/X11/xdm/Xsession	--	gen_context(system_u:object_r:xsession_exec_t,s0)
 
 /usr/sbin/lightdm	--	gen_context(system_u:object_r:xdm_exec_t,s0)
 
diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te
index 8be1b0d71..b349f30df 100644
--- a/policy/modules/services/xserver.te
+++ b/policy/modules/services/xserver.te
@@ -506,6 +506,10 @@ optional_policy(`
 	alsa_domtrans(xdm_t)
 ')
 
+optional_policy(`
+	colord_dbus_chat(xdm_t)
+')
+
 optional_policy(`
 	consolekit_dbus_chat(xdm_t)
 ')
diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
index 58004c465..a1525c8ce 100644
--- a/policy/modules/system/init.te
+++ b/policy/modules/system/init.te
@@ -697,7 +697,7 @@ ifdef(`distro_redhat',`
 	miscfiles_read_hwdata(initrc_t)
 
 	optional_policy(`
-		alsa_manage_rw_config(initrc_t)
+		alsa_manage_config(initrc_t)
 	')
 
 	optional_policy(`
diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te
index a591f0b6e..11164d8a6 100644
--- a/policy/modules/system/udev.te
+++ b/policy/modules/system/udev.te
@@ -234,7 +234,7 @@ ifdef(`init_systemd',`
 optional_policy(`
 	alsa_domtrans(udev_t)
 	alsa_read_lib(udev_t)
-	alsa_read_rw_config(udev_t)
+	alsa_read_config(udev_t)
 ')
 
 optional_policy(`
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index 51c2fca3e..a8a1f56a7 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -579,7 +579,7 @@ template(`userdom_common_user_template',`
 	optional_policy(`
 		alsa_home_filetrans_alsa_home($1_t, file, ".asoundrc")
 		alsa_manage_home_files($1_t)
-		alsa_read_rw_config($1_t)
+		alsa_read_config($1_t)
 		alsa_relabel_home_files($1_t)
 	')
 
@@ -954,7 +954,7 @@ template(`userdom_restricted_xwindows_user_template',`
 	xserver_restricted_role($1_r, $1_t)
 
 	optional_policy(`
-		alsa_read_rw_config($1_t)
+		alsa_read_config($1_t)
 	')
 
 	optional_policy(`