From 7f4005e3481cf0540f093b172d9c2b9b107d9716 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Tue, 24 Jun 2008 12:57:06 +0000
Subject: [PATCH] trunk: fix up stored procedure naming patch from kaigai.

---
 policy/modules/services/postgresql.if | 22 +++++++++++-----------
 policy/modules/services/postgresql.te | 14 +++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/policy/modules/services/postgresql.if b/policy/modules/services/postgresql.if
index 7bf8152d..489356ab 100644
--- a/policy/modules/services/postgresql.if
+++ b/policy/modules/services/postgresql.if
@@ -37,7 +37,7 @@ template(`postgresql_userdom_template',`
 		attribute sepgsql_client_type, sepgsql_database_type;
 		attribute sepgsql_sysobj_table_type;
 
-		type sepgsql_trusted_proc_t, sepgsql_trusted_domain_t;
+		type sepgsql_trusted_proc_exec_t, sepgsql_trusted_proc_t;
 	')
 
 	########################################
@@ -50,8 +50,8 @@ template(`postgresql_userdom_template',`
 	type $1_sepgsql_blob_t;
 	postgresql_blob_object($1_sepgsql_blob_t)
 
-	type $1_sepgsql_proc_t;
-	postgresql_procedure_object($1_sepgsql_proc_t)
+	type $1_sepgsql_proc_exec_t;
+	postgresql_procedure_object($1_sepgsql_proc_exec_t)
 
 	type $1_sepgsql_sysobj_t;
 	postgresql_system_table_object($1_sepgsql_sysobj_t)
@@ -59,7 +59,7 @@ template(`postgresql_userdom_template',`
 	type $1_sepgsql_table_t;
 	postgresql_table_object($1_sepgsql_table_t)
 
-	role $3 types sepgsql_trusted_domain_t;
+	role $3 types sepgsql_trusted_proc_t;
 
 	##############################
 	#
@@ -81,14 +81,14 @@ template(`postgresql_userdom_template',`
 	allow $2 $1_sepgsql_table_t  : db_tuple  { use select update insert delete };
 	allow $2 $1_sepgsql_sysobj_t : db_tuple  { use select };
 
-	allow $2 $1_sepgsql_proc_t : db_procedure { create drop getattr setattr execute };
-	type_transition $2 sepgsql_database_type:db_procedure $1_sepgsql_proc_t;
+	allow $2 $1_sepgsql_proc_exec_t : db_procedure { create drop getattr setattr execute };
+	type_transition $2 sepgsql_database_type:db_procedure $1_sepgsql_proc_exec_t;
 
 	allow $2 $1_sepgsql_blob_t : db_blob { create drop getattr setattr read write };
 	type_transition $2 sepgsql_database_type:db_blob $1_sepgsql_blob_t;
 
-	allow $2 sepgsql_trusted_domain_t:process transition;
-	type_transition $2 sepgsql_trusted_proc_t:process sepgsql_trusted_domain_t;
+	allow $2 sepgsql_trusted_proc_t:process transition;
+	type_transition $2 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
 ')
 
 ########################################
@@ -343,7 +343,7 @@ interface(`postgresql_unpriv_client',`
 
 		type sepgsql_db_t, sepgsql_table_t, sepgsql_proc_t, sepgsql_blob_t;
 
-		type sepgsql_trusted_proc_t, sepgsql_trusted_domain_t;
+		type sepgsql_trusted_proc_t, sepgsql_trusted_proc_exec_t;
 	')
 
 	typeattribute $1 sepgsql_client_type;
@@ -352,8 +352,8 @@ interface(`postgresql_unpriv_client',`
 	type_transition $1 sepgsql_db_t:db_procedure sepgsql_proc_t;
 	type_transition $1 sepgsql_db_t:db_blob sepgsql_blob_t;
 
-	type_transition $1 sepgsql_trusted_proc_t:process sepgsql_trusted_domain_t;
-	allow $1 sepgsql_trusted_domain_t:process transition;
+	type_transition $1 sepgsql_trusted_proc_exec_t:process sepgsql_trusted_proc_t;
+	allow $1 sepgsql_trusted_proc_t:process transition;
 ')
 
 ########################################
diff --git a/policy/modules/services/postgresql.te b/policy/modules/services/postgresql.te
index 1ba4c414..b0e3d705 100644
--- a/policy/modules/services/postgresql.te
+++ b/policy/modules/services/postgresql.te
@@ -1,5 +1,5 @@
 
-policy_module(postgresql, 1.5.2)
+policy_module(postgresql, 1.5.3)
 
 gen_require(`
 	class db_database all_db_database_perms;
@@ -87,14 +87,14 @@ postgresql_system_table_object(sepgsql_sysobj_t)
 type sepgsql_table_t;
 postgresql_table_object(sepgsql_table_t)
 
-type sepgsql_trusted_proc_t;
-postgresql_procedure_object(sepgsql_trusted_proc_t)
+type sepgsql_trusted_proc_exec_t;
+postgresql_procedure_object(sepgsql_trusted_proc_exec_t)
 
 # Trusted Procedure Domain
-type sepgsql_trusted_domain_t;
-domain_type(sepgsql_trusted_domain_t)
-postgresql_unconfined(sepgsql_trusted_domain_t)
-role system_r types sepgsql_trusted_domain_t;
+type sepgsql_trusted_proc_t;
+domain_type(sepgsql_trusted_proc_t)
+postgresql_unconfined(sepgsql_trusted_proc_t)
+role system_r types sepgsql_trusted_proc_t;
 
 ########################################
 #