From 6dadd3995eee708d37ae45a398f3fe5692b91fda Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Feb 25 2010 13:32:22 +0000
Subject: Rearrange files interfaces.


---

diff --git a/policy/modules/kernel/files.if b/policy/modules/kernel/files.if
index 704dec7..3e97ca8 100644
--- a/policy/modules/kernel/files.if
+++ b/policy/modules/kernel/files.if
@@ -40,6 +40,27 @@ interface(`files_type',`
 
 ########################################
 ## <summary>
+##	Make the specified type a file that
+##	should not be dontaudited from
+##	browsing from user domains.
+## </summary>
+## <param name="file_type">
+##	<summary>
+##	Type of the file to be used as a
+##	member directory.
+##	</summary>
+## </param>
+#
+interface(`files_security_file',`
+	gen_require(`
+		attribute file_type, security_file_type;
+	')
+
+	typeattribute $1 file_type, security_file_type;
+')
+
+########################################
+## <summary>
 ##	Make the specified type usable for
 ##	lock files.
 ## </summary>
@@ -81,6 +102,26 @@ interface(`files_mountpoint',`
 ########################################
 ## <summary>
 ##	Make the specified type usable for
+##	security file filesystem mount points.
+## </summary>
+## <param name="type">
+##	<summary>
+##	Type to be used for mount points.
+##	</summary>
+## </param>
+#
+interface(`files_security_mountpoint',`
+	gen_require(`
+		attribute mountpoint;
+	')
+
+	files_security_file($1)
+	typeattribute $1 mountpoint;
+')
+
+########################################
+## <summary>
+##	Make the specified type usable for
 ##	runtime process ID files.
 ## </summary>
 ## <param name="type">
@@ -208,47 +249,6 @@ interface(`files_poly_member_tmp',`
 
 ########################################
 ## <summary>
-##	Make the specified type a file that
-##	should not be dontaudited from
-##	browsing from user domains.
-## </summary>
-## <param name="file_type">
-##	<summary>
-##	Type of the file to be used as a
-##	member directory.
-##	</summary>
-## </param>
-#
-interface(`files_security_file',`
-	gen_require(`
-		attribute file_type, security_file_type;
-	')
-
-	typeattribute $1 file_type, security_file_type;
-')
-
-########################################
-## <summary>
-##	Make the specified type usable for
-##	security file filesystem mount points.
-## </summary>
-## <param name="type">
-##	<summary>
-##	Type to be used for mount points.
-##	</summary>
-## </param>
-#
-interface(`files_security_mountpoint',`
-	gen_require(`
-		attribute mountpoint;
-	')
-
-	files_security_file($1)
-	typeattribute $1 mountpoint;
-')
-
-########################################
-## <summary>
 ##	Make the specified type a file
 ##	used for temporary files.
 ## </summary>