From d44a393484abdd2498d471e368e7d80e85977460 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Aug 09 2007 19:18:57 +0000
Subject: - Fix nagios cgi

- allow squid to communicate with winbind

---

diff --git a/policy-20070703.patch b/policy-20070703.patch
index 9a20abd..cb78277 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.5/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mcs/default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/default_contexts	2007-08-07 09:39:49.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.5/config/appconfig-mcs/default_type
 --- nsaserefpolicy/config/appconfig-mcs/default_type	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mcs/default_type	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/default_type	2007-08-07 09:39:49.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.5/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mcs/failsafe_context	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/failsafe_context	2007-08-07 09:39:49.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.5/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.5/config/appconfig-mcs/guest_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/guest_u_default_contexts	2007-08-07 09:39:49.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.5/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mcs/root_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/root_default_contexts	2007-08-07 09:39:49.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.5/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mcs/seusers	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/seusers	2007-08-07 09:39:49.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.5/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.5/config/appconfig-mcs/staff_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/staff_u_default_contexts	2007-08-07 09:39:49.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.5/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-08-02 08:17:32.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mcs/userhelper_context	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/userhelper_context	2007-08-07 09:39:49.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.5/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.5/config/appconfig-mcs/user_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/user_u_default_contexts	2007-08-07 09:39:49.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.5/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.5/config/appconfig-mcs/xguest_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/xguest_u_default_contexts	2007-08-07 09:39:49.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.5/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mls/default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mls/default_contexts	2007-08-07 09:39:49.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.5/config/appconfig-mls/default_type
 --- nsaserefpolicy/config/appconfig-mls/default_type	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mls/default_type	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mls/default_type	2007-08-07 09:39:49.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.5/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.5/config/appconfig-mls/guest_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mls/guest_u_default_contexts	2007-08-07 09:39:49.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.5/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2007-08-02 08:17:30.000000000 -0400
-+++ serefpolicy-3.0.5/config/appconfig-mls/root_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mls/root_default_contexts	2007-08-07 09:39:49.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.5/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.5/config/appconfig-mls/staff_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mls/staff_u_default_contexts	2007-08-07 09:39:49.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.5/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.5/config/appconfig-mls/user_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mls/user_u_default_contexts	2007-08-07 09:39:49.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.5/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.5/config/appconfig-standard/guest_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-standard/guest_u_default_contexts	2007-08-07 09:39:49.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.5/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.5/config/appconfig-standard/staff_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-standard/staff_u_default_contexts	2007-08-07 09:39:49.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.5/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.5/config/appconfig-standard/user_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-standard/user_u_default_contexts	2007-08-07 09:39:49.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.5/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.5/config/appconfig-standard/xguest_u_default_contexts	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-standard/xguest_u_default_contexts	2007-08-07 09:39:49.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.5/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.5/man/man8/ftpd_selinux.8	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/man/man8/ftpd_selinux.8	2007-08-07 09:39:49.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/policy/flask/access_vectors serefpolicy-3.0.5/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/flask/access_vectors	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/flask/access_vectors	2007-08-07 09:39:49.000000000 -0400
 @@ -625,6 +625,8 @@
  	send
  	recv
@@ -280,7 +280,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.5/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/global_tunables	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/global_tunables	2007-08-07 09:39:49.000000000 -0400
 @@ -133,3 +133,10 @@
  ## </desc>
  gen_tunable(write_untrusted_content,false)
@@ -294,7 +294,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables seref
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.0.5/policy/mls
 --- nsaserefpolicy/policy/mls	2007-07-03 07:06:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/mls	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/mls	2007-08-07 09:39:49.000000000 -0400
 @@ -89,12 +89,14 @@
  mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
  	(( l1 eq l2 ) or
@@ -377,20 +377,9 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.0.5
  	 ( t2 == unlabeled_t ));
  
  mlsconstrain association { polmatch }
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-3.0.5/policy/modules/admin/acct.te
---- nsaserefpolicy/policy/modules/admin/acct.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/acct.te	2007-08-03 14:06:26.000000000 -0400
-@@ -9,6 +9,7 @@
- type acct_t;
- type acct_exec_t;
- init_system_domain(acct_t,acct_exec_t)
-+application_executable_file(acct_exec_t)
- 
- type acct_data_t;
- logging_log_file(acct_data_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-3.0.5/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/alsa.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/alsa.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -1,4 +1,7 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -401,7 +390,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.5/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/alsa.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/alsa.te	2007-08-07 09:39:49.000000000 -0400
 @@ -19,20 +19,24 @@
  # Local policy
  #
@@ -447,7 +436,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/anaconda.te serefpolicy-3.0.5/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/anaconda.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/anaconda.te	2007-08-07 09:39:49.000000000 -0400
 @@ -31,16 +31,13 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -468,7 +457,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.5/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/bootloader.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/bootloader.te	2007-08-07 09:39:49.000000000 -0400
 @@ -180,6 +180,7 @@
  
  optional_policy(`
@@ -479,7 +468,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/consoletype.te serefpolicy-3.0.5/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/consoletype.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/consoletype.te	2007-08-07 09:39:49.000000000 -0400
 @@ -8,9 +8,11 @@
  
  type consoletype_t;
@@ -517,7 +506,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/console
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.0.5/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/kudzu.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/kudzu.te	2007-08-07 09:39:49.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -556,7 +545,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.t
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.0.5/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/logrotate.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/logrotate.te	2007-08-07 09:39:49.000000000 -0400
 @@ -75,11 +75,13 @@
  mls_file_read_up(logrotate_t)
  mls_file_write_down(logrotate_t)
@@ -605,7 +594,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.5/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/logwatch.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/logwatch.te	2007-08-07 10:18:57.000000000 -0400
 @@ -29,7 +29,6 @@
  allow logwatch_t self:process signal;
  allow logwatch_t self:fifo_file rw_file_perms;
@@ -614,6 +603,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatc
  
  manage_dirs_pattern(logwatch_t,logwatch_cache_t,logwatch_cache_t)
  manage_files_pattern(logwatch_t,logwatch_cache_t,logwatch_cache_t)
+@@ -49,7 +48,7 @@
+ corecmd_exec_shell(logwatch_t)
+ 
+ dev_read_urand(logwatch_t)
+-dev_search_sysfs(logwatch_t)
++dev_list_sysfs(logwatch_t)
+ 
+ # Read /proc/PID directories for all domains.
+ domain_read_all_domains_state(logwatch_t)
 @@ -68,6 +67,9 @@
  fs_getattr_all_fs(logwatch_t)
  fs_dontaudit_list_auto_mountpoints(logwatch_t)
@@ -658,16 +656,8 @@ 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.5/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/netutils.te	2007-08-03 14:06:26.000000000 -0400
-@@ -29,6 +29,7 @@
- type traceroute_t;
- type traceroute_exec_t;
- init_system_domain(traceroute_t,traceroute_exec_t)
-+application_executable_file(traceroute_exec_t)
- role system_r types traceroute_t;
- 
- ########################################
-@@ -113,6 +114,7 @@
++++ serefpolicy-3.0.5/policy/modules/admin/netutils.te	2007-08-07 09:39:49.000000000 -0400
+@@ -113,6 +113,7 @@
  corenet_tcp_sendrecv_all_if(ping_t)
  corenet_raw_sendrecv_all_if(ping_t)
  corenet_raw_sendrecv_all_nodes(ping_t)
@@ -677,7 +667,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.5/policy/modules/admin/portage.if
 --- nsaserefpolicy/policy/modules/admin/portage.if	2007-07-03 07:06:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/portage.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/portage.if	2007-08-07 09:39:49.000000000 -0400
 @@ -324,6 +324,7 @@
  	seutil_domtrans_setfiles($1)
  	# run semodule
@@ -688,7 +678,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.5/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2007-08-02 08:17:29.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/prelink.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/prelink.te	2007-08-09 14:25:10.000000000 -0400
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -740,7 +730,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.5/policy/modules/admin/readahead.fc
 --- nsaserefpolicy/policy/modules/admin/readahead.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/readahead.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/readahead.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -2,3 +2,4 @@
  # /usr
  #
@@ -748,7 +738,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.5/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/readahead.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/readahead.te	2007-08-07 09:39:49.000000000 -0400
 @@ -9,19 +9,24 @@
  type readahead_t;
  type readahead_exec_t;
@@ -805,7 +795,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.5/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/rpm.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/rpm.fc	2007-08-07 09:39:49.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)
@@ -818,7 +808,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.5/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/rpm.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/rpm.if	2007-08-07 09:39:49.000000000 -0400
 @@ -210,6 +210,24 @@
  
  ########################################
@@ -962,17 +952,8 @@ 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.5/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/rpm.te	2007-08-03 14:06:26.000000000 -0400
-@@ -9,6 +9,8 @@
- type rpm_t;
- type rpm_exec_t;
- init_system_domain(rpm_t,rpm_exec_t)
-+application_executable_file(rpm_exec_t)
-+
- domain_obj_id_change_exemption(rpm_t)
- domain_role_change_exemption(rpm_t)
- domain_system_change_exemption(rpm_t)
-@@ -321,6 +323,7 @@
++++ serefpolicy-3.0.5/policy/modules/admin/rpm.te	2007-08-07 09:39:49.000000000 -0400
+@@ -321,6 +321,7 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -982,7 +963,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.5/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/sudo.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/sudo.if	2007-08-07 09:39:49.000000000 -0400
 @@ -68,7 +68,6 @@
  	allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_sudo_t self:unix_dgram_socket sendto;
@@ -1031,7 +1012,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.5/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/su.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/su.if	2007-08-07 09:39:49.000000000 -0400
 @@ -41,12 +41,11 @@
  
  	allow $2 $1_su_t:process signal;
@@ -1126,7 +1107,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.5/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/usermanage.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/usermanage.if	2007-08-07 09:39:49.000000000 -0400
 @@ -278,5 +278,5 @@
  		type crack_db_t;
  	')
@@ -1136,7 +1117,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.5/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/usermanage.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/usermanage.te	2007-08-07 09:39:49.000000000 -0400
 @@ -92,6 +92,7 @@
  dev_read_urand(chfn_t)
  
@@ -1280,7 +1261,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.5/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/admin/vbetool.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/admin/vbetool.te	2007-08-07 09:39:49.000000000 -0400
 @@ -32,4 +32,5 @@
  
  optional_policy(`
@@ -1289,7 +1270,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.5/policy/modules/apps/ada.if
 --- nsaserefpolicy/policy/modules/apps/ada.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/ada.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/ada.if	2007-08-07 09:39:49.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, ada_exec_t, ada_t)
@@ -1327,7 +1308,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.5/policy/modules/apps/games.fc
 --- nsaserefpolicy/policy/modules/apps/games.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/games.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/games.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -1,22 +1,16 @@
  #
  # /usr
@@ -1356,7 +1337,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.5/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/gnome.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/gnome.fc	2007-08-07 09:39:49.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)
@@ -1369,7 +1350,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.5/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/gnome.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/gnome.if	2007-08-07 09:39:49.000000000 -0400
 @@ -33,6 +33,51 @@
  ## </param>
  #
