From 53da70cdaaa2ed6d10f08961345545cf9cf1415e Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Fri, 16 Nov 2007 15:39:55 +0000
Subject: [PATCH] trunk: deprecate seutil_manage_selinux_config() in favor of
 correctly named seutil_manage_config().

---
 policy/modules/system/selinuxutil.if | 29 +++++++++++++++++++++++++++-
 policy/modules/system/selinuxutil.te |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/policy/modules/system/selinuxutil.if b/policy/modules/system/selinuxutil.if
index 9bf41d40f..fac0f2274 100644
--- a/policy/modules/system/selinuxutil.if
+++ b/policy/modules/system/selinuxutil.if
@@ -651,6 +651,33 @@ interface(`seutil_rw_config',`
 	rw_files_pattern($1,selinux_config_t,selinux_config_t)
 ')
 
+#######################################
+## <summary>
+##	Create, read, write, and delete
+##	the general selinux configuration files.  (Deprecated)
+## </summary>
+## <desc>
+##	<p>
+##	Create, read, write, and delete
+##	the general selinux configuration files.
+##	</p>
+##	<p>
+##	This interface has been deprecated, please
+##	use the seutil_manage_config() interface instead.
+##	</p>
+## </desc>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`seutil_manage_selinux_config',`
+	refpolicywarn(`$0($*) has been deprecated.  Please use seutil_manage_config() instead.')
+	seutil_manage_config($1)
+')
+
 #######################################
 ## <summary>
 ##	Create, read, write, and delete
@@ -663,7 +690,7 @@ interface(`seutil_rw_config',`
 ## </param>
 ## <rolecap/>
 #
-interface(`seutil_manage_selinux_config',`
+interface(`seutil_manage_config',`
 	gen_require(`
 		type selinux_config_t;
 	')
diff --git a/policy/modules/system/selinuxutil.te b/policy/modules/system/selinuxutil.te
index 13f3daf46..03c57569a 100644
--- a/policy/modules/system/selinuxutil.te
+++ b/policy/modules/system/selinuxutil.te
@@ -1,5 +1,5 @@
 
-policy_module(selinuxutil,1.7.2)
+policy_module(selinuxutil,1.7.3)
 
 gen_require(`
 	bool secure_mode;