diff --git a/modules-targeted.conf b/modules-targeted.conf
index e6884da..3ced518 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -928,7 +928,7 @@ pyzor = module
 #
 # Policy for sendmail.
 # 
-qmail = module
+qmail = off
 
 # Layer: admin
 # Module: quota
diff --git a/policy-20070703.patch b/policy-20070703.patch
index 7915565..6e91424 100644
--- a/policy-20070703.patch
+++ b/policy-20070703.patch
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.7/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,15 +1,9 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -28,7 +28,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default
 +system_r:xdm_t:s0		system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.7/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/default_type	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,4 @@
 +system_r:unconfined_t
  sysadm_r:sysadm_t
@@ -37,13 +37,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default
  user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/failsafe_context	2007-09-06 15:43:06.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -51,7 +51,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,11 +1,10 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -73,7 +73,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_de
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.7/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/seusers	2007-09-06 15:43:06.000000000 -0400
 @@ -1,3 +1,2 @@
 -system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
@@ -81,7 +81,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers
 +__default__:system_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 +system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -94,13 +94,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/userhelper_context	2007-09-06 15:43:06.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
 +system_r:remote_login_t:s0	system_r:unconfined_t:s0 user_r:user_t:s0
@@ -111,7 +111,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_
 +user_r:user_sudo_t:s0		system_r:unconfined_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mcs/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -120,7 +120,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_
 +system_r:xdm_t		xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.0.7/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,15 +1,12 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -150,7 +150,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default
 +user_r:user_sudo_t:s0	sysadm_r:sysadm_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_type serefpolicy-3.0.7/config/appconfig-mls/default_type
 --- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/default_type	2007-09-06 15:43:06.000000000 -0400
 @@ -1,6 +1,5 @@
 -auditadm_r:auditadm_t
 -secadm_r:secadm_t
@@ -162,7 +162,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default
 +auditadm_r:auditadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -170,7 +170,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u
 +system_r:crond_t:s0		guest_r:guest_crond_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/root_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -1,11 +1,9 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -191,7 +191,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_de
 +#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 +system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -204,7 +204,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u
 +sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-mls/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t:s0	user_r:user_t:s0
 +system_r:remote_login_t:s0	user_r:user_t:s0
@@ -215,7 +215,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_
 +user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/guest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -223,7 +223,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/gu
 +system_r:crond_t	guest_r:guest_crond_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/staff_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +system_r:local_login_t	staff_r:staff_t sysadm_r:sysadm_t
 +system_r:remote_login_t	staff_r:staff_t
@@ -236,7 +236,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/st
 +sysadm_r:sysadm_sudo_t	sysadm_r:sysadm_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/user_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	system_r:unconfined_t user_r:user_t
 +system_r:remote_login_t	system_r:unconfined_t user_r:user_t
@@ -247,7 +247,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/us
 +user_r:user_sudo_t	system_r:unconfined_t user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/config/appconfig-standard/xguest_u_default_contexts	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -256,7 +256,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xg
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.0.7/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/man/man8/ftpd_selinux.8	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/man/man8/ftpd_selinux.8	2007-09-06 15:43:06.000000000 -0400
 @@ -12,7 +12,7 @@
  .TP
  chcon -R -t public_content_t /var/ftp
@@ -268,7 +268,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 sere
  .TP
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.0.7/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/man/man8/httpd_selinux.8	2007-08-30 11:24:32.000000000 -0400
++++ serefpolicy-3.0.7/man/man8/httpd_selinux.8	2007-09-06 15:43:06.000000000 -0400
 @@ -30,7 +30,7 @@
  .EX
  httpd_sys_script_ro_t 
@@ -280,7 +280,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 ser
  .EE
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.0.7/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-08-22 07:14:04.000000000 -0400
-+++ serefpolicy-3.0.7/policy/flask/access_vectors	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/flask/access_vectors	2007-09-06 15:43:06.000000000 -0400
 @@ -639,6 +639,8 @@
  	send
  	recv
@@ -292,7 +292,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors 
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.0.7/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/global_tunables	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/global_tunables	2007-09-06 15:43:06.000000000 -0400
 @@ -133,3 +133,18 @@
  ## </desc>
  gen_tunable(write_untrusted_content,false)
@@ -314,7 +314,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables seref
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-3.0.7/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/alsa.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/alsa.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,7 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -325,7 +325,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc
 +/sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.0.7/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/alsa.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/alsa.te	2007-09-06 15:43:06.000000000 -0400
 @@ -19,20 +19,24 @@
  # Local policy
  #
@@ -370,7 +370,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-3.0.7/policy/modules/admin/amanda.if
 --- nsaserefpolicy/policy/modules/admin/amanda.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-06 10:18:35.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/amanda.if	2007-09-06 15:43:06.000000000 -0400
 @@ -71,6 +71,26 @@
  
  ########################################