@@ -1557,7 +1538,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.5/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/gnome.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/gnome.te	2007-08-07 09:39:49.000000000 -0400
 @@ -8,8 +8,5 @@
  
  attribute gnomedomain;
@@ -1569,7 +1550,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.if serefpolicy-3.0.5/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/java.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/java.if	2007-08-07 09:39:49.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -1712,7 +1693,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.5/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/java.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/java.te	2007-08-07 09:39:49.000000000 -0400
 @@ -31,3 +31,7 @@
  	unconfined_domain_noaudit(java_t)
  	unconfined_dbus_chat(java_t)
@@ -1723,7 +1704,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.5/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/loadkeys.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/loadkeys.te	2007-08-07 09:39:49.000000000 -0400
 @@ -30,7 +30,7 @@
  files_read_etc_runtime_files(loadkeys_t)
  
@@ -1744,7 +1725,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.5/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/mono.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/mono.if	2007-08-07 09:39:49.000000000 -0400
 @@ -18,3 +18,98 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
@@ -1846,7 +1827,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.5/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/mono.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/mono.te	2007-08-07 09:39:49.000000000 -0400
 @@ -46,3 +46,7 @@
  	unconfined_dbus_chat(mono_t)
  	unconfined_dbus_connect(mono_t)
@@ -1857,7 +1838,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.5/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2007-08-02 08:17:26.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/mozilla.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/mozilla.if	2007-08-07 09:39:49.000000000 -0400
 @@ -36,6 +36,8 @@
  	gen_require(`
  		type mozilla_conf_t, mozilla_exec_t;
@@ -2203,7 +2184,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.5/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/mozilla.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/mozilla.te	2007-08-07 09:39:49.000000000 -0400
 @@ -6,13 +6,6 @@
  # Declarations
  #
@@ -2220,7 +2201,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.5/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/slocate.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/slocate.te	2007-08-07 09:39:49.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)
@@ -2232,7 +2213,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.5/policy/modules/apps/userhelper.if
 --- nsaserefpolicy/policy/modules/apps/userhelper.if	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/userhelper.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/userhelper.if	2007-08-07 09:39:49.000000000 -0400
 @@ -130,6 +130,7 @@
  	term_use_all_user_ptys($1_userhelper_t)
  
@@ -2243,7 +2224,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.5/policy/modules/apps/usernetctl.te
 --- nsaserefpolicy/policy/modules/apps/usernetctl.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/usernetctl.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/usernetctl.te	2007-08-07 09:39:49.000000000 -0400
 @@ -6,14 +6,6 @@
  # Declarations
  #
@@ -2261,7 +2242,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.5/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2007-07-03 07:05:43.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/vmware.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/vmware.fc	2007-08-07 09:39:49.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)
@@ -2272,7 +2253,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.5/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2007-07-25 10:37:37.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/vmware.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/vmware.te	2007-08-07 09:39:49.000000000 -0400
 @@ -29,7 +29,7 @@
  
  allow vmware_host_t self:capability { setuid net_raw };
@@ -2293,7 +2274,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.5/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/apps/wine.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/apps/wine.if	2007-08-07 09:39:49.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, wine_exec_t, wine_t)
@@ -2331,7 +2312,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.5/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/corecommands.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/corecommands.fc	2007-08-07 09:39:49.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)
@@ -2374,7 +2355,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  /usr/share/system-config-securitylevel/system-config-securitylevel\.py -- gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.0.5/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/corenetwork.te.in	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/corenetwork.te.in	2007-08-07 09:39:49.000000000 -0400
 @@ -55,6 +55,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2435,7 +2416,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.5/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/devices.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/devices.fc	2007-08-07 09:39:49.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)
@@ -2481,7 +2462,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.5/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/devices.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/devices.if	2007-08-07 09:39:49.000000000 -0400
 @@ -2803,6 +2803,24 @@
  
  ########################################
@@ -2509,7 +2490,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.5/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/domain.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/domain.if	2007-08-07 09:39:49.000000000 -0400
 @@ -45,6 +45,11 @@
  	# start with basic domain
  	domain_base_type($1)
@@ -2553,7 +2534,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.5/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/domain.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/domain.te	2007-08-07 09:39:49.000000000 -0400
 @@ -6,6 +6,29 @@
  # Declarations
  #
@@ -2612,7 +2593,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.5/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/files.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/files.if	2007-08-09 14:25:41.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2794,7 +2775,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.5/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/files.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/files.te	2007-08-07 09:39:49.000000000 -0400
 @@ -55,6 +55,8 @@
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
@@ -2806,7 +2787,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.5/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/filesystem.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/filesystem.if	2007-08-07 09:39:49.000000000 -0400
 @@ -1192,6 +1192,24 @@
  
  ########################################
@@ -2886,7 +2867,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.5/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/filesystem.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/filesystem.te	2007-08-08 08:01:18.000000000 -0400
 @@ -43,6 +43,12 @@
  #
  # Non-persistent/pseudo filesystems
@@ -2910,7 +2891,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
  # filesystem SID to label inodes in the following filesystem types,
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.0.5/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/kernel.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/kernel.if	2007-08-07 09:39:49.000000000 -0400
 @@ -108,6 +108,24 @@
  
  ########################################
@@ -2966,7 +2947,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.5/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/kernel.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/kernel.te	2007-08-07 09:39:49.000000000 -0400
 @@ -26,9 +26,6 @@
  role staff_r;
  role user_r;
@@ -2987,7 +2968,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/mls.if serefpolicy-3.0.5/policy/modules/kernel/mls.if
 --- nsaserefpolicy/policy/modules/kernel/mls.if	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/mls.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/mls.if	2007-08-07 09:39:49.000000000 -0400
 @@ -154,6 +154,26 @@
  ########################################
  ## <summary>
@@ -3017,7 +2998,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-3.0.5/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/mls.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/mls.te	2007-08-07 09:39:49.000000000 -0400
 @@ -18,6 +18,7 @@
  attribute mlsnetreadtoclr;
  attribute mlsnetwrite;
@@ -3037,7 +3018,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te
  attribute privrangetrans;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.0.5/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-07-03 07:05:38.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/selinux.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/selinux.if	2007-08-07 09:39:49.000000000 -0400
 @@ -138,6 +138,7 @@
  		type security_t;
  	')
@@ -3056,7 +3037,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinu
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.0.5/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/storage.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/storage.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  /dev/lvm		-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -3067,7 +3048,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
  /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.0.5/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2007-06-15 14:54:30.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/storage.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/storage.if	2007-08-07 09:39:49.000000000 -0400
 @@ -100,6 +100,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -3086,7 +3067,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.fc serefpolicy-3.0.5/policy/modules/kernel/terminal.fc
 --- nsaserefpolicy/policy/modules/kernel/terminal.fc	2007-05-29 14:10:48.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/terminal.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/terminal.fc	2007-08-07 09:39:49.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)
@@ -3097,7 +3078,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.5/policy/modules/kernel/terminal.te
 --- nsaserefpolicy/policy/modules/kernel/terminal.te	2007-07-25 10:37:36.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/kernel/terminal.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/kernel/terminal.te	2007-08-07 09:39:49.000000000 -0400
 @@ -28,9 +28,15 @@
  type devpts_t;
  files_mountpoint(devpts_t)
@@ -3127,7 +3108,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.5/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/amavis.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/amavis.te	2007-08-09 14:18:32.000000000 -0400
 @@ -166,6 +166,7 @@
  
  optional_policy(`
@@ -3138,7 +3119,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.5/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/apache.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/apache.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -16,7 +16,6 @@
  
  /usr/lib/apache-ssl/.+		--	gen_context(system_u:object_r:httpd_exec_t,s0)
@@ -3164,7 +3145,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.if serefpolicy-3.0.5/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/apache.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/apache.if	2007-08-07 09:39:49.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -3463,7 +3444,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.5/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/apache.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/apache.te	2007-08-07 10:24:54.000000000 -0400
 @@ -30,6 +30,13 @@
  
  ## <desc>
@@ -3668,7 +3649,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  	calamaris_read_www_files(httpd_t)
  ')
  
-@@ -512,10 +600,16 @@
+@@ -461,7 +549,6 @@
+ 
+ optional_policy(`
+ 	nagios_read_config(httpd_t)
+-	nagios_domtrans_cgi(httpd_t)
+ ')
+ 
+ optional_policy(`
+@@ -512,10 +599,16 @@
  tunable_policy(`httpd_tty_comm',`
  	# cjp: this is redundant:
  	term_use_controlling_term(httpd_helper_t)
@@ -3686,7 +3675,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  ########################################
  #
  # Apache PHP script local policy
-@@ -567,7 +661,6 @@
+@@ -567,7 +660,6 @@
  allow httpd_suexec_t self:capability { setuid setgid };
  allow httpd_suexec_t self:process signal_perms;
  allow httpd_suexec_t self:unix_stream_socket create_stream_socket_perms;
@@ -3694,7 +3683,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  
  domtrans_pattern(httpd_t, httpd_suexec_exec_t, httpd_suexec_t)
  
-@@ -581,6 +674,8 @@
+@@ -581,6 +673,8 @@
  manage_files_pattern(httpd_suexec_t,httpd_suexec_tmp_t,httpd_suexec_tmp_t)
  files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
  
@@ -3703,7 +3692,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  kernel_read_kernel_sysctls(httpd_suexec_t)
  kernel_list_proc(httpd_suexec_t)
  kernel_read_proc_symlinks(httpd_suexec_t)
-@@ -606,6 +701,10 @@
+@@ -606,6 +700,10 @@
  
  miscfiles_read_localization(httpd_suexec_t)
  
@@ -3714,7 +3703,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  tunable_policy(`httpd_can_network_connect',`
  	allow httpd_suexec_t self:tcp_socket create_stream_socket_perms;
  	allow httpd_suexec_t self:udp_socket create_socket_perms;
-@@ -620,10 +719,13 @@
+@@ -620,10 +718,13 @@
  	corenet_udp_sendrecv_all_ports(httpd_suexec_t)
  	corenet_tcp_connect_all_ports(httpd_suexec_t)
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
@@ -3729,7 +3718,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
  ')
-@@ -634,6 +736,12 @@
+@@ -634,6 +735,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -3742,11 +3731,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -655,14 +763,6 @@
- 	nagios_domtrans_cgi(httpd_suexec_t)
+@@ -651,18 +758,6 @@
+ 	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
 -optional_policy(`
+-	nagios_domtrans_cgi(httpd_suexec_t)
+-')
+-
+-optional_policy(`
 -	nis_use_ypbind(httpd_suexec_t)
 -')
 -
@@ -3757,7 +3750,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  ########################################
  #
  # Apache system script local policy
-@@ -672,7 +772,8 @@
+@@ -672,7 +767,8 @@
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
@@ -3767,7 +3760,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  
  allow httpd_sys_script_t squirrelmail_spool_t:dir list_dir_perms;
  read_files_pattern(httpd_sys_script_t,squirrelmail_spool_t,squirrelmail_spool_t)
-@@ -686,15 +787,66 @@
+@@ -686,15 +782,66 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -3835,7 +3828,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_sys_script_t)
  	fs_read_cifs_symlinks(httpd_sys_script_t)
-@@ -711,6 +863,19 @@
+@@ -711,6 +858,19 @@
  
  ########################################
  #
@@ -3855,7 +3848,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
  # httpd_rotatelogs local policy
  #
  
-@@ -728,3 +893,27 @@
+@@ -728,3 +888,27 @@
  logging_search_logs(httpd_rotatelogs_t)
  
  miscfiles_read_localization(httpd_rotatelogs_t)
@@ -3885,7 +3878,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.5/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/apcupsd.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/apcupsd.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -5,5 +5,11 @@
  /usr/sbin/apcupsd		--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
  
@@ -3900,7 +3893,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.5/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/apcupsd.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/apcupsd.if	2007-08-07 09:39:49.000000000 -0400
 @@ -79,3 +79,25 @@
  	allow $1 apcupsd_log_t:dir list_dir_perms;
  	allow $1 apcupsd_log_t:file { getattr append };
@@ -3929,7 +3922,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.5/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/apcupsd.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/apcupsd.te	2007-08-07 09:39:49.000000000 -0400
 @@ -16,6 +16,9 @@
  type apcupsd_log_t;
  logging_log_file(apcupsd_log_t)
@@ -4032,7 +4025,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.5/policy/modules/services/audioentropy.te
 --- nsaserefpolicy/policy/modules/services/audioentropy.te	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/audioentropy.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/audioentropy.te	2007-08-07 09:39:49.000000000 -0400
 @@ -18,7 +18,7 @@
  # Local policy
  #
@@ -4053,7 +4046,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.5/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/automount.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/automount.te	2007-08-07 09:39:49.000000000 -0400
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -4083,7 +4076,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.5/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/avahi.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/avahi.te	2007-08-07 09:39:49.000000000 -0400
 @@ -57,6 +57,7 @@
  
  fs_getattr_all_fs(avahi_t)
@@ -4094,7 +4087,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.5/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/bind.fc	2007-08-05 07:24:05.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/bind.fc	2007-08-07 09:39:49.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)
@@ -4105,7 +4098,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.5/policy/modules/services/bind.te
 --- nsaserefpolicy/policy/modules/services/bind.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/bind.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/bind.te	2007-08-07 09:39:49.000000000 -0400
 @@ -119,6 +119,11 @@
  corenet_sendrecv_dns_client_packets(named_t)
  corenet_sendrecv_rndc_server_packets(named_t)
@@ -4128,7 +4121,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/bluetooth.te serefpolicy-3.0.5/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-08-02 08:17:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/bluetooth.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/bluetooth.te	2007-08-07 09:39:49.000000000 -0400
 @@ -128,6 +128,7 @@
  	dbus_system_bus_client_template(bluetooth,bluetooth_t)
  	dbus_connect_system_bus(bluetooth_t)
@@ -4139,7 +4132,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/blue
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.0.5/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/clamav.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/clamav.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -9,6 +9,8 @@
  
  /var/run/amavis(d)?/clamd\.pid	--	gen_context(system_u:object_r:clamd_var_run_t,s0)
@@ -4151,7 +4144,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.5/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/clamav.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/clamav.te	2007-08-07 09:39:49.000000000 -0400
 @@ -74,17 +74,19 @@
  manage_files_pattern(clamd_t,clamd_var_lib_t,clamd_var_lib_t)
  
@@ -4199,7 +4192,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.5/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/consolekit.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/consolekit.te	2007-08-07 09:39:49.000000000 -0400
 @@ -10,7 +10,6 @@
  type consolekit_exec_t;
  init_daemon_domain(consolekit_t, consolekit_exec_t)
@@ -4260,7 +4253,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.5/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/courier.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/courier.te	2007-08-07 09:39:49.000000000 -0400
 @@ -58,6 +58,7 @@
  files_getattr_tmp_dirs(courier_authdaemon_t)
  
@@ -4271,7 +4264,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cour
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.0.5/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/cron.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/cron.fc	2007-08-07 09:39:49.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)
@@ -4288,7 +4281,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.5/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/cron.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/cron.if	2007-08-07 09:39:49.000000000 -0400
 @@ -35,6 +35,7 @@
  #
  template(`cron_per_role_template',`
@@ -4438,7 +4431,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.5/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/cron.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/cron.te	2007-08-07 09:39:49.000000000 -0400
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -4653,7 +4646,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.5/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/cups.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/cups.fc	2007-08-07 09:39:49.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)
@@ -4678,7 +4671,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.5/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/cups.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/cups.te	2007-08-07 09:39:49.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 };
@@ -4858,7 +4851,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.5/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/cvs.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/cvs.te	2007-08-07 09:39:49.000000000 -0400
 @@ -16,6 +16,7 @@
  type cvs_t;
  type cvs_exec_t;
@@ -4885,7 +4878,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.5/policy/modules/services/dbus.fc
 --- nsaserefpolicy/policy/modules/services/dbus.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/dbus.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/dbus.fc	2007-08-07 09:39:49.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)
