From 2292766cea77f043738d4832e7c512323244c997 Mon Sep 17 00:00:00 2001
From: Miroslav Grepl <mgrepl@redhat.com>
Date: Feb 27 2012 13:23:41 +0000
Subject: Fix mysql interface naming


---

diff --git a/policy-F16.patch b/policy-F16.patch
index 2b27688..ca45e96 100644
--- a/policy-F16.patch
+++ b/policy-F16.patch
@@ -16477,7 +16477,7 @@ index 6a1e4d1..3ded83e 100644
 +	dontaudit $1 domain:socket_class_set { read write };
  ')
 diff --git a/policy/modules/kernel/domain.te b/policy/modules/kernel/domain.te
-index fae1ab1..4796e9b 100644
+index fae1ab1..5781edf 100644
 --- a/policy/modules/kernel/domain.te
 +++ b/policy/modules/kernel/domain.te
 @@ -4,6 +4,21 @@ policy_module(domain, 1.9.1)
@@ -16635,7 +16635,7 @@ index fae1ab1..4796e9b 100644
 +')
 +
 +optional_policy(`
-+	mysqld_filetrans_named_content(unconfined_domain_type)
++	mysql_filetrans_named_content(unconfined_domain_type)
 +')
 +
 +optional_policy(`
@@ -21939,7 +21939,7 @@ index 2be17d2..e47e0f0 100644
 +	userdom_execmod_user_home_files(staff_usertype)
 +')
 diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
-index e14b961..1058bf4 100644
+index e14b961..d1c4fc4 100644
 --- a/policy/modules/roles/sysadm.te
 +++ b/policy/modules/roles/sysadm.te
 @@ -24,20 +24,52 @@ ifndef(`enable_mls',`
@@ -22129,7 +22129,7 @@ index e14b961..1058bf4 100644
  
  optional_policy(`
  	mysql_stream_connect(sysadm_t)
-+	mysqld_filetrans_named_content(sysadm_t)
++	mysql_filetrans_named_content(sysadm_t)
 +')
 +
 +optional_policy(`
@@ -46094,7 +46094,7 @@ index cc7192c..eeb72ba 100644
  #
  /etc/my\.cnf		--	gen_context(system_u:object_r:mysqld_etc_t,s0)
 diff --git a/policy/modules/services/mysql.if b/policy/modules/services/mysql.if
-index e9c0982..ffbf2d0 100644
+index e9c0982..14d2939 100644
 --- a/policy/modules/services/mysql.if
 +++ b/policy/modules/services/mysql.if
 @@ -18,6 +18,24 @@ interface(`mysql_domtrans',`
@@ -46207,7 +46207,7 @@ index e9c0982..ffbf2d0 100644
 +##	</summary>
 +## </param>
 +#
-+interface(`mysqld_systemctl',`
++interface(`mysql_systemctl',`
 +	gen_require(`
 +		type mysqld_unit_file_t;
 +		type mysqld_t;
@@ -46230,7 +46230,7 @@ index e9c0982..ffbf2d0 100644
 +##	</summary>
 +## </param>
 +#
-+interface(`mysqld_filetrans_named_content',`
++interface(`mysql_filetrans_named_content',`
 +	gen_require(`
 +		type mysqld_home_t;
 +	')
@@ -46281,7 +46281,7 @@ index e9c0982..ffbf2d0 100644
 +	files_list_root($1)
 +	admin_pattern($1, mysqld_home_t)
 +
-+	mysqld_systemctl($1)
++	mysql_systemctl($1)
 +
 +	mysql_stream_connect($1)
  ')
@@ -77663,7 +77663,7 @@ index db75976..ce61aed 100644
 +
 +/var/run/user(/.*)?	gen_context(system_u:object_r:user_tmp_t,s0)
 diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
-index 4b2878a..050c81a 100644
+index 4b2878a..e03d9fb 100644
 --- a/policy/modules/system/userdomain.if
 +++ b/policy/modules/system/userdomain.if
 @@ -30,9 +30,11 @@ template(`userdom_base_user_template',`
@@ -78616,7 +78616,7 @@ index 4b2878a..050c81a 100644
 -		cups_read_config($1_t)
 -		cups_stream_connect($1_t)
 -		cups_stream_connect_ptal($1_t)
-+		mysqld_filetrans_named_content($1_usertype)
++		mysql_filetrans_named_content($1_usertype)
  	')
  
  	optional_policy(`