Rearrange new xserver interfaces.

policy/modules/services/xserver.if

@@ -711,26 +711,6 @@ interface(`xserver_dontaudit_rw_xdm_pipes',`
 	dontaudit $1 xdm_t:fifo_file rw_fifo_file_perms; 
 ')
 
-########################################
-## <summary>
-##	Create, read, write, and delete
-##	xdm_spool files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`xserver_manage_spool_files_xdm',`
-	gen_require(`
-		type xdm_spool_t;
-	')
-
-	files_search_spool($1)
-	manage_files_pattern($1, xdm_spool_t, xdm_spool_t)
-')
-
 ########################################
 ## <summary>
 ##	Read xdm process state files.
@@ -752,6 +732,26 @@ interface(`xserver_read_state_xdm',`
 	allow $1 xdm_t:lnk_file read_lnk_file_perms;
 ')
 
+########################################
+## <summary>
+##	Create, read, write, and delete
+##	xdm_spool files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`xserver_manage_spool_files_xdm',`
+	gen_require(`
+		type xdm_spool_t;
+	')
+
+	files_search_spool($1)
+	manage_files_pattern($1, xdm_spool_t, xdm_spool_t)
+')
+
 ########################################
 ## <summary>
 ##	Connect to XDM over a unix domain