@@ -4897,7 +4890,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.5/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/dbus.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/dbus.if	2007-08-07 09:39:49.000000000 -0400
 @@ -50,6 +50,12 @@
  ## </param>
  #
@@ -5027,7 +5020,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.5/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/dbus.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/dbus.te	2007-08-07 09:39:49.000000000 -0400
 @@ -23,6 +23,9 @@
  type system_dbusd_var_run_t;
  files_pid_file(system_dbusd_var_run_t)
@@ -5049,7 +5042,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
  files_pid_filetrans(system_dbusd_t,system_dbusd_var_run_t,file)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.0.5/policy/modules/services/dhcp.te
 --- nsaserefpolicy/policy/modules/services/dhcp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/dhcp.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/dhcp.te	2007-08-07 09:39:49.000000000 -0400
 @@ -114,6 +114,8 @@
  	dbus_system_bus_client_template(dhcpd,dhcpd_t)
  	dbus_connect_system_bus(dhcpd_t)
@@ -5061,7 +5054,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/dovecot.fc serefpolicy-3.0.5/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/dovecot.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/dovecot.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -17,16 +17,19 @@
  
  ifdef(`distro_debian', `
@@ -5084,7 +5077,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.5/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/dovecot.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/dovecot.if	2007-08-07 09:39:49.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)
@@ -5131,7 +5124,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.5/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/dovecot.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/dovecot.te	2007-08-07 09:39:49.000000000 -0400
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -5273,7 +5266,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.5/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/ftp.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/ftp.te	2007-08-07 09:39:49.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;
@@ -5317,7 +5310,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.5/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/hal.fc	2007-08-03 14:45:56.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/hal.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -8,9 +8,15 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
  
@@ -5336,7 +5329,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.5/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/hal.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/hal.if	2007-08-07 09:39:49.000000000 -0400
 @@ -208,3 +208,98 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -5438,7 +5431,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.5/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/hal.te	2007-08-03 14:48:58.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/hal.te	2007-08-09 14:46:39.000000000 -0400
 @@ -22,6 +22,12 @@
  type hald_log_t;
  files_type(hald_log_t)
@@ -5560,7 +5553,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.5/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/inetd.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/inetd.te	2007-08-07 09:39:49.000000000 -0400
 @@ -80,16 +80,21 @@
  corenet_udp_bind_comsat_port(inetd_t)
  corenet_tcp_bind_dbskkd_port(inetd_t)
@@ -5632,7 +5625,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.te serefpolicy-3.0.5/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/kerberos.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/kerberos.te	2007-08-07 09:39:49.000000000 -0400
 @@ -91,6 +91,7 @@
  kernel_read_kernel_sysctls(kadmind_t)
  kernel_list_proc(kadmind_t)
@@ -5669,7 +5662,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/lpd.if serefpolicy-3.0.5/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/lpd.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/lpd.if	2007-08-07 09:39:49.000000000 -0400
 @@ -394,3 +394,22 @@
  
  	domtrans_pattern($2, lpr_exec_t, $1_lpr_t)
@@ -5695,7 +5688,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.5/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/mailman.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/mailman.te	2007-08-07 09:39:49.000000000 -0400
 @@ -96,6 +96,7 @@
  kernel_read_proc_symlinks(mailman_queue_t)
  
@@ -5706,13 +5699,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.5/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/services/mailscanner.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/mailscanner.fc	2007-08-07 09:39:49.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.5/policy/modules/services/mailscanner.if
 --- nsaserefpolicy/policy/modules/services/mailscanner.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/services/mailscanner.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/mailscanner.if	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,59 @@
 +## <summary>Anti-Virus and Anti-Spam Filter</summary>
 +
