[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/

[Sven Vermeulen]

commit:     a87d68a2faa0a075bb115686d31300b1ec0e9aea
Author:     Chris PeBenito <cpebenito <AT> tresys <DOT> com>
AuthorDate: Tue Oct 30 20:11:32 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Tue Oct 30 20:21:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=a87d68a2

Rearrange devices interfaces.

---
 policy/modules/kernel/devices.if |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/policy/modules/kernel/devices.if b/policy/modules/kernel/devices.if
index 6c92734..8d2504b 100644
--- a/policy/modules/kernel/devices.if
+++ b/policy/modules/kernel/devices.if
@@ -4242,7 +4242,7 @@ interface(`dev_read_generic_usb_dev',`
 
 ########################################
 ## <summary>
-##	Relabel generic the USB devices.
+##	Read and write generic the USB devices.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -4250,17 +4250,17 @@ interface(`dev_read_generic_usb_dev',`
 ##	</summary>
 ## </param>
 #
-interface(`dev_relabel_generic_usb_dev',`
+interface(`dev_rw_generic_usb_dev',`
 	gen_require(`
-		type usb_device_t;
+		type device_t, usb_device_t;
 	')
 
-	relabel_chr_files_pattern($1, device_t, usb_device_t)
+	rw_chr_files_pattern($1, device_t, usb_device_t)
 ')
 
 ########################################
 ## <summary>
-##	Read and write generic the USB devices.
+##	Relabel generic the USB devices.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -4268,12 +4268,12 @@ interface(`dev_relabel_generic_usb_dev',`
 ##	</summary>
 ## </param>
 #
-interface(`dev_rw_generic_usb_dev',`
+interface(`dev_relabel_generic_usb_dev',`
 	gen_require(`
-		type device_t, usb_device_t;
+		type usb_device_t;
 	')
 
-	rw_chr_files_pattern($1, device_t, usb_device_t)
+	relabel_chr_files_pattern($1, device_t, usb_device_t)
 ')
 
 ########################################