Fix interfaces merge issues

dodys · Jan 8, 2013 · b1a5f1e · b1a5f1e
1 parent c056ac4
commit b1a5f1e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/apm.if b/apm.if
@@ -160,6 +160,7 @@ interface(`apmd_systemctl',`
 	allow $1 apmd_unit_file_t:service manage_service_perms;
 
 	ps_process_pattern($1, apmd_t)
+')
 
 ########################################
 ## <summary>
@@ -213,5 +214,4 @@ interface(`apm_admin',`
 	admin_pattern($1, apmd_tmp_t)
 
 	apm_run_client($1, $2)
->>>>>>> 662a00bca8f52af8056f41abd0fdec77ea835b2a
 ')
diff --git a/awstats.if b/awstats.if
@@ -20,25 +20,6 @@ interface(`awstats_domtrans',`
 	domtrans_pattern($1, awstats_exec_t, awstats_t)
 ')
 
-########################################
-## <summary>
-##	Execute the awstats program in the awstats domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`awstats_domtrans',`
-	gen_require(`
-		type awstats_t, awstats_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, awstats_exec_t, awstats_t)
-')
-
 ########################################
 ## <summary>
 ##	Read and write awstats unnamed pipes. (Deprecated)

diff --git a/chronyd.if b/chronyd.if
@@ -155,6 +155,7 @@ interface(`chronyd_systemctl',`
 	allow $1 chronyd_unit_file_t:service manage_service_perms;
 
 	ps_process_pattern($1, chronyd_t)
+')
 
 #######################################
 ## <summary>