@@ -5775,7 +5768,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.5/policy/modules/services/mailscanner.te
 --- nsaserefpolicy/policy/modules/services/mailscanner.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/services/mailscanner.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/mailscanner.te	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,5 @@
 +
 +policy_module(mailscanner,1.0.0)
@@ -5784,7 +5777,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.5/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/mta.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/mta.if	2007-08-07 09:39:49.000000000 -0400
 @@ -392,6 +392,7 @@
  	allow $1 mail_spool_t:dir list_dir_perms;
  	create_files_pattern($1,mail_spool_t,mail_spool_t)
@@ -5795,7 +5788,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.0.5/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/mta.te	2007-08-05 07:28:01.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/mta.te	2007-08-07 10:28:37.000000000 -0400
 @@ -44,6 +44,7 @@
  kernel_read_system_state(system_mail_t)
  kernel_read_network_state(system_mail_t)
@@ -5804,10 +5797,12 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  dev_read_rand(system_mail_t)
  dev_read_urand(system_mail_t)
  
-@@ -52,15 +53,44 @@
+@@ -51,16 +52,46 @@
+ 
  userdom_use_sysadm_terms(system_mail_t)
  userdom_dontaudit_search_sysadm_home_dirs(system_mail_t)
- 
++userdom_dontaudit_search_all_users_home_content(system_mail_t)
++
 +ifdef(`targeted_policy',`
 +
 +	manage_dirs_pattern(system_mail_t,mail_spool_t,mail_spool_t)
@@ -5834,7 +5829,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
 +		libs_exec_lib_files(system_mail_t)
 +#	')
 +')
-+
+ 
  optional_policy(`
  	apache_read_squirrelmail_data(system_mail_t)
  	apache_append_squirrelmail_data(system_mail_t)
@@ -5849,7 +5844,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  ')
  
  optional_policy(`
-@@ -73,6 +103,7 @@
+@@ -73,6 +104,7 @@
  
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
@@ -5859,21 +5854,130 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.0.5/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/nagios.fc	2007-08-03 14:06:26.000000000 -0400
-@@ -4,8 +4,8 @@
++++ serefpolicy-3.0.5/policy/modules/services/nagios.fc	2007-08-07 09:39:49.000000000 -0400
+@@ -4,13 +4,13 @@
  /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)
  
 -/usr/lib(64)?/cgi-bin/netsaint/.+ --	gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
 -/usr/lib(64)?/nagios/cgi/.+	--	gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
-+/usr/lib(64)?/cgi-bin/netsaint(/.*)?	gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
-+/usr/lib(64)?/nagios/cgi(/.*)?		gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
++/usr/lib(64)?/cgi-bin/netsaint(/.*)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
++/usr/lib(64)?/nagios/cgi(/.*)?		gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
  
  /var/log/nagios(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
  /var/log/netsaint(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
+ 
+ ifdef(`distro_debian',`
+ /usr/sbin/nagios		--	gen_context(system_u:object_r:nagios_exec_t,s0)
+-/usr/lib/cgi-bin/nagios/.+	--	gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
+ ')
++/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.5/policy/modules/services/nagios.if
+--- nsaserefpolicy/policy/modules/services/nagios.if	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/nagios.if	2007-08-07 10:23:18.000000000 -0400
+@@ -44,25 +44,6 @@
+ 
+ ########################################
+ ## <summary>
+-##	Execute the nagios CGI with
+-##	a domain transition.
+-## </summary>
+-## <param name="domain">
+-##	<summary>
+-##	Domain allowed access.
+-##	</summary>
+-## </param>
+-#
+-interface(`nagios_domtrans_cgi',`
+-	gen_require(`
+-		type nagios_cgi_t, nagios_cgi_exec_t;
+-	')
+-
+-	domtrans_pattern($1,nagios_cgi_exec_t,nagios_cgi_t)
+-')
+-
+-########################################
+-## <summary>
+ ##	Execute the nagios NRPE with
+ ##	a domain transition.
+ ## </summary>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.0.5/policy/modules/services/nagios.te
+--- nsaserefpolicy/policy/modules/services/nagios.te	2007-07-25 10:37:42.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/nagios.te	2007-08-07 10:13:41.000000000 -0400
+@@ -10,10 +10,6 @@
+ type nagios_exec_t;
+ init_daemon_domain(nagios_t,nagios_exec_t)
+ 
+-type nagios_cgi_t;
+-type nagios_cgi_exec_t;
+-init_system_domain(nagios_cgi_t,nagios_cgi_exec_t)
+-
+ type nagios_etc_t;
+ files_config_file(nagios_etc_t)
+ 
+@@ -132,42 +128,31 @@
+ #
+ # Nagios CGI local policy
+ #
++apache_content_template(nagios)
++typealias httpd_nagios_script_t alias nagios_cgi_t;
++typealias httpd_nagios_script_exec_t alias nagios_cgi_exec_t;
+ 
+-allow nagios_cgi_t self:process signal_perms;
+-allow nagios_cgi_t self:fifo_file rw_fifo_file_perms;
+-
+-read_files_pattern(nagios_cgi_t,nagios_t,nagios_t)
+-read_lnk_files_pattern(nagios_cgi_t,nagios_t,nagios_t)
+-
+-allow nagios_cgi_t nagios_etc_t:dir list_dir_perms;
+-read_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_etc_t)
+-read_lnk_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_etc_t)
+-
+-allow nagios_cgi_t nagios_log_t:dir list_dir_perms;
+-read_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_log_t)
+-read_lnk_files_pattern(nagios_cgi_t,nagios_etc_t,nagios_log_t)
++allow httpd_nagios_script_t self:process signal_perms;
+ 
+-kernel_read_system_state(nagios_cgi_t)
++read_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
++read_lnk_files_pattern(httpd_nagios_script_t,nagios_t,nagios_t)
+ 
+-corecmd_exec_bin(nagios_cgi_t)
++allow httpd_nagios_script_t nagios_etc_t:dir list_dir_perms;
++read_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_etc_t)
++read_lnk_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_etc_t)
+ 
+-domain_dontaudit_read_all_domains_state(nagios_cgi_t)
++allow httpd_nagios_script_t nagios_log_t:dir list_dir_perms;
++read_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_log_t)
++read_lnk_files_pattern(httpd_nagios_script_t,nagios_etc_t,nagios_log_t)
+ 
+-files_read_etc_files(nagios_cgi_t)
+-files_read_etc_runtime_files(nagios_cgi_t)
+-files_read_kernel_symbol_table(nagios_cgi_t)
++kernel_read_system_state(httpd_nagios_script_t)
+ 
+-libs_use_ld_so(nagios_cgi_t)
+-libs_use_shared_libs(nagios_cgi_t)
++domain_dontaudit_read_all_domains_state(httpd_nagios_script_t)
+ 
+-logging_send_syslog_msg(nagios_cgi_t)
+-logging_search_logs(nagios_cgi_t)
++files_read_etc_runtime_files(httpd_nagios_script_t)
++files_read_kernel_symbol_table(httpd_nagios_script_t)
+ 
+-miscfiles_read_localization(nagios_cgi_t)
+-
+-optional_policy(`
+-	apache_append_log(nagios_cgi_t)
+-')
++logging_send_syslog_msg(httpd_nagios_script_t)
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.0.5/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/networkmanager.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/networkmanager.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -1,5 +1,6 @@
  
  /usr/(s)?bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
@@ -5883,7 +5987,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.5/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/networkmanager.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/networkmanager.te	2007-08-07 09:39:49.000000000 -0400
 @@ -41,6 +41,8 @@
  kernel_read_kernel_sysctls(NetworkManager_t)
  kernel_load_module(NetworkManager_t)
@@ -5923,7 +6027,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.0.5/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/nis.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/nis.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -4,6 +4,7 @@
  /sbin/ypbind		--	gen_context(system_u:object_r:ypbind_exec_t,s0)
  
@@ -5934,7 +6038,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.5/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/nis.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/nis.if	2007-08-07 09:39:49.000000000 -0400
 @@ -49,8 +49,8 @@
  	corenet_udp_bind_all_nodes($1)
  	corenet_tcp_bind_generic_port($1)
@@ -5948,7 +6052,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.5/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/nis.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/nis.te	2007-08-07 09:39:49.000000000 -0400
 @@ -113,6 +113,14 @@
  userdom_dontaudit_use_unpriv_user_fds(ypbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(ypbind_t)
@@ -6003,7 +6107,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.5/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/nscd.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/nscd.te	2007-08-07 09:39:49.000000000 -0400
 @@ -28,14 +28,14 @@
  # Local policy
  #
@@ -6054,7 +6158,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.5/policy/modules/services/ntp.fc
 --- nsaserefpolicy/policy/modules/services/ntp.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/ntp.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/ntp.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -17,3 +17,7 @@
  /var/log/xntpd.*		--	gen_context(system_u:object_r:ntpd_log_t,s0)
  
@@ -6065,7 +6169,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.5/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/ntp.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/ntp.te	2007-08-07 09:39:49.000000000 -0400
 @@ -25,6 +25,9 @@
  type ntpdate_exec_t;
  init_system_domain(ntpd_t,ntpdate_exec_t)
@@ -6128,7 +6232,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.5/policy/modules/services/openvpn.if
 --- nsaserefpolicy/policy/modules/services/openvpn.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/openvpn.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/openvpn.if	2007-08-07 09:39:49.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)
@@ -6203,7 +6307,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.5/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/openvpn.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/openvpn.te	2007-08-07 09:39:49.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -6282,7 +6386,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.5/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/pegasus.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/pegasus.if	2007-08-07 09:39:49.000000000 -0400
 @@ -1 +1,19 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -6305,7 +6409,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.5/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/pegasus.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/pegasus.te	2007-08-07 09:39:49.000000000 -0400
 @@ -95,13 +95,13 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -6347,7 +6451,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.5/policy/modules/services/portslave.te
 --- nsaserefpolicy/policy/modules/services/portslave.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/portslave.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/portslave.te	2007-08-07 09:39:49.000000000 -0400
 @@ -85,6 +85,7 @@
  
  auth_rw_login_records(portslave_t)
@@ -6358,7 +6462,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.5/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/postfix.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/postfix.fc	2007-08-07 09:39:49.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)
@@ -6369,7 +6473,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.5/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/postfix.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/postfix.if	2007-08-07 09:39:49.000000000 -0400
 @@ -41,6 +41,8 @@
  	allow postfix_$1_t self:unix_stream_socket connectto;
  
@@ -6493,7 +6597,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.5/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/postfix.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/postfix.te	2007-08-07 09:39:49.000000000 -0400
 @@ -83,6 +83,12 @@
  type postfix_var_run_t;
  files_pid_file(postfix_var_run_t)
@@ -6635,7 +6739,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/procmail.te serefpolicy-3.0.5/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/procmail.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/procmail.te	2007-08-07 09:39:49.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)
@@ -6645,7 +6749,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/proc
  kernel_read_system_state(procmail_t)
  kernel_read_kernel_sysctls(procmail_t)
  
-@@ -108,6 +110,9 @@
+@@ -50,6 +52,7 @@
+ 
+ fs_getattr_xattr_fs(procmail_t)
+ fs_search_auto_mountpoints(procmail_t)
++fs_rw_anon_inodefs_files(procmail_t)
+ 
+ auth_use_nsswitch(procmail_t)
+ 
+@@ -108,6 +111,9 @@
  	# for a bug in the postfix local program
  	postfix_dontaudit_rw_local_tcp_sockets(procmail_t)
  	postfix_dontaudit_use_fds(procmail_t)
@@ -6655,7 +6767,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/proc
  ')
  
  optional_policy(`
-@@ -129,3 +134,7 @@
+@@ -129,3 +135,7 @@
  	spamassassin_exec_client(procmail_t)
  	spamassassin_read_lib_files(procmail_t)
  ')
@@ -6665,7 +6777,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.5/policy/modules/services/pyzor.if
 --- nsaserefpolicy/policy/modules/services/pyzor.if	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/pyzor.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/pyzor.if	2007-08-07 09:39:49.000000000 -0400
 @@ -25,16 +25,16 @@
  #
  template(`pyzor_per_role_template',`
@@ -6690,7 +6802,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.5/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/pyzor.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/pyzor.te	2007-08-07 09:39:49.000000000 -0400
 @@ -70,6 +70,11 @@
  
  userdom_dontaudit_search_sysadm_home_dirs(pyzor_t)
@@ -6714,10 +6826,37 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
  optional_policy(`
  	logging_send_syslog_msg(pyzord_t)
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-3.0.5/policy/modules/services/radius.fc
+--- nsaserefpolicy/policy/modules/services/radius.fc	2007-05-29 14:10:57.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/radius.fc	2007-08-09 14:17:30.000000000 -0400
+@@ -18,3 +18,4 @@
+ 
+ /var/run/radiusd(/.*)?		gen_context(system_u:object_r:radiusd_var_run_t,s0)
+ /var/run/radiusd\.pid	--	gen_context(system_u:object_r:radiusd_var_run_t,s0)
++/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.5/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/radius.te	2007-08-03 14:06:26.000000000 -0400
-@@ -82,6 +82,7 @@
++++ serefpolicy-3.0.5/policy/modules/services/radius.te	2007-08-09 14:19:10.000000000 -0400
+@@ -19,6 +19,9 @@
+ type radiusd_log_t;
+ logging_log_file(radiusd_log_t)
+ 
++type radiusd_var_lib_t;
++files_type(radiusd_var_lib_t)
++
+ type radiusd_var_run_t;
+ files_pid_file(radiusd_var_run_t)
+ 
+@@ -52,6 +55,8 @@
+ manage_files_pattern(radiusd_t,radiusd_log_t,radiusd_log_t)
+ logging_log_filetrans(radiusd_t,radiusd_log_t,{ file dir })
+ 
++manage_files_pattern(radiusd_t,radiusd_var_lib_t,radiusd_var_lib_t)
++
+ manage_files_pattern(radiusd_t,radiusd_var_run_t,radiusd_var_run_t)
+ files_pid_filetrans(radiusd_t,radiusd_var_run_t,file)
+ 
+@@ -82,6 +87,7 @@
  
  auth_read_shadow(radiusd_t)
  auth_domtrans_chk_passwd(radiusd_t)
@@ -6725,7 +6864,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
  
  corecmd_exec_bin(radiusd_t)
  corecmd_exec_shell(radiusd_t)
-@@ -99,6 +100,7 @@
+@@ -99,6 +105,7 @@
  logging_send_syslog_msg(radiusd_t)
  
  miscfiles_read_localization(radiusd_t)
@@ -6735,7 +6874,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-3.0.5/policy/modules/services/rhgb.te
 --- nsaserefpolicy/policy/modules/services/rhgb.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rhgb.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rhgb.te	2007-08-07 09:39:49.000000000 -0400
 @@ -109,6 +109,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(rhgb_t)
@@ -6746,7 +6885,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.5/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/ricci.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/ricci.te	2007-08-07 09:39:49.000000000 -0400
 @@ -138,6 +138,7 @@
  files_create_boot_flag(ricci_t)
  
@@ -6776,7 +6915,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.5/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rlogin.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rlogin.te	2007-08-07 09:39:49.000000000 -0400
 @@ -65,6 +65,7 @@
  fs_search_auto_mountpoints(rlogind_t)
  
@@ -6787,7 +6926,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.5/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rpcbind.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rpcbind.te	2007-08-07 09:39:49.000000000 -0400
 @@ -21,11 +21,13 @@
  # rpcbind local policy
  #
@@ -6805,7 +6944,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.5/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rpc.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rpc.if	2007-08-07 09:39:49.000000000 -0400
 @@ -81,6 +81,7 @@
  	corenet_tcp_bind_all_nodes($1_t)
  	corenet_udp_bind_all_nodes($1_t)
@@ -6829,7 +6968,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.5/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rpc.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rpc.te	2007-08-07 09:39:49.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)
@@ -6902,7 +7041,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.5/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rshd.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rshd.te	2007-08-07 09:39:49.000000000 -0400
 @@ -45,6 +45,7 @@
  selinux_compute_user_contexts(rshd_t)
  
@@ -6920,7 +7059,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.5/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rsync.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rsync.te	2007-08-07 09:39:49.000000000 -0400
 @@ -17,6 +17,7 @@
  type rsync_t;
  type rsync_exec_t;
@@ -6931,7 +7070,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.5/policy/modules/services/rwho.fc
 --- nsaserefpolicy/policy/modules/services/rwho.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rwho.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rwho.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -1,3 +1,4 @@
  /usr/sbin/rwhod		--	gen_context(system_u:object_r:rwho_exec_t,s0)
  
@@ -6939,7 +7078,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.5/policy/modules/services/rwho.if
 --- nsaserefpolicy/policy/modules/services/rwho.if	2007-06-15 14:54:33.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rwho.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rwho.if	2007-08-07 09:39:49.000000000 -0400
 @@ -72,6 +72,47 @@
  		type rwho_spool_t;
  	')
@@ -6991,7 +7130,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.5/policy/modules/services/rwho.te
 --- nsaserefpolicy/policy/modules/services/rwho.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/rwho.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/rwho.te	2007-08-07 09:39:49.000000000 -0400
 @@ -10,10 +10,12 @@
  type rwho_exec_t;
  init_daemon_domain(rwho_t, rwho_exec_t)
@@ -7019,7 +7158,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.5/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/samba.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/samba.fc	2007-08-07 09:39:49.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)
@@ -7031,7 +7170,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.5/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/samba.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/samba.if	2007-08-07 09:39:49.000000000 -0400
 @@ -349,6 +349,7 @@
  	files_search_var($1)
  	files_search_var_lib($1)
@@ -7095,7 +7234,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.5/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/samba.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/samba.te	2007-08-07 09:39:49.000000000 -0400
 @@ -190,6 +190,8 @@
  
  miscfiles_read_localization(samba_net_t) 
@@ -7224,9 +7363,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
  	seutil_sigchld_newrole(winbind_t)
  ')
  
+@@ -804,6 +816,7 @@
+ optional_policy(`
+ 	squid_read_log(winbind_helper_t)
+ 	squid_append_log(winbind_helper_t)
++	squid_rw_stream_sockets(winbind_helper_t)
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.0.5/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/sasl.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/sasl.te	2007-08-07 09:39:49.000000000 -0400
 @@ -64,6 +64,7 @@
  selinux_compute_access_vector(saslauthd_t)
  
@@ -7237,7 +7384,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.5/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/sendmail.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/sendmail.if	2007-08-07 09:39:49.000000000 -0400
 @@ -131,3 +131,21 @@
  
  	logging_log_filetrans($1,sendmail_log_t,file)
@@ -7262,7 +7409,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.5/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/setroubleshoot.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/setroubleshoot.if	2007-08-07 09:39:49.000000000 -0400
 @@ -19,3 +19,22 @@
  	allow $1 setroubleshoot_var_run_t:sock_file write;
  	allow $1 setroubleshootd_t:unix_stream_socket connectto;
@@ -7288,7 +7435,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.5/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/setroubleshoot.te	2007-08-03 16:01:19.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/setroubleshoot.te	2007-08-07 09:39:49.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 };
@@ -7333,7 +7480,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.0.5/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/smartmon.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/smartmon.te	2007-08-07 09:39:49.000000000 -0400
 @@ -61,6 +61,7 @@
  fs_search_auto_mountpoints(fsdaemon_t)
  
@@ -7344,7 +7491,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smar
  storage_raw_write_fixed_disk(fsdaemon_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.0.5/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2007-06-19 16:23:35.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/snmp.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/snmp.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -1,3 +1,4 @@
 +
  #
@@ -7352,7 +7499,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.fc serefpolicy-3.0.5/policy/modules/services/soundserver.fc
 --- nsaserefpolicy/policy/modules/services/soundserver.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/soundserver.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/soundserver.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -1,10 +1,22 @@
 -/etc/nas(/.*)?			gen_context(system_u:object_r:soundd_etc_t,s0)
 -/etc/yiff(/.*)?			gen_context(system_u:object_r:soundd_etc_t,s0)
@@ -7384,7 +7531,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.if serefpolicy-3.0.5/policy/modules/services/soundserver.if
 --- nsaserefpolicy/policy/modules/services/soundserver.if	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/soundserver.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/soundserver.if	2007-08-07 09:39:49.000000000 -0400
 @@ -13,3 +13,64 @@
  interface(`soundserver_tcp_connect',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -7452,7 +7599,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.5/policy/modules/services/soundserver.te
 --- nsaserefpolicy/policy/modules/services/soundserver.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/soundserver.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/soundserver.te	2007-08-07 09:39:49.000000000 -0400
 @@ -1,5 +1,5 @@
  
 -policy_module(soundserver,1.3.0)
@@ -7512,7 +7659,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.5/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/spamassassin.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/spamassassin.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -10,3 +10,9 @@
  /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
  
@@ -7525,7 +7672,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.5/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-08-02 08:17:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/spamassassin.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/spamassassin.te	2007-08-07 09:39:49.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)
@@ -7539,16 +7686,42 @@ 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.5/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/squid.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/squid.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -12,3 +12,5 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
  /var/spool/squid(/.*)?		gen_context(system_u:object_r:squid_cache_t,s0)
 +/usr/lib/squid/cachemgr\.cgi	--	gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
 +/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.5/policy/modules/services/squid.if
+--- nsaserefpolicy/policy/modules/services/squid.if	2007-05-30 11:47:29.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/squid.if	2007-08-07 09:39:49.000000000 -0400
+@@ -131,3 +131,22 @@
+ interface(`squid_use',`
+ 	refpolicywarn(`$0($*) has been deprecated.')
+ ')
++
++########################################
++## <summary>
++##	Allow read and write squid
++##	unix domain stream sockets.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`squid_rw_stream_sockets',`
++	gen_require(`
++		type squid_t;
++	')
++
++	allow $1 squid_t:unix_stream_socket { read write };
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.0.5/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/squid.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/squid.te	2007-08-07 09:39:49.000000000 -0400
 @@ -36,7 +36,7 @@
  # Local policy
  #
@@ -7626,7 +7799,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.5/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/ssh.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/ssh.if	2007-08-07 09:39:49.000000000 -0400
 @@ -202,6 +202,7 @@
  #
  template(`ssh_per_role_template',`
@@ -7680,7 +7853,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.5/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/ssh.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/ssh.te	2007-08-07 09:39:49.000000000 -0400
 @@ -24,7 +24,7 @@
  
  # Type for the ssh-agent executable.
@@ -7718,7 +7891,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
  ifdef(`TODO',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uwimap.te serefpolicy-3.0.5/policy/modules/services/uwimap.te
 --- nsaserefpolicy/policy/modules/services/uwimap.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/uwimap.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/uwimap.te	2007-08-07 09:39:49.000000000 -0400
 @@ -64,6 +64,7 @@
  fs_search_auto_mountpoints(imapd_t)
  
@@ -7729,18 +7902,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.5/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/services/w3c.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/w3c.fc	2007-08-07 09:39:49.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.5/policy/modules/services/w3c.if
 --- nsaserefpolicy/policy/modules/services/w3c.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/services/w3c.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/w3c.if	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>W3C</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.0.5/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/services/w3c.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/w3c.te	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,14 @@
 +policy_module(w3c,1.2.1)
 +
@@ -7758,7 +7931,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.5/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2007-05-29 14:10:57.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/xserver.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/xserver.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -92,6 +92,7 @@
  /var/log/XFree86.*	--	gen_context(system_u:object_r:xserver_log_t,s0)
  /var/log/Xorg.*		--	gen_context(system_u:object_r:xserver_log_t,s0)
@@ -7769,7 +7942,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.if serefpolicy-3.0.5/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-07-03 07:06:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/xserver.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/xserver.if	2007-08-07 09:39:49.000000000 -0400
 @@ -141,7 +141,7 @@
  	fs_getattr_xattr_fs($1_xserver_t)
  	fs_search_nfs($1_xserver_t)
@@ -8055,7 +8228,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.5/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/services/xserver.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/services/xserver.te	2007-08-07 09:39:49.000000000 -0400
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -8212,7 +8385,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.5/policy/modules/system/application.if
 --- nsaserefpolicy/policy/modules/system/application.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/application.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/application.if	2007-08-07 09:39:49.000000000 -0400
 @@ -63,6 +63,26 @@
  
  ########################################
@@ -8242,7 +8415,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.5/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/authlogin.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/authlogin.fc	2007-08-07 09:39:49.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)
@@ -8253,7 +8426,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.5/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/authlogin.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/authlogin.if	2007-08-07 09:39:49.000000000 -0400
 @@ -26,7 +26,8 @@
  	type $1_chkpwd_t, can_read_shadow_passwords;
  	application_domain($1_chkpwd_t,chkpwd_exec_t)
@@ -8579,7 +8752,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.5/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/authlogin.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/authlogin.te	2007-08-07 09:39:49.000000000 -0400
 @@ -9,6 +9,13 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -8656,13 +8829,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/brctl.fc serefpolicy-3.0.5/policy/modules/system/brctl.fc
 --- nsaserefpolicy/policy/modules/system/brctl.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/system/brctl.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/brctl.fc	2007-08-07 09:39:49.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.5/policy/modules/system/brctl.if
 --- nsaserefpolicy/policy/modules/system/brctl.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/system/brctl.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/brctl.if	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,25 @@
 +
 +## <summary>Utilities for configuring the linux ethernet bridge</summary>
@@ -8691,7 +8864,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.5/policy/modules/system/brctl.te
 --- nsaserefpolicy/policy/modules/system/brctl.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/system/brctl.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/brctl.te	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,50 @@
 +policy_module(brctl,1.0.0)
 +
@@ -8745,7 +8918,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.5/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2007-06-11 16:05:30.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/fstools.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/fstools.fc	2007-08-07 09:39:49.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)
@@ -8756,7 +8929,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.5/policy/modules/system/fstools.if
 --- nsaserefpolicy/policy/modules/system/fstools.if	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/fstools.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/fstools.if	2007-08-07 09:39:49.000000000 -0400
 @@ -124,3 +124,22 @@
  
  	allow $1 swapfile_t:file getattr;
@@ -8782,16 +8955,8 @@ 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.5/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/fstools.te	2007-08-03 14:06:26.000000000 -0400
-@@ -9,6 +9,7 @@
- type fsadm_t;
- type fsadm_exec_t;
- init_system_domain(fsadm_t,fsadm_exec_t)
-+application_executable_file(fsadm_exec_t)
- role system_r types fsadm_t;
- 
- type fsadm_log_t;
-@@ -69,6 +70,7 @@
++++ serefpolicy-3.0.5/policy/modules/system/fstools.te	2007-08-07 09:39:49.000000000 -0400
+@@ -69,6 +69,7 @@
  
  dev_getattr_all_chr_files(fsadm_t)
  dev_dontaudit_getattr_all_blk_files(fsadm_t)
@@ -8799,7 +8964,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
  # mkreiserfs and other programs need this for UUID
  dev_read_rand(fsadm_t)
  dev_read_urand(fsadm_t)
-@@ -179,3 +181,8 @@
+@@ -179,3 +180,8 @@
  	fs_dontaudit_write_ramfs_pipes(fsadm_t)
  	rhgb_stub(fsadm_t)
  ')
@@ -8810,7 +8975,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.5/policy/modules/system/fusermount.fc
 --- nsaserefpolicy/policy/modules/system/fusermount.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/system/fusermount.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/fusermount.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,7 @@
 +# fusermount executable will have:
 +# label: system_u:object_r:fusermount_exec_t
@@ -8821,7 +8986,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.5/policy/modules/system/fusermount.if
 --- nsaserefpolicy/policy/modules/system/fusermount.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/system/fusermount.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/fusermount.if	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,41 @@
 +## <summary>policy for fusermount</summary>
 +
@@ -8867,7 +9032,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.5/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/system/fusermount.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/fusermount.te	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,44 @@
 +policy_module(fusermount,1.0.0)
 +
@@ -8915,7 +9080,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.5/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/getty.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/getty.te	2007-08-07 09:39:49.000000000 -0400
 @@ -33,7 +33,8 @@
  #
  
@@ -8928,22 +9093,19 @@ 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.5/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/hostname.te	2007-08-03 14:06:26.000000000 -0400
-@@ -8,8 +8,12 @@
++++ serefpolicy-3.0.5/policy/modules/system/hostname.te	2007-08-07 09:45:36.000000000 -0400
+@@ -8,7 +8,9 @@
  
  type hostname_t;
  type hostname_exec_t;
 -init_system_domain(hostname_t,hostname_exec_t)
 +
 +#dont transition from initrc
-+domain_type(hostname_t)
-+domain_entry_file(hostname_t,hostname_exec_t)
++application_domain(hostname_t, hostname_exec_t)
  role system_r types hostname_t;
-+application_executable_file(hostname_exec_t)
  
  ########################################
- #
-@@ -60,3 +64,11 @@
+@@ -60,3 +62,11 @@
  	xen_append_log(hostname_t)
  	xen_dontaudit_use_fds(hostname_t)
  ')
@@ -8957,23 +9119,8 @@ 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.5/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/init.if	2007-08-03 14:06:26.000000000 -0400
-@@ -194,9 +194,13 @@
- 	gen_require(`
- 		type initrc_t;
- 		role system_r;
-+		attribute daemon;
- 	')
- 
--	application_domain($1,$2)
-+	domain_type($1)
-+	domain_entry_file($1,$2)
-+
-+	typeattribute $1 daemon;
- 
- 	role system_r types $1;
- 
-@@ -1250,7 +1254,7 @@
++++ serefpolicy-3.0.5/policy/modules/system/init.if	2007-08-07 09:39:49.000000000 -0400
+@@ -1250,7 +1250,7 @@
  		type initrc_var_run_t;
  	')
  
@@ -8982,7 +9129,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.i
  ')
  
  ########################################
-@@ -1271,3 +1275,42 @@
+@@ -1271,3 +1271,42 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file manage_file_perms;
  ')
@@ -9027,7 +9174,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.5/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/init.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/init.te	2007-08-07 09:39:49.000000000 -0400
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -9142,7 +9289,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.if serefpolicy-3.0.5/policy/modules/system/ipsec.if
 --- nsaserefpolicy/policy/modules/system/ipsec.if	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/ipsec.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/ipsec.if	2007-08-07 09:39:49.000000000 -0400
 @@ -114,6 +114,26 @@
  
  ########################################
@@ -9172,7 +9319,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.0.5/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/ipsec.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/ipsec.te	2007-08-07 09:39:49.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;
@@ -9183,7 +9330,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.5/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/iptables.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/iptables.te	2007-08-07 09:39:49.000000000 -0400
 @@ -44,6 +44,8 @@
  
  corenet_relabelto_all_packets(iptables_t)
@@ -9214,8 +9361,22 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptabl
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.0.5/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/libraries.fc	2007-08-03 14:40:05.000000000 -0400
-@@ -135,6 +135,8 @@
++++ serefpolicy-3.0.5/policy/modules/system/libraries.fc	2007-08-07 09:39:49.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)
+ /opt/(.*/)?jre/.+\.jar			--	gen_context(system_u:object_r:lib_t,s0)
++/opt/ibm/java.*/jre/.+\.jar		--	gen_context(system_u:object_r:lib_t,s0)
++/opt/ibm/java.*/jre/.+\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/cisco-vpnclient/lib/libvpnapi\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/netbeans(.*/)?jdk.*/linux/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/cxoffice/lib/wine/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/f-secure/fspms/libexec/librapi.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/opt/ibm/java2-ppc64-50/jre/bin/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ifdef(`distro_gentoo',`
+ # despite the extensions, they are actually libs
+@@ -135,6 +136,8 @@
  /usr/(local/)?lib(64)?/(sse2/)?libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/NX/lib/libXcomp\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/NX/lib/libjpeg\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -9224,7 +9385,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  
  /usr/X11R6/lib/libGL\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/libXvMCNVIDIA\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -236,6 +238,8 @@
+@@ -236,6 +239,8 @@
  /usr/lib(64)?/libdivxdecore\.so\.0	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libdivxencore\.so\.0	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -9233,7 +9394,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  /usr/lib(64)?/python2.4/site-packages/M2Crypto/__m2crypto.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # vmware 
-@@ -284,3 +288,7 @@
+@@ -284,3 +289,7 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)
@@ -9243,7 +9404,16 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
 +/var/cache/ldconfig(/.*)?			    	gen_context(system_u:object_r:ld_so_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.0.5/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/libraries.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/libraries.te	2007-08-07 10:11:06.000000000 -0400
+@@ -46,7 +46,7 @@
+ 
+ allow ldconfig_t self:capability sys_chroot;
+ 
+-allow ldconfig_t ld_so_cache_t:file manage_file_perms;
++manage_files_pattern(ldconfig_t,ld_so_cache_t,ld_so_cache_t)
+ files_etc_filetrans(ldconfig_t,ld_so_cache_t,file)
+ 
+ manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
 @@ -96,4 +96,11 @@
  	# and executes ldconfig on it.  If you dont allow this kernel installs 
  	# blow up.
@@ -9258,16 +9428,8 @@ 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.5/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/locallogin.te	2007-08-03 14:06:26.000000000 -0400
-@@ -25,6 +25,7 @@
- domain_role_change_exemption(sulogin_t)
- domain_interactive_fd(sulogin_t)
- init_domain(sulogin_t,sulogin_exec_t)
-+init_system_domain(sulogin_t,sulogin_exec_t)
- role system_r types sulogin_t;
- 
- ########################################
-@@ -97,6 +98,11 @@
++++ serefpolicy-3.0.5/policy/modules/system/locallogin.te	2007-08-07 09:39:49.000000000 -0400
+@@ -97,6 +97,11 @@
  term_setattr_all_user_ttys(local_login_t)
  term_setattr_unallocated_ttys(local_login_t)
  
@@ -9279,7 +9441,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locall
  auth_rw_login_records(local_login_t)
  auth_rw_faillog(local_login_t)
  auth_manage_pam_console_data(local_login_t)
-@@ -160,6 +166,15 @@
+@@ -160,6 +165,15 @@
  ')
  
  optional_policy(`
@@ -9295,7 +9457,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locall
  	gpm_getattr_gpmctl(local_login_t)
  	gpm_setattr_gpmctl(local_login_t)
  ')
-@@ -178,13 +193,18 @@
+@@ -178,13 +192,18 @@
  ')
  
  optional_policy(`
@@ -9317,7 +9479,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.5/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/logging.fc	2007-08-05 07:26:06.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/logging.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -1,12 +1,15 @@
 -
  /dev/log		-s	gen_context(system_u:object_r:devlog_t,s0)
@@ -9352,7 +9514,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +/var/log/syslog-ng(/.*)?	--	gen_context(system_u:object_r:syslogd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.0.5/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/logging.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/logging.if	2007-08-07 09:39:49.000000000 -0400
 @@ -33,8 +33,13 @@
  ## </param>
  #
@@ -9580,8 +9742,8 @@ 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.5/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/logging.te	2007-08-03 14:06:26.000000000 -0400
-@@ -7,10 +7,15 @@
++++ serefpolicy-3.0.5/policy/modules/system/logging.te	2007-08-07 09:43:37.000000000 -0400
+@@ -7,6 +7,10 @@
  #
  
  attribute logfile;
@@ -9592,12 +9754,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  
  type auditctl_t;
  type auditctl_exec_t;
- init_system_domain(auditctl_t,auditctl_exec_t)
-+application_type(auditctl_t)
- role system_r types auditctl_t;
- 
- type auditd_etc_t;
-@@ -45,9 +50,15 @@
+@@ -45,9 +49,15 @@
  type syslogd_exec_t;
  init_daemon_domain(syslogd_t,syslogd_exec_t)
  
@@ -9613,7 +9770,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  type syslogd_var_run_t;
  files_pid_file(syslogd_var_run_t)
  
-@@ -59,19 +70,25 @@
+@@ -59,19 +69,25 @@
  	init_ranged_daemon_domain(auditd_t,auditd_exec_t,mls_systemhigh)
  ')
  
@@ -9642,7 +9799,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  files_read_etc_files(auditctl_t)
  
  kernel_read_kernel_sysctls(auditctl_t)
-@@ -91,6 +108,7 @@
+@@ -91,6 +107,7 @@
  
  locallogin_dontaudit_use_fds(auditctl_t)
  
@@ -9650,7 +9807,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  logging_send_syslog_msg(auditctl_t)
  
  ########################################
-@@ -98,12 +116,11 @@
+@@ -98,12 +115,11 @@
  # Auditd local policy
  #
  
@@ -9664,7 +9821,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  allow auditd_t self:fifo_file rw_file_perms;
  
  allow auditd_t auditd_etc_t:dir list_dir_perms;
-@@ -141,6 +158,7 @@
+@@ -141,6 +157,7 @@
  
  init_telinit(auditd_t)
  
@@ -9672,7 +9829,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  logging_send_syslog_msg(auditd_t)
  
  libs_use_ld_so(auditd_t)
-@@ -157,6 +175,8 @@
+@@ -157,6 +174,8 @@
  
  userdom_dontaudit_use_unpriv_user_fds(auditd_t)
  userdom_dontaudit_search_sysadm_home_dirs(auditd_t)
@@ -9681,7 +9838,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  
  optional_policy(`
  	seutil_sigchld_newrole(auditd_t)
-@@ -243,12 +263,18 @@
+@@ -243,12 +262,18 @@
  allow syslogd_t self:udp_socket create_socket_perms;
  allow syslogd_t self:tcp_socket create_stream_socket_perms;
  
@@ -9700,7 +9857,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  # Allow access for syslog-ng
  allow syslogd_t var_log_t:dir { create setattr };
  
-@@ -257,6 +283,9 @@
+@@ -257,6 +282,9 @@
  manage_files_pattern(syslogd_t,syslogd_tmp_t,syslogd_tmp_t)
  files_tmp_filetrans(syslogd_t,syslogd_tmp_t,{ dir file })
  
@@ -9710,7 +9867,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  allow syslogd_t syslogd_var_run_t:file manage_file_perms;
  files_pid_filetrans(syslogd_t,syslogd_var_run_t,file)
  
-@@ -314,6 +343,7 @@
+@@ -314,6 +342,7 @@
  domain_use_interactive_fds(syslogd_t)
  
  files_read_etc_files(syslogd_t)
@@ -9720,7 +9877,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.5/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/lvm.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/lvm.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -15,6 +15,7 @@
  #
  /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
@@ -9731,16 +9888,8 @@ 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.5/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/lvm.te	2007-08-03 14:06:26.000000000 -0400
-@@ -16,6 +16,7 @@
- type lvm_t;
- type lvm_exec_t;
- init_system_domain(lvm_t,lvm_exec_t)
-+application_executable_file(lvm_exec_t)
- # needs privowner because it assigns the identity system_u to device nodes
- # but runs as the identity of the sysadmin
- domain_obj_id_change_exemption(lvm_t)
-@@ -150,7 +151,9 @@
++++ serefpolicy-3.0.5/policy/modules/system/lvm.te	2007-08-07 09:39:49.000000000 -0400
+@@ -150,7 +150,9 @@
  
  # DAC overrides and mknod for modifying /dev entries (vgmknodes)
  # rawio needed for dmraid
@@ -9751,7 +9900,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te
  dontaudit lvm_t self:capability sys_tty_config;
  allow lvm_t self:process { sigchld sigkill sigstop signull signal };
  # LVM will complain a lot if it cannot set its priority.
-@@ -228,6 +231,8 @@
+@@ -228,6 +230,8 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -9760,7 +9909,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -246,6 +251,7 @@
+@@ -246,6 +250,7 @@
  storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
@@ -9768,7 +9917,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te
  
  term_getattr_all_user_ttys(lvm_t)
  term_list_ptys(lvm_t)
-@@ -293,5 +299,15 @@
+@@ -293,5 +298,15 @@
  ')
  
  optional_policy(`
@@ -9786,7 +9935,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.5/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/miscfiles.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/miscfiles.fc	2007-08-07 09:39:49.000000000 -0400
 @@ -66,6 +66,7 @@
  /var/lib/texmf(/.*)?		gen_context(system_u:object_r:tetex_data_t,s0)
  
@@ -9797,7 +9946,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.5/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/modutils.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/modutils.te	2007-08-07 09:39:49.000000000 -0400
 @@ -42,7 +42,7 @@
  # insmod local policy
  #
@@ -9891,7 +10040,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.5/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2007-05-29 14:10:58.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/mount.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/mount.fc	2007-08-07 09:39:49.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)
@@ -9899,7 +10048,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.5/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/mount.te	2007-08-03 14:20:27.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/mount.te	2007-08-07 09:43:24.000000000 -0400
 @@ -8,6 +8,13 @@
  
  ## <desc>
@@ -9914,11 +10063,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  ## Allow mount to mount any file
  ## </p>
  ## </desc>
-@@ -16,19 +23,21 @@
- type mount_t;
- type mount_exec_t;
+@@ -18,17 +25,18 @@
  init_system_domain(mount_t,mount_exec_t)
-+application_executable_file(mount_exec_t)
  role system_r types mount_t;
  
 +typealias mount_t alias mount_ntfs_t;
@@ -9939,7 +10085,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  
  ########################################
  #
-@@ -36,14 +45,15 @@
+@@ -36,14 +44,15 @@
  #
  
  # setuid/setgid needed to mount cifs 
@@ -9957,7 +10103,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  can_exec(mount_t, mount_exec_t)
  
  files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir })
-@@ -51,6 +61,7 @@
+@@ -51,6 +60,7 @@
  kernel_read_system_state(mount_t)
  kernel_read_kernel_sysctls(mount_t)
  kernel_dontaudit_getattr_core_if(mount_t)
@@ -9965,7 +10111,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
-@@ -101,6 +112,8 @@
+@@ -101,6 +111,8 @@
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -9974,7 +10120,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  
  libs_use_ld_so(mount_t)
  libs_use_shared_libs(mount_t)
-@@ -127,10 +140,15 @@
+@@ -127,10 +139,15 @@
  	')
  ')
  
@@ -9991,7 +10137,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  ')
  
  optional_policy(`
-@@ -159,13 +177,8 @@
+@@ -159,13 +176,8 @@
  
  	fs_search_rpc(mount_t)
  
@@ -10005,7 +10151,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  ')
  
  optional_policy(`
-@@ -189,10 +202,6 @@
+@@ -189,10 +201,6 @@
  	samba_domtrans_smbmount(mount_t)
  ')
  
@@ -10016,7 +10162,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
  ########################################
  #
  # Unconfined mount local policy
-@@ -201,4 +210,29 @@
+@@ -201,4 +209,29 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -10038,7 +10184,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +fusermount_domtrans(mount_t)
 +fusermount_use_fds(mount_t)
 +
-+modutils_exec_insmod(mount_t)
++modutils_domtrans_insmod(mount_t)
 +
 +optional_policy(`
 +	hal_write_log(mount_t)
@@ -10048,7 +10194,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.5/policy/modules/system/netlabel.te
 --- nsaserefpolicy/policy/modules/system/netlabel.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/netlabel.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/netlabel.te	2007-08-07 09:39:49.000000000 -0400
 @@ -19,6 +19,8 @@
  allow netlabel_mgmt_t self:capability net_admin;
  allow netlabel_mgmt_t self:netlink_socket create_socket_perms;
@@ -10060,7 +10206,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.5/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/raid.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/raid.te	2007-08-07 09:39:49.000000000 -0400
 @@ -19,7 +19,7 @@
  # Local policy
  #
@@ -10080,7 +10226,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.5/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/selinuxutil.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/selinuxutil.fc	2007-08-07 09:39:49.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)
@@ -10094,7 +10240,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.5/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-05-30 11:47:29.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/selinuxutil.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/selinuxutil.if	2007-08-07 09:39:49.000000000 -0400
 @@ -432,6 +432,7 @@
  	role $2 types run_init_t;
  	allow run_init_t $3:chr_file rw_term_perms;
@@ -10302,7 +10448,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.5/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/selinuxutil.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/selinuxutil.te	2007-08-07 09:39:49.000000000 -0400
 @@ -76,7 +76,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -10460,7 +10606,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.5/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/sysnetwork.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/sysnetwork.if	2007-08-07 09:39:49.000000000 -0400
 @@ -522,6 +522,8 @@
  
  	files_search_etc($1)
@@ -10472,7 +10618,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.5/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/sysnetwork.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/sysnetwork.te	2007-08-07 09:39:49.000000000 -0400
 @@ -45,7 +45,7 @@
  dontaudit dhcpc_t self:capability sys_tty_config;
  # for access("/etc/bashrc", X_OK) on Red Hat
@@ -10493,15 +10639,19 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  	optional_policy(`
  		networkmanager_dbus_chat(dhcpc_t)
  	')
-@@ -206,6 +210,7 @@
+@@ -205,7 +209,11 @@
+ optional_policy(`
  	# dhclient sometimes starts ntpd
  	init_exec_script_files(dhcpc_t)
++')
++
++optional_policy(`
  	ntp_domtrans(dhcpc_t)
 +	ntp_domtrans_ntpdate(dhcpc_t)
  ')
  
  optional_policy(`
-@@ -216,6 +221,7 @@
+@@ -216,6 +224,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -10509,7 +10659,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  ')
  
  optional_policy(`
-@@ -280,6 +286,8 @@
+@@ -280,6 +289,8 @@
  fs_getattr_xattr_fs(ifconfig_t)
  fs_search_auto_mountpoints(ifconfig_t)
  
@@ -10520,7 +10670,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.5/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/udev.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/udev.te	2007-08-07 09:39:49.000000000 -0400
 @@ -68,8 +68,9 @@
  allow udev_t udev_tbl_t:file manage_file_perms;
  dev_filetrans(udev_t,udev_tbl_t,file)
@@ -10622,7 +10772,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.5/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-06-15 14:54:34.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/unconfined.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/unconfined.if	2007-08-07 09:39:49.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -10808,7 +10958,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.5/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/unconfined.te	2007-08-03 16:28:55.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/unconfined.te	2007-08-07 09:39:49.000000000 -0400
 @@ -5,28 +5,36 @@
  #
  # Declarations
@@ -11003,7 +11153,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.if serefpolicy-3.0.5/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/userdomain.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/userdomain.if	2007-08-07 10:28:24.000000000 -0400
 @@ -62,6 +62,10 @@
  
  	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
@@ -12049,7 +12199,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.5/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-08-02 08:17:28.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/userdomain.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/userdomain.te	2007-08-07 09:39:49.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -12149,7 +12299,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.0.5/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/xen.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/system/xen.if	2007-08-07 09:39:49.000000000 -0400
 @@ -191,3 +191,24 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
@@ -12177,16 +12327,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.5/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
-+++ serefpolicy-3.0.5/policy/modules/system/xen.te	2007-08-03 14:06:26.000000000 -0400
-@@ -70,7 +70,7 @@
- type xm_t;
- type xm_exec_t;
- domain_type(xm_t)
--init_system_domain(xm_t, xm_exec_t)
-+init_daemon_domain(xm_t, xm_exec_t)
- 
- ########################################
- #
++++ serefpolicy-3.0.5/policy/modules/system/xen.te	2007-08-09 14:54:50.000000000 -0400
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -12213,7 +12354,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
  allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
  allow xenstored_t self:unix_dgram_socket create_socket_perms;
  
-@@ -336,6 +337,7 @@
+@@ -324,6 +325,7 @@
+ 
+ manage_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
+ manage_fifo_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
++manage_sock_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
+ files_search_var_lib(xm_t)
+ 
+ allow xm_t xen_image_t:dir rw_dir_perms;
+@@ -336,6 +338,7 @@
  kernel_write_xen_state(xm_t)
  
  corecmd_exec_bin(xm_t)
@@ -12221,7 +12370,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -366,3 +368,13 @@
+@@ -366,3 +369,13 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)
@@ -12237,17 +12386,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
 +fs_read_nfs_symlinks(xend_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.5/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/guest.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/guest.fc	2007-08-07 09:39:49.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.5/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/guest.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/guest.if	2007-08-07 09:39:49.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.5/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/guest.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/guest.te	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,5 @@
 +policy_module(guest,1.0.0)
 +userdom_unpriv_login_user(guest)
@@ -12256,17 +12405,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.t
 +mozilla_per_role_template(xguest, xguest_t, xguest_r)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.5/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/logadm.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/logadm.fc	2007-08-07 09:39:49.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.5/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/logadm.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/logadm.if	2007-08-07 09:39:49.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.5/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/logadm.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/logadm.te	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -12303,22 +12452,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.5/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/metadata.xml	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/metadata.xml	2007-08-07 09:39:49.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.5/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/webadm.fc	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/webadm.fc	2007-08-07 09:39:49.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.5/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/webadm.if	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/webadm.if	2007-08-07 09:39:49.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.5/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.5/policy/modules/users/webadm.te	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/webadm.te	2007-08-07 09:39:49.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(webadm,1.0.0)
 +
@@ -12392,7 +12541,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.0.5/policy/support/file_patterns.spt
 --- nsaserefpolicy/policy/support/file_patterns.spt	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/support/file_patterns.spt	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/support/file_patterns.spt	2007-08-07 09:39:49.000000000 -0400
 @@ -310,47 +310,47 @@
  #
  define(`getattr_sock_files_pattern',`
@@ -12452,7 +12601,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns
  define(`relabelfrom_sock_files_pattern',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.5/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.5/policy/support/obj_perm_sets.spt	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/support/obj_perm_sets.spt	2007-08-07 09:39:49.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`search_dir_perms',`{ getattr search }')
  define(`list_dir_perms',`{ getattr search read lock ioctl }')
@@ -12487,7 +12636,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.5/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.5/policy/users	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/policy/users	2007-08-07 09:39:49.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -12524,7 +12673,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.5/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.5/Rules.modular	2007-08-03 14:06:26.000000000 -0400
++++ serefpolicy-3.0.5/Rules.modular	2007-08-07 09:39:49.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
diff --git a/selinux-policy.spec b/selinux-policy.spec
index e763d17..4e525d5 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -248,7 +248,7 @@ SETLOCALDEFS=0
 " > /etc/selinux/config
 
 	ln -sf ../selinux/config /etc/sysconfig/selinux 
-	restorecon /etc/selinux/config 2> /dev/null
+	restorecon /etc/selinux/config 2> /dev/null || :
 else
 	. /etc/selinux/config
 	# if first time update booleans.local needs to be copied to sandbox
@@ -360,6 +360,10 @@ exit 0
 %endif
 
 %changelog
+* Mon Aug 6 2007 Dan Walsh <dwalsh@redhat.com> 3.0.5-3
+- Fix nagios cgi
+- allow squid to communicate with winbind
+
 * Mon Aug 6 2007 Dan Walsh <dwalsh@redhat.com> 3.0.5-2
 - Fixes for ldconfig