From d62a4335e120f3f385575c25d20e2198b69ac3c1 Mon Sep 17 00:00:00 2001
From: Miroslav Grepl <mgrepl@redhat.com>
Date: Tue, 1 Nov 2011 06:30:50 +0000
Subject: [PATCH] remove temporary fixes

---
 policy/modules/apps/livecd.te   | 14 +++++++-------
 policy/modules/kernel/domain.te | 32 ++++++++++++++++++++++++--------
 policy/modules/kernel/kernel.te | 18 +++++++++---------
 policy/modules/system/init.te   |  6 +++---
 4 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/policy/modules/apps/livecd.te b/policy/modules/apps/livecd.te
index 9fcc9dfe..3e196988 100644
--- a/policy/modules/apps/livecd.te
+++ b/policy/modules/apps/livecd.te
@@ -27,15 +27,15 @@ manage_dirs_pattern(livecd_t, livecd_tmp_t, livecd_tmp_t)
 manage_files_pattern(livecd_t, livecd_tmp_t, livecd_tmp_t)
 files_tmp_filetrans(livecd_t, livecd_tmp_t, { dir file })
 
-dev_filetrans_all_named_dev(livecd_t)
-storage_filetrans_all_named_dev(livecd_t)
-term_filetrans_all_named_dev(livecd_t)
+#dev_filetrans_all_named_dev(livecd_t)
+#storage_filetrans_all_named_dev(livecd_t)
+#term_filetrans_all_named_dev(livecd_t)
 
-sysnet_filetrans_named_content(livecd_t)
+#sysnet_filetrans_named_content(livecd_t)
 
-optional_policy(`
-	ssh_filetrans_admin_home_content(livecd_t)
-')
+#optional_policy(`
+#	ssh_filetrans_admin_home_content(livecd_t)
+#')
 
 optional_policy(`
 	unconfined_domain_noaudit(livecd_t)
diff --git a/policy/modules/kernel/domain.te b/policy/modules/kernel/domain.te
index 331961c4..9e750dcd 100644
--- a/policy/modules/kernel/domain.te
+++ b/policy/modules/kernel/domain.te
@@ -200,21 +200,37 @@ dev_filetrans_all_named_dev(unconfined_domain_type)
 # receive from all domains over labeled networking
 domain_all_recvfrom_all_domains(unconfined_domain_type)
 
-storage_filetrans_all_named_dev(unconfined_domain_type)
+optional_policy(`
+	storage_filetrans_all_named_dev(unconfined_domain_type)
+')
 
-term_filetrans_all_named_dev(unconfined_domain_type)
+optional_policy(`
+	term_filetrans_all_named_dev(unconfined_domain_type)
+')
 
-authlogin_filetrans_named_content(unconfined_domain_type)
+optional_policy(`
+	authlogin_filetrans_named_content(unconfined_domain_type)
+')
 
-libs_filetrans_named_content(unconfined_domain_type)
+optional_policy(`
+	libs_filetrans_named_content(unconfined_domain_type)
+')
 
-miscfiles_filetrans_named_content(unconfined_domain_type)
+optional_policy(`
+	miscfiles_filetrans_named_content(unconfined_domain_type)
+')
 
-modules_filetrans_named_content(unconfined_domain_type)
+optional_policy(`
+	modules_filetrans_named_content(unconfined_domain_type)
+')
 
-sysnet_filetrans_named_content(unconfined_domain_type)
+optional_policy(`
+	sysnet_filetrans_named_content(unconfined_domain_type)
+')
 
-userdom_user_home_dir_filetrans_user_home_content(unconfined_domain_type, { dir file lnk_file fifo_file sock_file })
+optional_policy(`
+	userdom_user_home_dir_filetrans_user_home_content(unconfined_domain_type, { dir file lnk_file fifo_file sock_file })
+')
 
 optional_policy(`
 	alsa_filetrans_named_content(unconfined_domain_type)
diff --git a/policy/modules/kernel/kernel.te b/policy/modules/kernel/kernel.te
index 5428bc18..2225d294 100644
--- a/policy/modules/kernel/kernel.te
+++ b/policy/modules/kernel/kernel.te
@@ -305,9 +305,9 @@ ifdef(`distro_redhat',`
 ')
 
 
-optional_policy(`
-	apache_filetrans_home_content(kernel_t)
-')
+#optional_policy(`
+#	apache_filetrans_home_content(kernel_t)
+#')
 
 optional_policy(`
 	gnome_filetrans_home_content(kernel_t)
@@ -336,9 +336,9 @@ optional_policy(`
 	logging_manage_generic_logs(kernel_t)
 ')
 
-optional_policy(`
-	mta_filetrans_home_content(kernel_t)
-')
+#optional_policy(`
+#	mta_filetrans_home_content(kernel_t)
+#')
 
 optional_policy(`
 	ssh_filetrans_home_content(kernel_t)
@@ -405,9 +405,9 @@ optional_policy(`
 	unconfined_domain_noaudit(kernel_t)
 ')
 
-optional_policy(`
-	virt_filetrans_home_content(kernel_t)
-')
+#optional_policy(`
+#	virt_filetrans_home_content(kernel_t)
+#')
 
 optional_policy(`
 	xserver_xdm_manage_spool(kernel_t)
diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
index 29930e44..d9bca8c8 100644
--- a/policy/modules/system/init.te
+++ b/policy/modules/system/init.te
@@ -162,7 +162,7 @@ dev_read_sysfs(init_t)
 dev_read_urand(init_t)
 # Early devtmpfs
 dev_rw_generic_chr_files(init_t)
-dev_filetrans_all_named_dev(init_t)
+#dev_filetrans_all_named_dev(init_t)
 
 domain_getpgid_all_domains(init_t)
 domain_kill_all_domains(init_t)
@@ -513,7 +513,7 @@ dev_delete_generic_symlinks(initrc_t)
 dev_getattr_all_blk_files(initrc_t)
 dev_getattr_all_chr_files(initrc_t)
 dev_rw_xserver_misc(initrc_t)
-dev_filetrans_all_named_dev(initrc_t)
+#dev_filetrans_all_named_dev(initrc_t)
 
 domain_kill_all_domains(initrc_t)
 domain_signal_all_domains(initrc_t)
@@ -797,7 +797,7 @@ ifdef(`distro_redhat',`
 		sysnet_relabelfrom_dhcpc_state(initrc_t)
 		sysnet_relabelfrom_net_conf(initrc_t)
 		sysnet_relabelto_net_conf(initrc_t)
-		sysnet_filetrans_named_content(initrc_t)
+		#sysnet_filetrans_named_content(initrc_t)
 	')
 
 	optional_policy(`
-- 
2.47.3