@@ -405,7 +405,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.0.7/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/anaconda.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/anaconda.te	2007-09-06 15:43:06.000000000 -0400
 @@ -31,16 +31,13 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -426,7 +426,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anacond
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-3.0.7/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/bootloader.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/bootloader.te	2007-09-06 15:43:06.000000000 -0400
 @@ -180,6 +180,7 @@
  
  optional_policy(`
@@ -437,7 +437,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloa
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.if serefpolicy-3.0.7/policy/modules/admin/certwatch.if
 --- nsaserefpolicy/policy/modules/admin/certwatch.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/certwatch.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/certwatch.if	2007-09-06 15:43:06.000000000 -0400
 @@ -44,7 +44,7 @@
  ## </param>
  ## <rolecap/>
@@ -449,7 +449,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwat
  	')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.0.7/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/consoletype.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/consoletype.te	2007-09-06 15:43:06.000000000 -0400
 @@ -8,9 +8,11 @@
  
  type consoletype_t;
@@ -495,7 +495,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/console
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-3.0.7/policy/modules/admin/dmidecode.te
 --- nsaserefpolicy/policy/modules/admin/dmidecode.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/dmidecode.te	2007-08-30 10:26:10.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/dmidecode.te	2007-09-06 15:43:06.000000000 -0400
 @@ -20,6 +20,7 @@
  
  # Allow dmidecode to read /dev/mem
@@ -504,9 +504,31 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmideco
  
  mls_file_read_all_levels(dmidecode_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.0.7/policy/modules/admin/firstboot.te
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2007-07-25 10:37:43.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/firstboot.te	2007-09-06 19:24:23.000000000 -0400
+@@ -120,6 +120,10 @@
+ 	usermanage_domtrans_admin_passwd(firstboot_t)
+ ')
+ 
++optional_policy(`
++	xserver_xdm_rw_shm(firstboot_t)
++')
++
+ ifdef(`TODO',`
+ allow firstboot_t proc_t:file write;
+ 
+@@ -132,7 +136,4 @@
+ 	domain_auto_trans(firstboot_t, userhelper_exec_t, sysadm_userhelper_t)
+ ')
+ 
+-ifdef(`xserver.te', `
+-	domain_auto_trans(firstboot_t, xserver_exec_t, xdm_xserver_t)
+-')
+ ') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.0.7/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/kudzu.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/kudzu.te	2007-09-06 19:20:53.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -553,7 +575,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.t
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.0.7/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/logrotate.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/logrotate.te	2007-09-06 15:43:06.000000000 -0400
 @@ -80,6 +80,7 @@
  selinux_get_enforce_mode(logrotate_t)
  
@@ -596,7 +618,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrota
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.0.7/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/logwatch.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/logwatch.te	2007-09-06 15:43:06.000000000 -0400
 @@ -29,7 +29,6 @@
  allow logwatch_t self:process signal;
  allow logwatch_t self:fifo_file rw_file_perms;
@@ -658,7 +680,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatc
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.0.7/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/netutils.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/netutils.te	2007-09-06 15:43:06.000000000 -0400
 @@ -94,9 +94,18 @@
  ')
  
@@ -688,7 +710,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutil
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.if serefpolicy-3.0.7/policy/modules/admin/portage.if
 --- nsaserefpolicy/policy/modules/admin/portage.if	2007-07-03 07:06:36.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/portage.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/portage.if	2007-09-06 15:43:06.000000000 -0400
 @@ -324,6 +324,7 @@
  	seutil_domtrans_setfiles($1)
  	# run semodule
@@ -699,7 +721,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.0.7/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2007-08-02 08:17:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/prelink.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/prelink.te	2007-09-06 15:43:06.000000000 -0400
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -751,7 +773,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.fc serefpolicy-3.0.7/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/readahead.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/readahead.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -2,3 +2,4 @@
  # /usr
  #
@@ -759,7 +781,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahe
 +/etc/readahead.d(/.*)?		gen_context(system_u:object_r:readahead_etc_rw_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.0.7/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/readahead.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/readahead.te	2007-09-06 15:43:06.000000000 -0400
 @@ -9,19 +9,24 @@
  type readahead_t;
  type readahead_exec_t;
@@ -816,7 +838,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahe
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.0.7/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/rpm.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/rpm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -21,6 +21,9 @@
  /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -829,7 +851,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc 
  /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.0.7/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/rpm.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/rpm.if	2007-09-06 15:43:06.000000000 -0400
 @@ -210,6 +210,24 @@
  
  ########################################
@@ -973,7 +995,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.0.7/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/rpm.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/rpm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -321,6 +321,7 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
@@ -984,7 +1006,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te 
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.0.7/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/sudo.if	2007-09-05 14:28:04.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/sudo.if	2007-09-06 15:43:06.000000000 -0400
 @@ -55,7 +55,7 @@
  	#
  
@@ -1058,7 +1080,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.0.7/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/su.if	2007-09-05 15:04:04.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/su.if	2007-09-06 15:43:06.000000000 -0400
 @@ -41,12 +41,11 @@
  
  	allow $2 $1_su_t:process signal;
@@ -1155,7 +1177,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if s
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.0.7/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/usermanage.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/usermanage.if	2007-09-06 15:43:06.000000000 -0400
 @@ -278,5 +278,5 @@
  		type crack_db_t;
  	')
@@ -1165,7 +1187,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/userman
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.0.7/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-08-22 07:14:14.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/usermanage.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/usermanage.te	2007-09-06 15:43:06.000000000 -0400
 @@ -92,6 +92,7 @@
  dev_read_urand(chfn_t)
  
@@ -1309,7 +1331,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/userman
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.0.7/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/admin/vbetool.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/admin/vbetool.te	2007-09-06 15:43:06.000000000 -0400
 @@ -32,4 +32,5 @@
  
  optional_policy(`
@@ -1318,7 +1340,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.if serefpolicy-3.0.7/policy/modules/apps/ada.if
 --- nsaserefpolicy/policy/modules/apps/ada.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/ada.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/ada.if	2007-09-06 15:43:06.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, ada_exec_t, ada_t)
@@ -1356,7 +1378,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ada.if s
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.fc serefpolicy-3.0.7/policy/modules/apps/games.fc
 --- nsaserefpolicy/policy/modules/apps/games.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/games.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/games.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,22 +1,16 @@
  #
  # /usr
@@ -1385,7 +1407,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.fc
  /usr/bin/gataxx		--	gen_context(system_u:object_r:games_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.0.7/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/gnome.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/gnome.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,8 +1,7 @@
 +HOME_DIR/.gnome2(/.*)?		gen_context(system_u:object_r:ROLE_gnome_home_t,s0)
  HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:ROLE_gnome_home_t,s0)
@@ -1398,7 +1420,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc
  /usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.0.7/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/gnome.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/gnome.if	2007-09-06 15:43:06.000000000 -0400
 @@ -33,6 +33,51 @@
  ## </param>
  #
@@ -1586,7 +1608,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.0.7/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/gnome.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/gnome.te	2007-09-06 15:43:06.000000000 -0400
 @@ -8,8 +8,5 @@
  
  attribute gnomedomain;
@@ -1598,7 +1620,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te
  application_executable_file(gconfd_exec_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.0.7/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/java.fc	2007-09-04 11:44:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/java.fc	2007-09-06 19:17:45.000000000 -0400
 @@ -11,6 +11,7 @@
  #
  /usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -1607,16 +1629,19 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc 
  /usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gappletviewer  --	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
-@@ -22,3 +23,6 @@
+@@ -20,5 +21,9 @@
+ /usr/bin/grmic  	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/grmiregistry  	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/jv-convert  	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/fastjar  	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
  /usr/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
 +
-+/usr/lib/jvm/java[^/]*/jre/bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.0.7/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/java.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/java.if	2007-09-06 15:43:06.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1759,7 +1784,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.0.7/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/java.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/java.te	2007-09-06 15:43:06.000000000 -0400
 @@ -31,3 +31,7 @@
  	unconfined_domain_noaudit(java_t)
  	unconfined_dbus_chat(java_t)
@@ -1770,7 +1795,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.0.7/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/loadkeys.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/loadkeys.te	2007-09-06 15:43:06.000000000 -0400
 @@ -30,7 +30,7 @@
  files_read_etc_runtime_files(loadkeys_t)
  
@@ -1791,7 +1816,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.0.7/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/mono.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/mono.if	2007-09-06 15:43:06.000000000 -0400
 @@ -18,3 +18,98 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
@@ -1893,7 +1918,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.0.7/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/mono.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/mono.te	2007-09-06 15:43:06.000000000 -0400
 @@ -46,3 +46,7 @@
  	unconfined_dbus_chat(mono_t)
  	unconfined_dbus_connect(mono_t)
@@ -1904,7 +1929,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.0.7/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/mozilla.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/mozilla.if	2007-09-06 15:43:06.000000000 -0400
 @@ -36,6 +36,8 @@
  	gen_require(`
  		type mozilla_conf_t, mozilla_exec_t;
@@ -2250,7 +2275,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.0.7/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/mozilla.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/mozilla.te	2007-09-06 15:43:06.000000000 -0400
 @@ -6,13 +6,6 @@
  # Declarations
  #
@@ -2267,7 +2292,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-3.0.7/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/slocate.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/slocate.te	2007-09-06 15:43:06.000000000 -0400
 @@ -29,6 +29,8 @@
  manage_dirs_pattern(locate_t,locate_var_lib_t,locate_var_lib_t)
  manage_files_pattern(locate_t,locate_var_lib_t,locate_var_lib_t)
@@ -2279,7 +2304,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelper.if serefpolicy-3.0.7/policy/modules/apps/userhelper.if
 --- nsaserefpolicy/policy/modules/apps/userhelper.if	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/userhelper.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/userhelper.if	2007-09-06 15:43:06.000000000 -0400
 @@ -130,6 +130,7 @@
  	term_use_all_user_ptys($1_userhelper_t)
  
@@ -2290,7 +2315,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelp
  	auth_search_pam_console_data($1_userhelper_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/usernetctl.te serefpolicy-3.0.7/policy/modules/apps/usernetctl.te
 --- nsaserefpolicy/policy/modules/apps/usernetctl.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/usernetctl.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/usernetctl.te	2007-09-06 15:43:06.000000000 -0400
 @@ -6,14 +6,6 @@
  # Declarations
  #
@@ -2308,7 +2333,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/usernetc
  application_domain(usernetctl_t,usernetctl_exec_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.0.7/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2007-07-03 07:05:43.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/vmware.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/vmware.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -23,6 +23,7 @@
  /usr/bin/vmware-smbd		--	gen_context(system_u:object_r:vmware_host_exec_t,s0)
  /usr/bin/vmware-smbpasswd	--	gen_context(system_u:object_r:vmware_host_exec_t,s0)
@@ -2319,7 +2344,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.f
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.0.7/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/vmware.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/vmware.te	2007-09-06 15:43:06.000000000 -0400
 @@ -29,7 +29,7 @@
  
  allow vmware_host_t self:capability { setuid net_raw };
@@ -2340,7 +2365,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.t
  corenet_sendrecv_all_server_packets(vmware_host_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.0.7/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/apps/wine.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/apps/wine.if	2007-09-06 15:43:06.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, wine_exec_t, wine_t)
@@ -2378,7 +2403,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if 
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc	2007-09-04 15:55:28.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corecommands.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -2414,7 +2439,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.if.in	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.if.in	2007-09-06 15:43:06.000000000 -0400
 @@ -1449,6 +1449,43 @@
  
  ########################################
@@ -2461,7 +2486,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corene
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-04 13:41:29.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/corenetwork.te.in	2007-09-06 15:43:06.000000000 -0400
 @@ -55,6 +55,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2524,7 +2549,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corene
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.0.7/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/devices.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/devices.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -12,6 +12,7 @@
  /dev/atibm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -2570,7 +2595,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.0.7/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/devices.if	2007-08-30 10:25:56.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/devices.if	2007-09-06 15:43:06.000000000 -0400
 @@ -2803,6 +2803,24 @@
  
  ########################################
@@ -2598,7 +2623,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.0.7/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/domain.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/domain.if	2007-09-06 15:43:06.000000000 -0400
 @@ -45,6 +45,11 @@
  	# start with basic domain
  	domain_base_type($1)
@@ -2642,7 +2667,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.0.7/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/domain.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/domain.te	2007-09-06 15:43:06.000000000 -0400
 @@ -6,6 +6,22 @@
  # Declarations
  #
@@ -2691,7 +2716,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.0.7/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-08-31 06:14:11.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.if	2007-09-06 15:43:06.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2925,7 +2950,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.0.7/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/files.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/files.te	2007-09-06 15:43:06.000000000 -0400
 @@ -55,6 +55,8 @@
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
@@ -2937,7 +2962,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
  # etc_runtime_t is the type of various
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.0.7/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.if	2007-09-06 15:43:06.000000000 -0400
 @@ -271,45 +271,6 @@
  
  ########################################
@@ -3047,7 +3072,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.0.7/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/filesystem.te	2007-09-06 15:43:06.000000000 -0400
 @@ -80,6 +80,7 @@
  type fusefs_t;
  fs_noxattr_type(fusefs_t)
@@ -3058,7 +3083,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.0.7/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/kernel.if	2007-09-04 10:47:02.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/kernel.if	2007-09-06 15:43:06.000000000 -0400
 @@ -1867,6 +1867,27 @@
  
  ########################################
@@ -3089,7 +3114,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.0.7/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-08-22 07:14:06.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/kernel.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/kernel.te	2007-09-06 15:43:06.000000000 -0400
 @@ -278,6 +278,7 @@
  
  optional_policy(`
@@ -3100,7 +3125,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.0.7/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/selinux.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/selinux.if	2007-09-06 15:43:06.000000000 -0400
 @@ -138,6 +138,7 @@
  		type security_t;
  	')
@@ -3119,7 +3144,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinu
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-3.0.7/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/terminal.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/terminal.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -8,6 +8,7 @@
  /dev/dcbri[0-9]+	-c	gen_context(system_u:object_r:tty_device_t,s0)
  /dev/hvc.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
@@ -3130,7 +3155,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/termin
  /dev/isdn.*		-c	gen_context(system_u:object_r:tty_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-3.0.7/policy/modules/kernel/terminal.te
 --- nsaserefpolicy/policy/modules/kernel/terminal.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/kernel/terminal.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/kernel/terminal.te	2007-09-06 15:43:06.000000000 -0400
 @@ -28,9 +28,15 @@
  type devpts_t;
  files_mountpoint(devpts_t)
@@ -3160,7 +3185,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/termin
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.0.7/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/amavis.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/amavis.te	2007-09-06 15:43:06.000000000 -0400
 @@ -166,6 +166,7 @@
  
  optional_policy(`
@@ -3171,7 +3196,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.0.7/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apache.fc	2007-08-28 16:33:34.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apache.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -16,7 +16,6 @@
  
  /usr/lib/apache-ssl/.+		--	gen_context(system_u:object_r:httpd_exec_t,s0)
@@ -3199,7 +3224,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +/etc/rc\.d/init\.d/httpd	--	gen_context(system_u:object_r:httpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.0.7/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apache.if	2007-09-05 22:22:33.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apache.if	2007-09-06 15:43:06.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -3610,7 +3635,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.0.7/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apache.te	2007-09-04 16:06:38.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apache.te	2007-09-06 15:43:06.000000000 -0400
 @@ -30,6 +30,13 @@
  
  ## <desc>
@@ -4076,7 +4101,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.0.7/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apcupsd.fc	2007-09-04 09:45:48.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apcupsd.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -5,5 +5,11 @@
  /usr/sbin/apcupsd		--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
  
@@ -4091,7 +4116,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +/var/www/apcupsd/upsstats.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.0.7/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apcupsd.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apcupsd.if	2007-09-06 15:43:06.000000000 -0400
 @@ -79,3 +79,25 @@
  	allow $1 apcupsd_log_t:dir list_dir_perms;
  	allow $1 apcupsd_log_t:file { getattr append };
@@ -4120,7 +4145,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-3.0.7/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/apcupsd.te	2007-09-04 17:43:34.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/apcupsd.te	2007-09-06 15:43:06.000000000 -0400
 @@ -16,6 +16,9 @@
  type apcupsd_log_t;
  logging_log_file(apcupsd_log_t)
@@ -4223,7 +4248,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.0.7/policy/modules/services/audioentropy.te
 --- nsaserefpolicy/policy/modules/services/audioentropy.te	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/audioentropy.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/audioentropy.te	2007-09-06 15:43:06.000000000 -0400
 @@ -18,7 +18,7 @@
  # Local policy
  #
@@ -4244,7 +4269,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audi
  fs_getattr_all_fs(entropyd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.0.7/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/automount.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/automount.te	2007-09-06 15:43:06.000000000 -0400
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -4286,7 +4311,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/auto
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.0.7/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/avahi.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/avahi.te	2007-09-06 15:43:06.000000000 -0400
 @@ -57,6 +57,7 @@
  
  fs_getattr_all_fs(avahi_t)
@@ -4297,7 +4322,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avah
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.0.7/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/bind.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/bind.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -45,4 +45,7 @@
  /var/named/chroot/var/named/slaves(/.*)? gen_context(system_u:object_r:named_cache_t,s0)
  /var/named/chroot/var/named/data(/.*)? gen_context(system_u:object_r:named_cache_t,s0)
@@ -4308,7 +4333,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind
 +/var/named/chroot/var/log/named.*	--	gen_context(system_u:object_r:named_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.0.7/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/bind.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/bind.te	2007-09-06 15:43:06.000000000 -0400
 @@ -66,7 +66,6 @@
  allow named_t self:unix_dgram_socket create_socket_perms;
  allow named_t self:tcp_socket create_stream_socket_perms;
@@ -4362,7 +4387,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind
  fs_getattr_xattr_fs(ndc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.0.7/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/clamav.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/clamav.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -9,6 +9,8 @@
  
  /var/run/amavis(d)?/clamd\.pid	--	gen_context(system_u:object_r:clamd_var_run_t,s0)
@@ -4374,7 +4399,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
  /var/log/clamav/clamav.*	--	gen_context(system_u:object_r:clamd_var_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.0.7/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/clamav.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/clamav.te	2007-09-06 15:43:06.000000000 -0400
 @@ -74,17 +74,20 @@
  manage_files_pattern(clamd_t,clamd_var_lib_t,clamd_var_lib_t)
  
@@ -4423,7 +4448,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.0.7/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/consolekit.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/consolekit.te	2007-09-06 15:43:06.000000000 -0400
 @@ -10,7 +10,6 @@
  type consolekit_exec_t;
  init_daemon_domain(consolekit_t, consolekit_exec_t)
@@ -4483,7 +4508,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.0.7/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/courier.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/courier.te	2007-09-06 15:43:06.000000000 -0400
 @@ -58,6 +58,7 @@
  files_getattr_tmp_dirs(courier_authdaemon_t)
  
@@ -4494,7 +4519,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cour
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpucontrol.te serefpolicy-3.0.7/policy/modules/services/cpucontrol.te
 --- nsaserefpolicy/policy/modules/services/cpucontrol.te	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cpucontrol.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cpucontrol.te	2007-09-06 15:43:06.000000000 -0400
 @@ -63,6 +63,10 @@
  ')
  
@@ -4508,7 +4533,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cpuc
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.0.7/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cron.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cron.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -17,6 +17,8 @@
  /var/run/fcron\.fifo		-s	gen_context(system_u:object_r:crond_var_run_t,s0)
  /var/run/fcron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
@@ -4525,7 +4550,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.0.7/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cron.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cron.if	2007-09-06 15:43:06.000000000 -0400
 @@ -35,6 +35,7 @@
  #
  template(`cron_per_role_template',`
@@ -4669,7 +4694,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.0.7/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-06 10:19:10.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cron.te	2007-09-06 15:43:06.000000000 -0400
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -4878,7 +4903,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.0.7/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cups.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cups.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -8,6 +8,7 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -4903,7 +4928,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
 +/usr/local/Brother/inf(/.*)?	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.0.7/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cups.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cups.te	2007-09-06 15:43:06.000000000 -0400
 @@ -81,12 +81,11 @@
  # /usr/lib/cups/backend/serial needs sys_admin(?!)
  allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
@@ -5072,7 +5097,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.0.7/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/cvs.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/cvs.te	2007-09-06 15:43:06.000000000 -0400
 @@ -16,6 +16,7 @@
  type cvs_t;
  type cvs_exec_t;
@@ -5099,7 +5124,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.0.7/policy/modules/services/dbus.fc
 --- nsaserefpolicy/policy/modules/services/dbus.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dbus.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dbus.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -5,6 +5,8 @@
  /bin/dbus-daemon 	--	gen_context(system_u:object_r:system_dbusd_exec_t,s0)
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
@@ -5111,7 +5136,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.0.7/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dbus.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dbus.if	2007-09-06 15:43:06.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5241,7 +5266,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.0.7/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dbus.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dbus.te	2007-09-06 15:43:06.000000000 -0400
 @@ -23,6 +23,9 @@
  type system_dbusd_var_run_t;
  files_pid_file(system_dbusd_var_run_t)
@@ -5282,7 +5307,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.0.7/policy/modules/services/dhcp.te
 --- nsaserefpolicy/policy/modules/services/dhcp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dhcp.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dhcp.te	2007-09-06 15:43:06.000000000 -0400
 @@ -114,6 +114,8 @@
  	dbus_system_bus_client_template(dhcpd,dhcpd_t)
  	dbus_connect_system_bus(dhcpd_t)
@@ -5294,7 +5319,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.0.7/policy/modules/services/dnsmasq.te
 --- nsaserefpolicy/policy/modules/services/dnsmasq.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dnsmasq.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dnsmasq.te	2007-09-06 15:43:06.000000000 -0400
 @@ -94,3 +94,8 @@
  optional_policy(`
  	udev_read_db(dnsmasq_t)
@@ -5306,7 +5331,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsm
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.0.7/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dovecot.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dovecot.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -17,16 +17,19 @@
  
  ifdef(`distro_debian', `
@@ -5329,7 +5354,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.0.7/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dovecot.if	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dovecot.if	2007-09-06 15:43:06.000000000 -0400
 @@ -18,3 +18,43 @@
  	manage_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
  	manage_lnk_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
@@ -5376,7 +5401,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.0.7/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/dovecot.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/dovecot.te	2007-09-06 15:43:06.000000000 -0400
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -5533,7 +5558,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.0.7/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ftp.te	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ftp.te	2007-09-06 15:43:06.000000000 -0400
 @@ -88,6 +88,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -5577,7 +5602,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.0.7/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/hal.fc	2007-08-28 15:53:39.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/hal.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -8,9 +8,15 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
  
@@ -5596,7 +5621,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.0.7/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/hal.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/hal.if	2007-09-06 15:43:06.000000000 -0400
 @@ -208,3 +208,98 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -5698,7 +5723,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.0.7/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/hal.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/hal.te	2007-09-06 15:43:06.000000000 -0400
 @@ -22,6 +22,12 @@
  type hald_log_t;
  files_type(hald_log_t)
@@ -5809,7 +5834,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +dev_rw_input_dev(hald_keymap_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.0.7/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/inetd.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/inetd.te	2007-09-06 15:43:06.000000000 -0400
 @@ -80,16 +80,21 @@
  corenet_udp_bind_comsat_port(inetd_t)
  corenet_tcp_bind_dbskkd_port(inetd_t)
@@ -5881,7 +5906,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inet
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.0.7/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.if	2007-09-04 11:11:12.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.if	2007-09-06 15:43:06.000000000 -0400
 @@ -42,6 +42,10 @@
  	dontaudit $1 krb5_conf_t:file write;
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
@@ -5895,7 +5920,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
  		allow $1 self:tcp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.0.7/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-04 11:12:48.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/kerberos.te	2007-09-06 15:43:06.000000000 -0400
 @@ -62,7 +62,7 @@
  # Use capabilities. Surplus capabilities may be allowed.
  allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice };
@@ -5949,7 +5974,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
  userdom_dontaudit_search_sysadm_home_dirs(krb5kdc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.0.7/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ktalk.te	2007-09-04 09:21:17.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ktalk.te	2007-09-06 15:43:06.000000000 -0400
 @@ -49,6 +49,8 @@
  manage_files_pattern(ktalkd_t,ktalkd_var_run_t,ktalkd_var_run_t)
  files_pid_filetrans(ktalkd_t,ktalkd_var_run_t,file)
@@ -5975,7 +6000,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktal
 +term_search_ptys(ktalkd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-3.0.7/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/lpd.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/lpd.if	2007-09-06 15:43:06.000000000 -0400
 @@ -394,3 +394,22 @@
  
  	domtrans_pattern($2, lpr_exec_t, $1_lpr_t)
@@ -6001,7 +6026,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.0.7/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mailman.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mailman.te	2007-09-06 15:43:06.000000000 -0400
 @@ -55,6 +55,7 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -6020,13 +6045,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.0.7/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/services/mailscanner.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mailscanner.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,2 @@
 +/var/spool/MailScanner(/.*)?	gen_context(system_u:object_r:mailscanner_spool_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.if serefpolicy-3.0.7/policy/modules/services/mailscanner.if
 --- nsaserefpolicy/policy/modules/services/mailscanner.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/services/mailscanner.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mailscanner.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,59 @@
 +## <summary>Anti-Virus and Anti-Spam Filter</summary>
 +
@@ -6089,7 +6114,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.te serefpolicy-3.0.7/policy/modules/services/mailscanner.te
 --- nsaserefpolicy/policy/modules/services/mailscanner.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/services/mailscanner.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mailscanner.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,5 @@
 +
 +policy_module(mailscanner,1.0.0)
@@ -6098,7 +6123,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
 +files_type(mailscanner_spool_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.0.7/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mta.if	2007-09-04 17:43:34.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mta.if	2007-09-06 15:43:06.000000000 -0400
 @@ -226,6 +226,15 @@
  	tunable_policy(`use_samba_home_dirs',`
  		fs_manage_cifs_files($1_mail_t)
@@ -6151,7 +6176,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  ## <summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.0.7/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mta.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mta.te	2007-09-06 15:43:06.000000000 -0400
 @@ -44,6 +44,7 @@
  kernel_read_system_state(system_mail_t)
  kernel_read_network_state(system_mail_t)
@@ -6217,7 +6242,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.fc serefpolicy-3.0.7/policy/modules/services/mysql.fc
 --- nsaserefpolicy/policy/modules/services/mysql.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mysql.fc	2007-08-31 06:48:04.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mysql.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -22,3 +22,5 @@
  /var/log/mysql.*	--	gen_context(system_u:object_r:mysqld_log_t,s0)
  
@@ -6226,7 +6251,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
 +/etc/rc\.d/init\.d/mysqld	--	gen_context(system_u:object_r:mysqld_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.0.7/policy/modules/services/mysql.if
 --- nsaserefpolicy/policy/modules/services/mysql.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mysql.if	2007-09-05 22:11:26.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mysql.if	2007-09-06 15:43:06.000000000 -0400
 @@ -157,3 +157,79 @@
  	logging_search_logs($1)
  	allow $1 mysqld_log_t:file { write append setattr ioctl };
@@ -6309,7 +6334,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.0.7/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/mysql.te	2007-08-31 06:45:08.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/mysql.te	2007-09-06 15:43:06.000000000 -0400
 @@ -25,6 +25,9 @@
  type mysqld_tmp_t;
  files_tmp_file(mysqld_tmp_t)
@@ -6322,7 +6347,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
  # Local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.0.7/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nagios.fc	2007-09-01 07:24:13.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nagios.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -4,13 +4,15 @@
  /usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
  /usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
@@ -6344,7 +6369,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
 +/usr/lib(64)?/cgi-bin/nagios(/.+)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.0.7/policy/modules/services/nagios.if
 --- nsaserefpolicy/policy/modules/services/nagios.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nagios.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nagios.if	2007-09-06 15:43:06.000000000 -0400
 @@ -44,25 +44,6 @@
  
  ########################################
@@ -6373,7 +6398,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.0.7/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nagios.te	2007-09-05 12:54:07.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nagios.te	2007-09-06 15:43:06.000000000 -0400
 @@ -10,10 +10,6 @@
  type nagios_exec_t;
  init_daemon_domain(nagios_t,nagios_exec_t)
@@ -6479,7 +6504,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.0.7/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/networkmanager.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/networkmanager.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,5 +1,6 @@
  
  /usr/(s)?bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
@@ -6489,7 +6514,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.0.7/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/networkmanager.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/networkmanager.te	2007-09-06 15:43:06.000000000 -0400
 @@ -20,7 +20,7 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -6533,7 +6558,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.0.7/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nis.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nis.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -4,6 +4,7 @@
  /sbin/ypbind		--	gen_context(system_u:object_r:ypbind_exec_t,s0)
  
@@ -6544,7 +6569,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  /usr/sbin/rpc\.ypxfrd	--	gen_context(system_u:object_r:ypxfr_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.0.7/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nis.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nis.if	2007-09-06 15:43:06.000000000 -0400
 @@ -49,8 +49,8 @@
  	corenet_udp_bind_all_nodes($1)
  	corenet_tcp_bind_generic_port($1)
@@ -6558,7 +6583,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  	corenet_tcp_connect_portmap_port($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.0.7/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nis.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nis.te	2007-09-06 15:43:06.000000000 -0400
 @@ -113,6 +113,14 @@
  userdom_dontaudit_use_unpriv_user_fds(ypbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(ypbind_t)
@@ -6613,7 +6638,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  corenet_tcp_connect_all_ports(ypxfr_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.0.7/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/nscd.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/nscd.te	2007-09-06 15:43:06.000000000 -0400
 @@ -28,14 +28,14 @@
  # Local policy
  #
@@ -6664,7 +6689,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.fc serefpolicy-3.0.7/policy/modules/services/ntp.fc
 --- nsaserefpolicy/policy/modules/services/ntp.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ntp.fc	2007-09-04 11:51:24.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ntp.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -17,3 +17,8 @@
  /var/log/xntpd.*		--	gen_context(system_u:object_r:ntpd_log_t,s0)
  
@@ -6676,7 +6701,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
 +/etc/rc\.d/init\.d/ntpd	--	gen_context(system_u:object_r:ntpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.0.7/policy/modules/services/ntp.if
 --- nsaserefpolicy/policy/modules/services/ntp.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ntp.if	2007-09-04 11:52:20.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ntp.if	2007-09-06 15:43:06.000000000 -0400
 @@ -53,3 +53,59 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,ntpdate_exec_t,ntpd_t)
@@ -6739,7 +6764,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.0.7/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ntp.te	2007-09-04 11:51:12.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ntp.te	2007-09-06 15:43:06.000000000 -0400
 @@ -25,6 +25,12 @@
  type ntpdate_exec_t;
  init_system_domain(ntpd_t,ntpdate_exec_t)
@@ -6806,7 +6831,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.0.7/policy/modules/services/openvpn.if
 --- nsaserefpolicy/policy/modules/services/openvpn.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/openvpn.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/openvpn.if	2007-09-06 15:43:06.000000000 -0400
 @@ -22,3 +22,71 @@
  	read_files_pattern($1,openvpn_etc_t,openvpn_etc_t)
  	read_lnk_files_pattern($1,openvpn_etc_t,openvpn_etc_t)
@@ -6881,7 +6906,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.0.7/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/openvpn.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/openvpn.te	2007-09-06 15:43:06.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -6960,7 +6985,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-3.0.7/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/pegasus.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/pegasus.if	2007-09-06 15:43:06.000000000 -0400
 @@ -1 +1,19 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -6983,7 +7008,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pega
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.0.7/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/pegasus.te	2007-09-01 07:02:51.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/pegasus.te	2007-09-06 15:43:06.000000000 -0400
 @@ -42,6 +42,7 @@
  allow pegasus_t pegasus_conf_t:file { read_file_perms link unlink };
  allow pegasus_t pegasus_conf_t:lnk_file read_lnk_file_perms;
@@ -7033,7 +7058,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pega
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portslave.te serefpolicy-3.0.7/policy/modules/services/portslave.te
 --- nsaserefpolicy/policy/modules/services/portslave.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/portslave.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/portslave.te	2007-09-06 15:43:06.000000000 -0400
 @@ -85,6 +85,7 @@
  
  auth_rw_login_records(portslave_t)
@@ -7044,7 +7069,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/port
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.0.7/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postfix.fc	2007-09-04 17:47:41.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/postfix.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -14,6 +14,7 @@
  /usr/libexec/postfix/smtpd --	gen_context(system_u:object_r:postfix_smtpd_exec_t,s0)
  /usr/libexec/postfix/bounce --	gen_context(system_u:object_r:postfix_bounce_exec_t,s0)
@@ -7055,7 +7080,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  /usr/lib/postfix/cleanup --	gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.0.7/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postfix.if	2007-09-04 17:42:35.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/postfix.if	2007-09-06 15:43:06.000000000 -0400
 @@ -41,6 +41,8 @@
  	allow postfix_$1_t self:unix_stream_socket connectto;
  
@@ -7179,7 +7204,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.0.7/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postfix.te	2007-09-04 17:42:51.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/postfix.te	2007-09-06 15:43:06.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -7356,7 +7381,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +mta_manage_spool(postfix_virtual_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.0.7/policy/modules/services/postgresql.fc
 --- nsaserefpolicy/policy/modules/services/postgresql.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postgresql.fc	2007-08-28 16:44:28.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/postgresql.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -38,3 +38,5 @@
  ')
  
@@ -7365,7 +7390,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +/etc/rc\.d/init\.d/postgresql	--	gen_context(system_u:object_r:postgresql_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.0.7/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postgresql.if	2007-09-05 22:13:10.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/postgresql.if	2007-09-06 15:43:06.000000000 -0400
 @@ -113,3 +113,77 @@
          # Some versions of postgresql put the sock file in /tmp
  	allow $1 postgresql_tmp_t:sock_file write;
@@ -7446,7 +7471,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.0.7/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/postgresql.te	2007-08-28 16:44:00.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/postgresql.te	2007-09-06 15:43:06.000000000 -0400
 @@ -27,6 +27,9 @@
  type postgresql_var_run_t;
  files_pid_file(postgresql_var_run_t)
@@ -7459,7 +7484,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  # postgresql Local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.0.7/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/procmail.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/procmail.te	2007-09-06 15:43:06.000000000 -0400
 @@ -30,6 +30,8 @@
  allow procmail_t procmail_tmp_t:file manage_file_perms;
  files_tmp_filetrans(procmail_t, procmail_tmp_t, file)
@@ -7497,7 +7522,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/proc
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.0.7/policy/modules/services/pyzor.if
 --- nsaserefpolicy/policy/modules/services/pyzor.if	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/pyzor.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/pyzor.if	2007-09-06 15:43:06.000000000 -0400
 @@ -25,16 +25,16 @@
  #
  template(`pyzor_per_role_template',`
@@ -7522,7 +7547,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.0.7/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/pyzor.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/pyzor.te	2007-09-06 15:43:06.000000000 -0400
 @@ -70,6 +70,11 @@
  
  userdom_dontaudit_search_sysadm_home_dirs(pyzor_t)
@@ -7548,7 +7573,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-3.0.7/policy/modules/services/radius.fc
 --- nsaserefpolicy/policy/modules/services/radius.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/radius.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/radius.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -18,3 +18,4 @@
  
  /var/run/radiusd(/.*)?		gen_context(system_u:object_r:radiusd_var_run_t,s0)
@@ -7556,7 +7581,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
 +/var/lib/radiousd(/.*)?		gen_context(system_u:object_r:radiusd_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.0.7/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/radius.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/radius.te	2007-09-06 15:43:06.000000000 -0400
 @@ -19,6 +19,9 @@
  type radiusd_log_t;
  logging_log_file(radiusd_log_t)
@@ -7594,7 +7619,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-3.0.7/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/remotelogin.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/remotelogin.te	2007-09-06 15:43:06.000000000 -0400
 @@ -85,6 +85,7 @@
  
  miscfiles_read_localization(remote_login_t)
@@ -7605,7 +7630,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remo
  # Only permit unprivileged user domains to be entered via rlogin,
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-3.0.7/policy/modules/services/rhgb.te
 --- nsaserefpolicy/policy/modules/services/rhgb.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rhgb.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rhgb.te	2007-09-06 15:43:06.000000000 -0400
 @@ -59,6 +59,7 @@
  corenet_sendrecv_all_client_packets(rhgb_t)
  
@@ -7624,7 +7649,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb
  xserver_kill_xdm_xserver(rhgb_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.0.7/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ricci.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ricci.te	2007-09-06 15:43:06.000000000 -0400
 @@ -138,6 +138,7 @@
  files_create_boot_flag(ricci_t)
  
@@ -7654,7 +7679,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricc
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.0.7/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rlogin.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rlogin.te	2007-09-06 15:43:06.000000000 -0400
 @@ -65,6 +65,7 @@
  fs_search_auto_mountpoints(rlogind_t)
  
@@ -7665,7 +7690,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlog
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.0.7/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rpcbind.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rpcbind.te	2007-09-06 15:43:06.000000000 -0400
 @@ -21,11 +21,13 @@
  # rpcbind local policy
  #
@@ -7683,7 +7708,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcb
  manage_files_pattern(rpcbind_t,rpcbind_var_run_t,rpcbind_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.0.7/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rpc.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rpc.if	2007-09-06 15:43:06.000000000 -0400
 @@ -81,6 +81,7 @@
  	corenet_tcp_bind_all_nodes($1_t)
  	corenet_udp_bind_all_nodes($1_t)
@@ -7707,7 +7732,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  	fs_search_auto_mountpoints($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.0.7/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rpc.te	2007-09-04 11:46:58.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rpc.te	2007-09-06 15:43:06.000000000 -0400
 @@ -59,10 +59,14 @@
  manage_files_pattern(rpcd_t,rpcd_var_run_t,rpcd_var_run_t)
  files_pid_filetrans(rpcd_t,rpcd_var_run_t,file)
@@ -7778,7 +7803,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  	userdom_read_unpriv_users_tmp_files(gssd_t) 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.0.7/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rshd.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rshd.te	2007-09-06 15:43:06.000000000 -0400
 @@ -11,6 +11,7 @@
  domain_subj_id_change_exemption(rshd_t)
  domain_role_change_exemption(rshd_t)
@@ -7815,7 +7840,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.0.7/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rsync.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rsync.te	2007-09-06 15:43:06.000000000 -0400
 @@ -17,6 +17,7 @@
  type rsync_t;
  type rsync_exec_t;
@@ -7826,7 +7851,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsyn
  type rsync_data_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.fc serefpolicy-3.0.7/policy/modules/services/rwho.fc
 --- nsaserefpolicy/policy/modules/services/rwho.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rwho.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rwho.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,3 +1,4 @@
  /usr/sbin/rwhod		--	gen_context(system_u:object_r:rwho_exec_t,s0)
  
@@ -7834,7 +7859,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
 +/var/log/rwhod(/.*)?		gen_context(system_u:object_r:rwho_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.0.7/policy/modules/services/rwho.if
 --- nsaserefpolicy/policy/modules/services/rwho.if	2007-06-15 14:54:33.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rwho.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rwho.if	2007-09-06 15:43:06.000000000 -0400
 @@ -72,6 +72,47 @@
  		type rwho_spool_t;
  	')
@@ -7886,7 +7911,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-3.0.7/policy/modules/services/rwho.te
 --- nsaserefpolicy/policy/modules/services/rwho.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/rwho.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/rwho.te	2007-09-06 15:43:06.000000000 -0400
 @@ -10,10 +10,12 @@
  type rwho_exec_t;
  init_daemon_domain(rwho_t, rwho_exec_t)
@@ -7914,7 +7939,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
  corenet_all_recvfrom_unlabeled(rwho_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.0.7/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -30,6 +30,8 @@
  /var/lib/samba(/.*)?			gen_context(system_u:object_r:samba_var_t,s0)
  /var/lib/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
@@ -7926,7 +7951,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.0.7/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.if	2007-09-06 15:43:06.000000000 -0400
 @@ -349,6 +349,7 @@
  	files_search_var($1)
  	files_search_var_lib($1)
@@ -7990,7 +8015,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.0.7/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/samba.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/samba.te	2007-09-06 15:43:06.000000000 -0400
 @@ -190,6 +190,8 @@
  
  miscfiles_read_localization(samba_net_t) 
@@ -8191,7 +8216,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.0.7/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/sasl.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/sasl.te	2007-09-06 15:43:06.000000000 -0400
 @@ -64,6 +64,7 @@
  selinux_compute_access_vector(saslauthd_t)
  
@@ -8202,7 +8227,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl
  domain_use_interactive_fds(saslauthd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.0.7/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/sendmail.if	2007-09-04 17:43:19.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/sendmail.if	2007-09-06 15:43:06.000000000 -0400
 @@ -131,3 +131,51 @@
  
  	logging_log_filetrans($1,sendmail_log_t,file)
@@ -8257,7 +8282,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.0.7/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/sendmail.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/sendmail.te	2007-09-06 15:43:06.000000000 -0400
 @@ -32,7 +32,6 @@
  allow sendmail_t self:unix_dgram_socket create_socket_perms;
  allow sendmail_t self:tcp_socket create_stream_socket_perms;
@@ -8326,7 +8351,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.0.7/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.if	2007-09-06 15:43:06.000000000 -0400
 @@ -19,3 +19,22 @@
  	allow $1 setroubleshoot_var_run_t:sock_file write;
  	allow $1 setroubleshootd_t:unix_stream_socket connectto;
@@ -8352,7 +8377,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/setroubleshoot.te	2007-09-06 15:43:06.000000000 -0400
 @@ -33,7 +33,6 @@
  allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
  allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -8397,7 +8422,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.0.7/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/snmp.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/snmp.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,3 +1,4 @@
 +
  #
@@ -8405,7 +8430,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.0.7/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/snmp.te	2007-09-04 10:33:59.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/snmp.te	2007-09-06 15:43:06.000000000 -0400
 @@ -81,8 +81,7 @@
  files_read_usr_files(snmpd_t)
  files_read_etc_runtime_files(snmpd_t)
@@ -8418,7 +8443,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
  fs_getattr_all_fs(snmpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.fc serefpolicy-3.0.7/policy/modules/services/soundserver.fc
 --- nsaserefpolicy/policy/modules/services/soundserver.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/soundserver.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/soundserver.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,10 +1,16 @@
 -/etc/nas(/.*)?			gen_context(system_u:object_r:soundd_etc_t,s0)
 -/etc/yiff(/.*)?			gen_context(system_u:object_r:soundd_etc_t,s0)
@@ -8444,7 +8469,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soun
 +/usr/bin/nasd		--	gen_context(system_u:object_r:soundd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.if serefpolicy-3.0.7/policy/modules/services/soundserver.if
 --- nsaserefpolicy/policy/modules/services/soundserver.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/soundserver.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/soundserver.if	2007-09-06 15:43:06.000000000 -0400
 @@ -13,3 +13,64 @@
  interface(`soundserver_tcp_connect',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -8512,7 +8537,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soun
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.te serefpolicy-3.0.7/policy/modules/services/soundserver.te
 --- nsaserefpolicy/policy/modules/services/soundserver.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/soundserver.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/soundserver.te	2007-09-06 15:43:06.000000000 -0400
 @@ -10,9 +10,6 @@
  type soundd_exec_t;
  init_daemon_domain(soundd_t,soundd_exec_t)
@@ -8578,7 +8603,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soun
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.0.7/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/spamassassin.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/spamassassin.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -10,3 +10,9 @@
  /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
  
@@ -8591,7 +8616,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.0.7/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-08-02 08:17:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/spamassassin.te	2007-08-28 16:26:23.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/spamassassin.te	2007-09-06 15:43:06.000000000 -0400
 @@ -83,8 +83,9 @@
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
  read_files_pattern(spamd_t,spamd_var_lib_t,spamd_var_lib_t)
@@ -8605,7 +8630,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
  kernel_read_system_state(spamd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.0.7/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/squid.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/squid.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -12,3 +12,5 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
@@ -8614,7 +8639,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +/usr/lib64/squid/cachemgr\.cgi	--	gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-3.0.7/policy/modules/services/squid.if
 --- nsaserefpolicy/policy/modules/services/squid.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/squid.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/squid.if	2007-09-06 15:43:06.000000000 -0400
 @@ -131,3 +131,22 @@
  interface(`squid_use',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -8640,7 +8665,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.0.7/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/squid.te	2007-09-04 13:41:59.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/squid.te	2007-09-06 15:43:06.000000000 -0400
 @@ -36,7 +36,7 @@
  # Local policy
  #
@@ -8726,7 +8751,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.0.7/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ssh.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ssh.if	2007-09-06 15:43:06.000000000 -0400
 @@ -202,6 +202,7 @@
  #
  template(`ssh_per_role_template',`
@@ -8780,7 +8805,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.0.7/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/ssh.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/ssh.te	2007-09-06 19:21:21.000000000 -0400
 @@ -24,7 +24,7 @@
  
  # Type for the ssh-agent executable.
@@ -8834,9 +8859,25 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
  ')
  
  ifdef(`TODO',`
+@@ -231,9 +245,15 @@
+ ')
+ 
+ optional_policy(`
++	rhgb_use_ptys(ssh_keygen_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(ssh_keygen_t)
+ ')
+ 
+ optional_policy(`
+ 	udev_read_db(ssh_keygen_t)
+ ')
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.0.7/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/tftp.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/tftp.te	2007-09-06 15:43:06.000000000 -0400
 @@ -26,6 +26,7 @@
  allow tftpd_t self:udp_socket create_socket_perms;
  allow tftpd_t self:unix_dgram_socket create_socket_perms;
@@ -8847,7 +8888,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp
  allow tftpd_t tftpdir_t:dir { getattr read search };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uwimap.te serefpolicy-3.0.7/policy/modules/services/uwimap.te
 --- nsaserefpolicy/policy/modules/services/uwimap.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/uwimap.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/uwimap.te	2007-09-06 15:43:06.000000000 -0400
 @@ -64,6 +64,7 @@
  fs_search_auto_mountpoints(imapd_t)
  
@@ -8858,18 +8899,18 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uwim
  libs_use_shared_libs(imapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-3.0.7/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/services/w3c.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/w3c.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,2 @@
 +/usr/share/w3c-markup-validator(/.*)?		gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0)
 +/usr/share/w3c-markup-validator/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-3.0.7/policy/modules/services/w3c.if
 --- nsaserefpolicy/policy/modules/services/w3c.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/services/w3c.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/w3c.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>W3C</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.0.7/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/services/w3c.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/w3c.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,14 @@
 +policy_module(w3c,1.2.1)
 +
@@ -8887,7 +8928,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.
 +miscfiles_read_certs(httpd_w3c_validator_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.0.7/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -32,11 +32,6 @@
  /etc/X11/wdm/Xstartup.*	--	gen_context(system_u:object_r:xsession_exec_t,s0)
  /etc/X11/Xsession[^/]*	--	gen_context(system_u:object_r:xsession_exec_t,s0)
@@ -8913,7 +8954,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.0.7/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.if	2007-09-06 15:43:06.000000000 -0400
 @@ -126,6 +126,8 @@
  	# read events - the synaptics touchpad driver reads raw events
  	dev_rw_input_dev($1_xserver_t)
@@ -9246,7 +9287,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.0.7/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-08-22 07:14:07.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/services/xserver.te	2007-09-06 15:43:06.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -9412,7 +9453,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
 -') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-3.0.7/policy/modules/system/application.if
 --- nsaserefpolicy/policy/modules/system/application.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/application.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/application.if	2007-09-06 15:43:06.000000000 -0400
 @@ -63,6 +63,26 @@
  
  ########################################
@@ -9442,7 +9483,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/applic
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.0.7/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/authlogin.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/authlogin.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -14,6 +14,7 @@
  /sbin/pam_timestamp_check --	gen_context(system_u:object_r:pam_exec_t,s0)
  /sbin/unix_chkpwd	--	gen_context(system_u:object_r:chkpwd_exec_t,s0)
@@ -9453,7 +9494,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.0.7/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/authlogin.if	2007-09-05 15:03:49.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/authlogin.if	2007-09-06 15:43:06.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -9791,7 +9832,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.0.7/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/authlogin.te	2007-09-05 12:06:19.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/authlogin.te	2007-09-06 15:43:06.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -9866,13 +9907,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +logging_send_syslog_msg(updpwd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.fc serefpolicy-3.0.7/policy/modules/system/brctl.fc
 --- nsaserefpolicy/policy/modules/system/brctl.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/brctl.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/brctl.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,2 @@
 +
 +/usr/sbin/brctl		--	gen_context(system_u:object_r:brctl_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.if serefpolicy-3.0.7/policy/modules/system/brctl.if
 --- nsaserefpolicy/policy/modules/system/brctl.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/brctl.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/brctl.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,25 @@
 +
 +## <summary>Utilities for configuring the linux ethernet bridge</summary>
@@ -9901,7 +9942,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.te serefpolicy-3.0.7/policy/modules/system/brctl.te
 --- nsaserefpolicy/policy/modules/system/brctl.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/brctl.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/brctl.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,51 @@
 +policy_module(brctl,1.0.0)
 +
@@ -9956,7 +9997,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.0.7/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/fstools.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/fstools.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -20,7 +20,6 @@
  /sbin/mkfs.*		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/mkraid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -9967,7 +10008,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-3.0.7/policy/modules/system/fstools.if
 --- nsaserefpolicy/policy/modules/system/fstools.if	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/fstools.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/fstools.if	2007-09-06 15:43:06.000000000 -0400
 @@ -124,3 +124,22 @@
  
  	allow $1 swapfile_t:file getattr;
@@ -9993,7 +10034,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.0.7/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/fstools.te	2007-09-04 10:57:27.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/fstools.te	2007-09-06 15:43:06.000000000 -0400
 @@ -69,6 +69,7 @@
  
  dev_getattr_all_chr_files(fsadm_t)
@@ -10027,7 +10068,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.fc serefpolicy-3.0.7/policy/modules/system/fusermount.fc
 --- nsaserefpolicy/policy/modules/system/fusermount.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/fusermount.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/fusermount.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,7 @@
 +# fusermount executable will have:
 +# label: system_u:object_r:fusermount_exec_t
@@ -10038,7 +10079,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fuserm
 +/bin/fusermount		--	gen_context(system_u:object_r:fusermount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.if serefpolicy-3.0.7/policy/modules/system/fusermount.if
 --- nsaserefpolicy/policy/modules/system/fusermount.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/fusermount.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/fusermount.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,41 @@
 +## <summary>policy for fusermount</summary>
 +
@@ -10084,7 +10125,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fuserm
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-3.0.7/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/fusermount.te	2007-09-04 09:46:20.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/fusermount.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,44 @@
 +policy_module(fusermount,1.0.0)
 +
@@ -10132,7 +10173,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fuserm
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.0.7/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/getty.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/getty.te	2007-09-06 15:43:06.000000000 -0400
 @@ -33,7 +33,8 @@
  #
  
@@ -10145,7 +10186,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.
  allow getty_t self:fifo_file rw_fifo_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.0.7/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/hostname.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/hostname.te	2007-09-06 15:43:06.000000000 -0400
 @@ -8,7 +8,9 @@
  
  type hostname_t;
@@ -10171,7 +10212,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostna
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.0.7/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/init.if	2007-09-04 11:59:51.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/init.if	2007-09-06 15:43:06.000000000 -0400
 @@ -540,18 +540,19 @@
  #
  interface(`init_spec_domtrans_script',`
@@ -10387,7 +10428,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.i
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.0.7/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/init.te	2007-09-05 22:21:18.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/init.te	2007-09-06 15:43:06.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -10527,7 +10568,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.7/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/ipsec.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/ipsec.te	2007-09-06 15:43:06.000000000 -0400
 @@ -283,6 +283,7 @@
  allow racoon_t self:netlink_selinux_socket { bind create read };
  allow racoon_t self:udp_socket create_socket_perms;
@@ -10538,7 +10579,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.
  manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.0.7/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/iptables.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/iptables.te	2007-09-06 15:43:06.000000000 -0400
 @@ -44,6 +44,8 @@
  
  corenet_relabelto_all_packets(iptables_t)
@@ -10572,7 +10613,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptabl
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.7/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/libraries.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/libraries.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -65,11 +65,12 @@
  /opt/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
  /opt/(.*/)?jre.*/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -10616,7 +10657,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
 +/usr/lib/libtheora\.so.*  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.7/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/libraries.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/libraries.te	2007-09-06 15:43:06.000000000 -0400
 @@ -23,6 +23,9 @@
  init_system_domain(ldconfig_t,ldconfig_exec_t)
  role system_r types ldconfig_t;
@@ -10667,7 +10708,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.0.7/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/locallogin.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/locallogin.te	2007-09-06 15:43:06.000000000 -0400
 @@ -97,6 +97,11 @@
  term_setattr_all_user_ttys(local_login_t)
  term_setattr_unallocated_ttys(local_login_t)
@@ -10726,7 +10767,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locall
  # Sulogin local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.0.7/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/logging.fc	2007-08-31 06:46:14.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/logging.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,12 +1,15 @@
 -
  /dev/log		-s	gen_context(system_u:object_r:devlog_t,s0)
@@ -10764,7 +10805,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +/etc/rc\.d/init\.d/auditd	--	gen_context(system_u:object_r:auditd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.7/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/logging.if	2007-09-05 22:22:05.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/logging.if	2007-09-06 15:43:06.000000000 -0400
 @@ -33,8 +33,13 @@
  ## </param>
  #
@@ -11145,7 +11186,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.0.7/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/logging.te	2007-08-31 06:44:53.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/logging.te	2007-09-06 15:43:06.000000000 -0400
 @@ -7,6 +7,10 @@
  #
  
@@ -11281,7 +11322,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  files_dontaudit_search_isid_type_dirs(syslogd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.0.7/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/lvm.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/lvm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -15,6 +15,7 @@
  #
  /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
@@ -11292,7 +11333,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc
  /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.0.7/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/lvm.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/lvm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -150,7 +150,9 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
@@ -11339,7 +11380,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.0.7/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/miscfiles.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/miscfiles.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -66,6 +66,7 @@
  /var/lib/texmf(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
  
@@ -11350,7 +11391,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfi
  /var/spool/texmf(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.0.7/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/modutils.te	2007-09-04 11:46:50.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/modutils.te	2007-09-06 15:43:06.000000000 -0400
 @@ -42,7 +42,7 @@
  # insmod local policy
  #
@@ -11451,7 +11492,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/moduti
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.0.7/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/mount.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/mount.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,2 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -11459,7 +11500,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 -/usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.0.7/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/mount.te	2007-09-04 09:53:38.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/mount.te	2007-09-06 15:43:06.000000000 -0400
 @@ -8,6 +8,13 @@
  
  ## <desc>
@@ -11606,7 +11647,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlabel.te serefpolicy-3.0.7/policy/modules/system/netlabel.te
 --- nsaserefpolicy/policy/modules/system/netlabel.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/netlabel.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/netlabel.te	2007-09-06 15:43:06.000000000 -0400
 @@ -19,6 +19,8 @@
  allow netlabel_mgmt_t self:capability net_admin;
  allow netlabel_mgmt_t self:netlink_socket create_socket_perms;
@@ -11618,7 +11659,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlab
  libs_use_ld_so(netlabel_mgmt_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.0.7/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/raid.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/raid.te	2007-09-06 15:43:06.000000000 -0400
 @@ -19,7 +19,7 @@
  # Local policy
  #
@@ -11638,7 +11679,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.t
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.0.7/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -38,8 +38,9 @@
  /usr/sbin/restorecond		--	gen_context(system_u:object_r:restorecond_exec_t,s0)
  /usr/sbin/run_init		--	gen_context(system_u:object_r:run_init_exec_t,s0)
@@ -11652,7 +11693,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.0.7/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.if	2007-09-04 16:32:15.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.if	2007-09-06 15:43:06.000000000 -0400
 @@ -432,6 +432,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -11888,7 +11929,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.0.7/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-08-22 07:14:13.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/selinuxutil.te	2007-09-06 15:43:06.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(selinuxutil,1.6.2)
@@ -12062,7 +12103,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.0.7/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.if	2007-09-06 15:43:06.000000000 -0400
 @@ -522,6 +522,8 @@
  
  	files_search_etc($1)
@@ -12074,7 +12115,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.0.7/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-04 11:49:28.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/sysnetwork.te	2007-09-06 15:43:06.000000000 -0400
 @@ -45,7 +45,7 @@
  dontaudit dhcpc_t self:capability sys_tty_config;
  # for access("/etc/bashrc", X_OK) on Red Hat
@@ -12133,7 +12174,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.0.7/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-08-22 07:14:12.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/udev.te	2007-08-31 06:47:15.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/udev.te	2007-09-06 15:43:06.000000000 -0400
 @@ -68,8 +68,9 @@
  allow udev_t udev_tbl_t:file manage_file_perms;
  dev_filetrans(udev_t,udev_tbl_t,file)
@@ -12235,7 +12276,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.t
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.0.7/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.if	2007-09-06 15:43:06.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -12422,7 +12463,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.0.7/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-08-29 06:26:57.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/unconfined.te	2007-09-06 15:43:06.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -12620,7 +12661,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
 +corecmd_exec_all_executables(unconfined_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.0.7/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -1,4 +1,5 @@
  HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
@@ -12629,7 +12670,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
  /tmp/gconfd-USER -d	gen_context(system_u:object_r:ROLE_tmp_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.7/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-08-27 09:18:17.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 10:57:49.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.if	2007-09-06 15:43:06.000000000 -0400
 @@ -45,7 +45,7 @@
  	type $1_tty_device_t; 
  	term_user_tty($1_t,$1_tty_device_t)
@@ -13719,7 +13760,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.7/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-08-22 07:14:11.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-05 13:26:43.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/userdomain.te	2007-09-06 15:43:06.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -13828,12 +13869,12 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.fc serefpolicy-3.0.7/policy/modules/system/virt.fc
 --- nsaserefpolicy/policy/modules/system/virt.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +/var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.if serefpolicy-3.0.7/policy/modules/system/virt.if
 --- nsaserefpolicy/policy/modules/system/virt.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,58 @@
 +## <summary>Virtualization </summary>
 +
@@ -13895,14 +13936,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.i
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.0.7/policy/modules/system/virt.te
 --- nsaserefpolicy/policy/modules/system/virt.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/system/virt.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/virt.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,3 @@
 +# var/lib files
 +type virt_var_lib_t;
 +files_type(virt_var_lib_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.0.7/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.if	2007-09-06 15:43:06.000000000 -0400
 @@ -191,3 +191,24 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
@@ -13930,7 +13971,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.7/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/system/xen.te	2007-09-06 15:43:06.000000000 -0400
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -13990,17 +14031,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.7/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.7/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.7/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/guest.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,9 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -14013,17 +14054,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.t
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.7/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.7/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.7/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/logadm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -14060,22 +14101,22 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.
 +files_dontaudit_getattr_all_files(logadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.7/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/metadata.xml	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.7/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.fc	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.7/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.if	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.7/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-05 21:49:04.000000000 -0400
++++ serefpolicy-3.0.7/policy/modules/users/webadm.te	2007-09-06 15:43:06.000000000 -0400
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
@@ -14121,7 +14162,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.
 +allow webadm_t gadmin_t:dir getattr;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.7/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-08-22 07:14:18.000000000 -0400
-+++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/support/obj_perm_sets.spt	2007-09-06 15:43:06.000000000 -0400
 @@ -216,7 +216,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -14147,7 +14188,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.7/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.7/policy/users	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/policy/users	2007-09-06 15:43:06.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -14184,7 +14225,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0
 +gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.7/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.7/Rules.modular	2007-08-28 15:53:40.000000000 -0400
++++ serefpolicy-3.0.7/Rules.modular	2007-09-06 15:43:06.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 9ee4371..c1d8340 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -362,6 +362,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 6 2007 Dan Walsh <dwalsh@redhat.com> 3.0.7-5
+- Fix java labeling 
+
 * Thu Sep 6 2007 Dan Walsh <dwalsh@redhat.com> 3.0.7-4
 - Define user_home_type as home_type