From eb5e237573646fadf617f471e0c593a7bfafce7c Mon Sep 17 00:00:00 2001
From: Karl MacMillan <kmacmillan@tresys.com>
Date: Wed, 8 Jun 2005 20:23:12 +0000
Subject: [PATCH] Renamed support macros for consistency.

---
 .../policy/support/{support_macros => misc_macros.spt} | 10 +---------
 .../policy/support/{sets.spt => obj_perm_sets.spt}     |  4 +++-
 2 files changed, 4 insertions(+), 10 deletions(-)
 rename refpolicy/policy/support/{support_macros => misc_macros.spt} (58%)
 rename refpolicy/policy/support/{sets.spt => obj_perm_sets.spt} (96%)

diff --git a/refpolicy/policy/support/support_macros b/refpolicy/policy/support/misc_macros.spt
similarity index 58%
rename from refpolicy/policy/support/support_macros
rename to refpolicy/policy/support/misc_macros.spt
index 1f2ea80b..37f25d93 100644
--- a/refpolicy/policy/support/support_macros
+++ b/refpolicy/policy/support/misc_macros.spt
@@ -13,16 +13,8 @@ define(`shiftn',`ifelse($1,0,`shift($*)',`shiftn(decr($1),shift(shift($*)))')')
 
 ########################################
 #
-# context_template(context,sensitivity)
+# gen_con(context,sensitivity)
 #
 # Optionally put the sensitivity for the file
 #
 define(`context_template',`ifdef(`enable_mls',`$1:$2',`$1')') dnl
-
-########################################
-#
-# user_mls(level,range)
-#
-define(`user_mls',`ifdef(`enable_mls',`level $1 range $2')') dnl
-
-define(`can_exec',`allow $1 $2:file { getattr read execute execute_no_trans };')
diff --git a/refpolicy/policy/support/sets.spt b/refpolicy/policy/support/obj_perm_sets.spt
similarity index 96%
rename from refpolicy/policy/support/sets.spt
rename to refpolicy/policy/support/obj_perm_sets.spt
index 9d26d802..f85c9284 100644
--- a/refpolicy/policy/support/sets.spt
+++ b/refpolicy/policy/support/obj_perm_sets.spt
@@ -1,7 +1,9 @@
 ########################################
 # 
-# Macros for sets of object classes
+# Support macros for sets of object classes and permissions
 #
+# This file should only have object class and permission set macros - they
+# can only reference object classes and/or permissions.
 
 #
 # All directory and file classes