From 99d36768912ebac06c03ac66d3135a32966d26ca Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Mon, 17 Dec 2007 22:49:08 +0000
Subject: [PATCH] - Modify default login to unconfined_u

---
 policy-20071130.patch | 663 +++++++++++++++++++++++-------------------
 selinux-policy.spec   |  25 +-
 2 files changed, 381 insertions(+), 307 deletions(-)

diff --git a/policy-20071130.patch b/policy-20071130.patch
index 47b9767c..b6273b97 100644
--- a/policy-20071130.patch
+++ b/policy-20071130.patch
@@ -1,12 +1,12 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.2.4/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/config/appconfig-mcs/failsafe_context	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-mcs/failsafe_context	2007-12-13 17:37:33.000000000 -0500
 @@ -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.2.4/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.2.4/config/appconfig-mcs/guest_u_default_contexts	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-mcs/guest_u_default_contexts	2007-12-13 17:37:33.000000000 -0500
 @@ -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
@@ -14,7 +14,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/seusers serefpolicy-3.2.4/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/config/appconfig-mcs/seusers	2007-12-13 13:36:46.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-mcs/seusers	2007-12-13 17:37:33.000000000 -0500
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
@@ -22,7 +22,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers
 +__default__:unconfined_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.2.4/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/config/appconfig-mcs/unconfined_u_default_contexts	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-mcs/unconfined_u_default_contexts	2007-12-13 17:37:33.000000000 -0500
 @@ -0,0 +1,9 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -35,13 +35,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfi
 +system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.2.4/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/config/appconfig-mcs/userhelper_context	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-mcs/userhelper_context	2007-12-13 17:37:33.000000000 -0500
 @@ -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/xguest_u_default_contexts serefpolicy-3.2.4/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.2.4/config/appconfig-mcs/xguest_u_default_contexts	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-mcs/xguest_u_default_contexts	2007-12-13 17:37:33.000000000 -0500
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -50,7 +50,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/guest_u_default_contexts serefpolicy-3.2.4/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.2.4/config/appconfig-mls/guest_u_default_contexts	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-mls/guest_u_default_contexts	2007-12-13 17:37:33.000000000 -0500
 @@ -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
@@ -58,7 +58,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-standard/guest_u_default_contexts serefpolicy-3.2.4/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.2.4/config/appconfig-standard/guest_u_default_contexts	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-standard/guest_u_default_contexts	2007-12-13 17:37:33.000000000 -0500
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -66,7 +66,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/xguest_u_default_contexts serefpolicy-3.2.4/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.2.4/config/appconfig-standard/xguest_u_default_contexts	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/config/appconfig-standard/xguest_u_default_contexts	2007-12-13 17:37:33.000000000 -0500
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -75,7 +75,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/Makefile serefpolicy-3.2.4/Makefile
 --- nsaserefpolicy/Makefile	2007-10-12 08:56:10.000000000 -0400
-+++ serefpolicy-3.2.4/Makefile	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/Makefile	2007-12-13 17:37:33.000000000 -0500
 @@ -305,20 +305,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -111,7 +111,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.2.4/M
  # create-base-per-role-tmpl modulenames,outputfile
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.2.4/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-08-11 06:22:29.000000000 -0400
-+++ serefpolicy-3.2.4/policy/flask/access_vectors	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/flask/access_vectors	2007-12-13 17:37:33.000000000 -0500
 @@ -639,6 +639,8 @@
  	send
  	recv
@@ -123,7 +123,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.2.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/global_tunables	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/global_tunables	2007-12-13 17:37:33.000000000 -0500
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -164,7 +164,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables seref
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-3.2.4/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2007-10-29 18:02:32.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/alsa.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/alsa.fc	2007-12-13 17:37:33.000000000 -0500
 @@ -1,8 +1,11 @@
  
 +/etc/alsa/asound\.state --	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -181,7 +181,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc
 +/bin/alsaunmute		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if serefpolicy-3.2.4/policy/modules/admin/alsa.if
 --- nsaserefpolicy/policy/modules/admin/alsa.if	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/alsa.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/alsa.if	2007-12-13 17:37:33.000000000 -0500
 @@ -74,3 +74,21 @@
  	read_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
  	read_lnk_files_pattern($1,alsa_etc_rw_t,alsa_etc_rw_t)
@@ -206,7 +206,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.if
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.2.4/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2007-10-29 18:02:32.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/alsa.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/alsa.te	2007-12-13 17:37:33.000000000 -0500
 @@ -8,12 +8,15 @@
  
  type alsa_t;
@@ -257,7 +257,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te
  	hal_use_fds(alsa_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.2.4/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/anaconda.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/anaconda.te	2007-12-13 17:37:33.000000000 -0500
 @@ -31,16 +31,13 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -278,7 +278,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anacond
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.2.4/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2007-10-23 07:37:52.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/brctl.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/brctl.te	2007-12-13 17:37:33.000000000 -0500
 @@ -40,4 +40,5 @@
  
  optional_policy(`
@@ -287,7 +287,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.t
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.2.4/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/consoletype.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/consoletype.te	2007-12-13 17:37:33.000000000 -0500
 @@ -8,9 +8,11 @@
  
  type consoletype_t;
@@ -331,7 +331,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/console
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.2.4/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/firstboot.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/firstboot.te	2007-12-13 17:37:33.000000000 -0500
 @@ -120,6 +120,10 @@
  	usermanage_domtrans_admin_passwd(firstboot_t)
  ')
@@ -353,7 +353,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstbo
  ') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.fc serefpolicy-3.2.4/policy/modules/admin/kismet.fc
 --- nsaserefpolicy/policy/modules/admin/kismet.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/kismet.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/kismet.fc	2007-12-13 17:37:33.000000000 -0500
 @@ -0,0 +1,5 @@
 +
 +/usr/bin/kismet	--	gen_context(system_u:object_r:kismet_exec_t,s0)
@@ -362,7 +362,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.
 +/var/log/kismet(/.*)?			gen_context(system_u:object_r:kismet_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.if serefpolicy-3.2.4/policy/modules/admin/kismet.if
 --- nsaserefpolicy/policy/modules/admin/kismet.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/kismet.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/kismet.if	2007-12-13 17:37:33.000000000 -0500
 @@ -0,0 +1,275 @@
 +
 +## <summary>policy for kismet</summary>
@@ -641,7 +641,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.2.4/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/kismet.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/kismet.te	2007-12-13 17:37:33.000000000 -0500
 @@ -0,0 +1,58 @@
 +policy_module(kismet,1.0.0)
 +
@@ -703,7 +703,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.2.4/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/kudzu.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/kudzu.te	2007-12-13 17:37:33.000000000 -0500
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -765,7 +765,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.t
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.2.4/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/logrotate.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/logrotate.te	2007-12-13 17:37:33.000000000 -0500
 @@ -96,6 +96,7 @@
  files_read_etc_files(logrotate_t)
  files_read_etc_runtime_files(logrotate_t)
@@ -776,7 +776,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrota
  files_manage_generic_spool_dirs(logrotate_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.2.4/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-10-23 07:37:52.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/logwatch.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/logwatch.te	2007-12-13 17:37:33.000000000 -0500
 @@ -59,10 +59,8 @@
  files_read_usr_files(logwatch_t)
  files_search_spool(logwatch_t)
@@ -807,7 +807,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatc
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.2.4/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/netutils.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/netutils.te	2007-12-13 17:37:33.000000000 -0500
 @@ -94,6 +94,10 @@
  ')
  
@@ -836,7 +836,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutil
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.2.4/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/prelink.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/prelink.te	2007-12-13 17:37:33.000000000 -0500
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -896,7 +896,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.2.4/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/rpm.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/rpm.fc	2007-12-13 17:37:33.000000000 -0500
 @@ -11,6 +11,7 @@
  
  /usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -917,7 +917,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.2.4/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-05-18 11:12:44.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/rpm.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/rpm.if	2007-12-13 17:37:33.000000000 -0500
 @@ -152,6 +152,24 @@
  
  ########################################
@@ -1113,7 +1113,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.2.4/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2007-12-04 11:02:51.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/rpm.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/rpm.te	2007-12-13 17:37:33.000000000 -0500
 @@ -179,7 +179,17 @@
  ')
  
@@ -1168,7 +1168,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te
  		java_domtrans(rpm_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.2.4/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2007-12-04 11:02:51.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/sudo.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/sudo.if	2007-12-13 17:37:33.000000000 -0500
 @@ -55,7 +55,7 @@
  	#
  
@@ -1239,7 +1239,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.2.4/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/su.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/su.if	2007-12-13 17:37:33.000000000 -0500
 @@ -41,15 +41,13 @@
  
  	allow $2 $1_su_t:process signal;
@@ -1335,7 +1335,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/tmpreaper.te serefpolicy-3.2.4/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2007-10-02 09:54:52.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/admin/tmpreaper.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/tmpreaper.te	2007-12-13 17:37:33.000000000 -0500
 @@ -28,6 +28,7 @@
  files_purge_tmp(tmpreaper_t)
  # why does it need setattr?
@@ -1357,8 +1357,16 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreap
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.2.4/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-12-04 11:02:51.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/usermanage.te	2007-12-13 13:34:36.000000000 -0500
-@@ -290,6 +290,7 @@
++++ serefpolicy-3.2.4/policy/modules/admin/usermanage.te	2007-12-17 10:54:21.000000000 -0500
+@@ -97,6 +97,7 @@
+ 
+ # allow checking if a shell is executable
+ corecmd_check_exec_shell(chfn_t)
++corecmd_exec_bin(chfn_t)
+ 
+ domain_use_interactive_fds(chfn_t)
+ 
+@@ -290,6 +291,7 @@
  term_use_all_user_ttys(passwd_t)
  term_use_all_user_ptys(passwd_t)
  
@@ -1366,7 +1374,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/userman
  auth_manage_shadow(passwd_t)
  auth_relabel_shadow(passwd_t)
  auth_etc_filetrans_shadow(passwd_t)
-@@ -309,6 +310,7 @@
+@@ -309,6 +311,7 @@
  # /usr/bin/passwd asks for w access to utmp, but it will operate
  # correctly without it.  Do not audit write denials to utmp.
  init_dontaudit_rw_utmp(passwd_t)
@@ -1374,7 +1382,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/userman
  
  libs_use_ld_so(passwd_t)
  libs_use_shared_libs(passwd_t)
-@@ -518,6 +520,12 @@
+@@ -518,6 +521,12 @@
  ')
  
  optional_policy(`
@@ -1389,7 +1397,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/userman
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.fc serefpolicy-3.2.4/policy/modules/admin/vpn.fc
 --- nsaserefpolicy/policy/modules/admin/vpn.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/vpn.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/vpn.fc	2007-12-13 17:37:33.000000000 -0500
 @@ -7,3 +7,5 @@
  # sbin
  #
@@ -1398,7 +1406,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.fc
 +/var/run/vpnc(/.*)?		gen_context(system_u:object_r:vpnc_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.if serefpolicy-3.2.4/policy/modules/admin/vpn.if
 --- nsaserefpolicy/policy/modules/admin/vpn.if	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/vpn.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/vpn.if	2007-12-13 17:37:33.000000000 -0500
 @@ -67,3 +67,25 @@
  
  	allow $1 vpnc_t:process signal;
@@ -1427,7 +1435,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.if
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.2.4/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2007-12-06 13:12:04.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/admin/vpn.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/admin/vpn.te	2007-12-13 17:37:33.000000000 -0500
 @@ -22,10 +22,9 @@
  # Local policy
  #
@@ -1477,7 +1485,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.fc serefpolicy-3.2.4/policy/modules/apps/ethereal.fc
 --- nsaserefpolicy/policy/modules/apps/ethereal.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/ethereal.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/ethereal.fc	2007-12-13 17:37:33.000000000 -0500
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.ethereal(/.*)? 		gen_context(system_u:object_r:ROLE_ethereal_home_t,s0)
 +HOME_DIR/\.ethereal(/.*)? 		gen_context(system_u:object_r:user_ethereal_home_t,s0)
@@ -1486,7 +1494,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal
  /usr/sbin/tethereal.*		--	gen_context(system_u:object_r:tethereal_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.if serefpolicy-3.2.4/policy/modules/apps/ethereal.if
 --- nsaserefpolicy/policy/modules/apps/ethereal.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/ethereal.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/ethereal.if	2007-12-13 17:37:34.000000000 -0500
 @@ -48,12 +48,10 @@
  	application_domain($1_ethereal_t,ethereal_exec_t)
  	role $3 types $1_ethereal_t;
@@ -1524,7 +1532,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.te serefpolicy-3.2.4/policy/modules/apps/ethereal.te
 --- nsaserefpolicy/policy/modules/apps/ethereal.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/ethereal.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/ethereal.te	2007-12-13 17:37:34.000000000 -0500
 @@ -16,6 +16,13 @@
  type tethereal_tmp_t;
  files_tmp_file(tethereal_tmp_t)
@@ -1541,7 +1549,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal
  # Tethereal policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolution.fc serefpolicy-3.2.4/policy/modules/apps/evolution.fc
 --- nsaserefpolicy/policy/modules/apps/evolution.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/evolution.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/evolution.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -2,13 +2,13 @@
  # HOME_DIR/
  #
@@ -1561,7 +1569,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolutio
  # /usr
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gift.fc serefpolicy-3.2.4/policy/modules/apps/gift.fc
 --- nsaserefpolicy/policy/modules/apps/gift.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/gift.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/gift.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.giFT(/.*)?			gen_context(system_u:object_r:ROLE_gift_home_t,s0)
 +HOME_DIR/\.giFT(/.*)?			gen_context(system_u:object_r:user_gift_home_t,s0)
@@ -1570,7 +1578,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gift.fc
  /usr/(local/)?bin/giftd		--	gen_context(system_u:object_r:giftd_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gift.if serefpolicy-3.2.4/policy/modules/apps/gift.if
 --- nsaserefpolicy/policy/modules/apps/gift.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/gift.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/gift.if	2007-12-13 17:37:34.000000000 -0500
 @@ -43,9 +43,9 @@
  	application_domain($1_gift_t,gift_exec_t)
  	role $3 types $1_gift_t;
@@ -1635,7 +1643,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gift.if
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gift.te serefpolicy-3.2.4/policy/modules/apps/gift.te
 --- nsaserefpolicy/policy/modules/apps/gift.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/gift.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/gift.te	2007-12-13 17:37:34.000000000 -0500
 @@ -11,3 +11,7 @@
  
  type giftd_exec_t;
@@ -1646,7 +1654,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gift.te
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.2.4/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/gnome.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/gnome.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,8 +1,7 @@
 -HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:ROLE_gnome_home_t,s0)
 -HOME_DIR/\.gconf(d)?(/.*)?	gen_context(system_u:object_r:ROLE_gconf_home_t,s0)
@@ -1662,7 +1670,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.2.4/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/gnome.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/gnome.if	2007-12-13 17:37:34.000000000 -0500
 @@ -33,9 +33,60 @@
  ## </param>
  #
@@ -1895,7 +1903,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.2.4/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/gnome.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/gnome.te	2007-12-13 17:37:34.000000000 -0500
 @@ -8,8 +8,15 @@
  
  attribute gnomedomain;
@@ -1917,7 +1925,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te
 +files_tmp_file(user_gconf_tmp_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.2.4/policy/modules/apps/gpg.fc
 --- nsaserefpolicy/policy/modules/apps/gpg.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/gpg.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/gpg.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:ROLE_gpg_secret_t,s0)
 +HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:user_gpg_secret_t,s0)
@@ -1926,7 +1934,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc s
  /usr/bin/gpg-agent	--	gen_context(system_u:object_r:gpg_agent_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/irc.fc serefpolicy-3.2.4/policy/modules/apps/irc.fc
 --- nsaserefpolicy/policy/modules/apps/irc.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/irc.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/irc.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,7 +1,7 @@
  #
  # /home
@@ -1938,7 +1946,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/irc.fc s
  # /usr
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/irc.if serefpolicy-3.2.4/policy/modules/apps/irc.if
 --- nsaserefpolicy/policy/modules/apps/irc.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/irc.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/irc.if	2007-12-13 17:37:34.000000000 -0500
 @@ -50,12 +50,11 @@
  	userdom_user_home_content($1,$1_irc_exec_t)
  	application_domain($1_irc_t,$1_irc_exec_t)
@@ -1987,7 +1995,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/irc.if s
  	domtrans_pattern($2,irc_exec_t,$1_irc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/irc.te serefpolicy-3.2.4/policy/modules/apps/irc.te
 --- nsaserefpolicy/policy/modules/apps/irc.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/irc.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/irc.te	2007-12-13 17:37:34.000000000 -0500
 @@ -8,3 +8,10 @@
  
  type irc_exec_t;
@@ -2001,7 +2009,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/irc.te s
 +	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.2.4/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2007-03-01 10:01:48.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/apps/java.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/java.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -11,6 +11,7 @@
  #
  /usr/(.*/)?bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -2024,7 +2032,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc
 +/usr/bin/octave-[^/]*  	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.2.4/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/java.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/java.if	2007-12-13 17:37:34.000000000 -0500
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -2182,7 +2190,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.2.4/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/java.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/java.te	2007-12-13 17:37:34.000000000 -0500
 @@ -6,13 +6,6 @@
  # Declarations
  #
@@ -2226,7 +2234,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.2.4/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/loadkeys.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/loadkeys.te	2007-12-13 17:37:34.000000000 -0500
 @@ -44,3 +44,5 @@
  optional_policy(`
  	nscd_dontaudit_search_pid(loadkeys_t)
@@ -2235,7 +2243,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys
 +userdom_dontaudit_write_unpriv_user_home_content_files(loadkeys_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.2.4/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2007-01-02 12:57:22.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/apps/mono.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mono.if	2007-12-13 17:37:34.000000000 -0500
 @@ -18,3 +18,105 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, mono_exec_t, mono_t)
@@ -2344,7 +2352,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.2.4/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/mono.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mono.te	2007-12-13 17:37:34.000000000 -0500
 @@ -15,7 +15,7 @@
  # Local policy
  #
@@ -2364,7 +2372,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.fc serefpolicy-3.2.4/policy/modules/apps/mozilla.fc
 --- nsaserefpolicy/policy/modules/apps/mozilla.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/mozilla.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mozilla.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,8 +1,8 @@
 -HOME_DIR/\.galeon(/.*)?			gen_context(system_u:object_r:ROLE_mozilla_home_t,s0)
 -HOME_DIR/\.java(/.*)?			gen_context(system_u:object_r:ROLE_mozilla_home_t,s0)
@@ -2381,7 +2389,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.
  # /bin
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.2.4/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2007-10-29 07:52:48.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/mozilla.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mozilla.if	2007-12-13 17:37:34.000000000 -0500
 @@ -35,7 +35,10 @@
  template(`mozilla_per_role_template',`
  	gen_require(`
@@ -2803,7 +2811,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.2.4/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/mozilla.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mozilla.te	2007-12-13 17:37:34.000000000 -0500
 @@ -6,15 +6,15 @@
  # Declarations
  #
@@ -2829,7 +2837,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.
 +files_tmp_file(user_mozilla_tmp_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.2.4/policy/modules/apps/mplayer.fc
 --- nsaserefpolicy/policy/modules/apps/mplayer.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/mplayer.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mplayer.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -10,4 +10,4 @@
  /usr/bin/mencoder	--	gen_context(system_u:object_r:mencoder_exec_t,s0)
  /usr/bin/xine		--	gen_context(system_u:object_r:mplayer_exec_t,s0)
@@ -2838,7 +2846,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.
 +HOME_DIR/\.mplayer(/.*)?        gen_context(system_u:object_r:user_mplayer_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.2.4/policy/modules/apps/mplayer.if
 --- nsaserefpolicy/policy/modules/apps/mplayer.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/mplayer.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mplayer.if	2007-12-13 17:37:34.000000000 -0500
 @@ -35,6 +35,7 @@
  template(`mplayer_per_role_template',`
  	gen_require(`
@@ -2918,7 +2926,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-3.2.4/policy/modules/apps/mplayer.te
 --- nsaserefpolicy/policy/modules/apps/mplayer.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/mplayer.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/mplayer.te	2007-12-13 17:37:34.000000000 -0500
 @@ -22,3 +22,7 @@
  type mplayer_exec_t;
  corecmd_executable_file(mplayer_exec_t)
@@ -2929,7 +2937,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.2.4/policy/modules/apps/screen.fc
 --- nsaserefpolicy/policy/modules/apps/screen.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/screen.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/screen.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,7 +1,7 @@
  #
  # /home
@@ -2941,7 +2949,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.f
  # /usr
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.2.4/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/screen.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/screen.if	2007-12-13 17:37:34.000000000 -0500
 @@ -50,8 +50,9 @@
  	type $1_screen_tmp_t;
  	files_tmp_file($1_screen_tmp_t)
@@ -2988,7 +2996,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.i
  	kernel_read_kernel_sysctls($1_screen_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.te serefpolicy-3.2.4/policy/modules/apps/screen.te
 --- nsaserefpolicy/policy/modules/apps/screen.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/screen.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/screen.te	2007-12-13 17:37:34.000000000 -0500
 @@ -11,3 +11,7 @@
  
  type screen_exec_t;
@@ -2999,7 +3007,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.t
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-3.2.4/policy/modules/apps/thunderbird.fc
 --- nsaserefpolicy/policy/modules/apps/thunderbird.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/thunderbird.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/thunderbird.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -3,4 +3,4 @@
  #
  /usr/bin/thunderbird.*			--	gen_context(system_u:object_r:thunderbird_exec_t,s0)
@@ -3008,7 +3016,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderb
 +HOME_DIR/\.thunderbird(/.*)?			gen_context(system_u:object_r:user_thunderbird_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-3.2.4/policy/modules/apps/thunderbird.if
 --- nsaserefpolicy/policy/modules/apps/thunderbird.if	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/apps/thunderbird.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/thunderbird.if	2007-12-13 17:37:34.000000000 -0500
 @@ -43,9 +43,9 @@
  	application_domain($1_thunderbird_t,thunderbird_exec_t)
  	role $3 types $1_thunderbird_t;
@@ -3058,7 +3066,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderb
  	kernel_read_network_state($1_thunderbird_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.te serefpolicy-3.2.4/policy/modules/apps/thunderbird.te
 --- nsaserefpolicy/policy/modules/apps/thunderbird.te	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/apps/thunderbird.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/thunderbird.te	2007-12-13 17:37:34.000000000 -0500
 @@ -8,3 +8,7 @@
  
  type thunderbird_exec_t;
@@ -3069,7 +3077,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderb
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.if serefpolicy-3.2.4/policy/modules/apps/tvtime.if
 --- nsaserefpolicy/policy/modules/apps/tvtime.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/tvtime.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/tvtime.if	2007-12-13 17:37:34.000000000 -0500
 @@ -46,12 +46,10 @@
  	application_domain($1_tvtime_t,tvtime_exec_t)
  	role $3 types $1_tvtime_t;
@@ -3131,7 +3139,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.i
  	ps_process_pattern($2,$1_tvtime_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.te serefpolicy-3.2.4/policy/modules/apps/tvtime.te
 --- nsaserefpolicy/policy/modules/apps/tvtime.te	2007-10-02 09:54:50.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/tvtime.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/tvtime.te	2007-12-13 17:37:34.000000000 -0500
 @@ -11,3 +11,9 @@
  
  type tvtime_dir_t;
@@ -3144,7 +3152,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.t
 +files_tmp_file(user_tvtime_tmp_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc serefpolicy-3.2.4/policy/modules/apps/uml.fc
 --- nsaserefpolicy/policy/modules/apps/uml.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/uml.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/uml.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,7 +1,7 @@
  #
  # HOME_DIR/
@@ -3156,7 +3164,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc s
  # /usr
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelper.if serefpolicy-3.2.4/policy/modules/apps/userhelper.if
 --- nsaserefpolicy/policy/modules/apps/userhelper.if	2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/userhelper.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/userhelper.if	2007-12-13 17:37:34.000000000 -0500
 @@ -181,24 +181,6 @@
  		nscd_socket_use($1_userhelper_t)
  	')
@@ -3184,7 +3192,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelp
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.2.4/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/vmware.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/vmware.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,9 +1,9 @@
  #
  # HOME_DIR/
@@ -3231,7 +3239,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.f
 +/var/log/vmware.* 	--	gen_context(system_u:object_r:vmware_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-3.2.4/policy/modules/apps/vmware.if
 --- nsaserefpolicy/policy/modules/apps/vmware.if	2007-02-19 11:32:52.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/apps/vmware.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/vmware.if	2007-12-13 17:37:34.000000000 -0500
 @@ -202,3 +202,22 @@
  
  	allow $1 vmware_sys_conf_t:file append;
@@ -3257,7 +3265,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.i
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.2.4/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/vmware.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/vmware.te	2007-12-13 17:37:34.000000000 -0500
 @@ -22,17 +22,21 @@
  type vmware_var_run_t;
  files_pid_file(vmware_var_run_t)
@@ -3315,7 +3323,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.t
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.2.4/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2007-09-12 10:34:17.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/wine.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/wine.if	2007-12-13 17:37:34.000000000 -0500
 @@ -49,3 +49,53 @@
  	role $2 types wine_t;
  	allow wine_t $3:chr_file rw_term_perms;
@@ -3372,7 +3380,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.2.4/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/apps/wine.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/apps/wine.te	2007-12-13 17:37:34.000000000 -0500
 @@ -9,6 +9,7 @@
  type wine_t;
  type wine_exec_t;
@@ -3399,7 +3407,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.2.4/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2007-11-14 08:17:58.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/kernel/corecommands.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/corecommands.if	2007-12-13 17:37:34.000000000 -0500
 @@ -875,6 +875,7 @@
  
  	read_lnk_files_pattern($1,bin_t,bin_t)
@@ -3410,7 +3418,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.2.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-11-29 13:29:34.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/kernel/corenetwork.te.in	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/corenetwork.te.in	2007-12-13 17:37:34.000000000 -0500
 @@ -133,6 +133,7 @@
  network_port(pegasus_http, tcp,5988,s0)
  network_port(pegasus_https, tcp,5989,s0)
@@ -3421,7 +3429,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corene
  network_port(postgresql, tcp,5432,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.2.4/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/kernel/devices.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/devices.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -22,6 +22,7 @@
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
@@ -3440,7 +3448,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  /dev/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.2.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/kernel/devices.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/devices.if	2007-12-13 17:37:34.000000000 -0500
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1,device_t,device_node)
@@ -3592,7 +3600,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.2.4/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/kernel/devices.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/devices.te	2007-12-13 17:37:34.000000000 -0500
 @@ -72,6 +72,13 @@
  dev_node(kmsg_device_t)
  
@@ -3609,8 +3617,16 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  type lvm_control_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.2.4/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2007-11-29 13:29:34.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/kernel/domain.te	2007-12-13 13:34:36.000000000 -0500
-@@ -148,3 +148,16 @@
++++ serefpolicy-3.2.4/policy/modules/kernel/domain.te	2007-12-17 16:29:15.000000000 -0500
+@@ -85,6 +85,7 @@
+ # a keyring
+ kernel_dontaudit_search_key(domain)
+ kernel_dontaudit_link_key(domain)
++userdom_dontaudit_search_all_users_keys(domain)
+ 
+ # create child processes in the domain
+ allow domain self:process { fork sigchld };
+@@ -148,3 +149,16 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -3629,7 +3645,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.2.4/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/kernel/files.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/files.if	2007-12-13 17:37:34.000000000 -0500
 @@ -1266,6 +1266,24 @@
  
  ########################################
@@ -3720,7 +3736,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.2.4/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/kernel/files.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/files.te	2007-12-13 17:37:34.000000000 -0500
 @@ -55,6 +55,9 @@
  # compatibility aliases for removed types:
  typealias etc_t alias automount_etc_t;
@@ -3733,7 +3749,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.2.4/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-10-24 15:00:24.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/kernel/filesystem.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/filesystem.if	2007-12-13 17:37:34.000000000 -0500
 @@ -1171,6 +1171,25 @@
  
  ########################################
@@ -3762,7 +3778,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.2.4/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/kernel/filesystem.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/filesystem.te	2007-12-13 17:37:34.000000000 -0500
 @@ -25,6 +25,8 @@
  fs_use_xattr encfs gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
@@ -3786,7 +3802,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
  files_mountpoint(vxfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.2.4/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/kernel/kernel.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/kernel.if	2007-12-13 17:37:34.000000000 -0500
 @@ -851,9 +851,8 @@
  		type proc_t, proc_afs_t;
  	')
@@ -3816,7 +3832,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.2.4/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/kernel/selinux.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/selinux.if	2007-12-13 17:37:34.000000000 -0500
 @@ -164,6 +164,7 @@
  		type security_t;
  	')
@@ -3909,7 +3925,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinu
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-3.2.4/policy/modules/kernel/selinux.te
 --- nsaserefpolicy/policy/modules/kernel/selinux.te	2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/kernel/selinux.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/selinux.te	2007-12-13 17:37:34.000000000 -0500
 @@ -10,6 +10,7 @@
  attribute can_setenforce;
  attribute can_setsecparam;
@@ -3932,7 +3948,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinu
  neverallow ~{ selinux_unconfined_type can_setsecparam } security_t:security setsecparam;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.2.4/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2007-09-12 10:34:17.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/kernel/terminal.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/kernel/terminal.if	2007-12-13 17:37:34.000000000 -0500
 @@ -525,11 +525,13 @@
  interface(`term_use_generic_ptys',`
  	gen_require(`
@@ -3961,7 +3977,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.2.4/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/amavis.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/amavis.te	2007-12-13 17:37:34.000000000 -0500
 @@ -65,6 +65,7 @@
  # Spool Files
  manage_dirs_pattern(amavis_t,amavis_spool_t,amavis_spool_t)
@@ -3980,7 +3996,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
  dev_read_rand(amavis_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.2.4/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/apache.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/apache.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -16,7 +16,6 @@
  
  /usr/lib/apache-ssl/.+		--	gen_context(system_u:object_r:httpd_exec_t,s0)
@@ -4008,7 +4024,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
 +/etc/rc\.d/init\.d/httpd	--	gen_context(system_u:object_r:httpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.2.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-10-23 17:17:42.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/apache.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/apache.if	2007-12-13 17:37:34.000000000 -0500
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -4317,7 +4333,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.2.4/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/apache.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/apache.te	2007-12-13 17:37:34.000000000 -0500
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -4774,7 +4790,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.if serefpolicy-3.2.4/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/apcupsd.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/apcupsd.if	2007-12-13 17:37:34.000000000 -0500
 @@ -90,10 +90,29 @@
  ## </summary>
  ## </param>
@@ -4808,7 +4824,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.2.4/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/apcupsd.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/apcupsd.te	2007-12-13 17:37:34.000000000 -0500
 @@ -86,6 +86,11 @@
  
  miscfiles_read_localization(apcupsd_t)
@@ -4823,7 +4839,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-3.2.4/policy/modules/services/automount.fc
 --- nsaserefpolicy/policy/modules/services/automount.fc	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/automount.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/automount.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -12,4 +12,4 @@
  # /var
  #
@@ -4832,7 +4848,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/auto
 +/var/run/autofs.*		gen_context(system_u:object_r:automount_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-3.2.4/policy/modules/services/automount.if
 --- nsaserefpolicy/policy/modules/services/automount.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/automount.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/automount.if	2007-12-13 17:37:34.000000000 -0500
 @@ -74,3 +74,21 @@
  
  	dontaudit $1 automount_tmp_t:dir getattr;
@@ -4857,7 +4873,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/auto
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.2.4/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/automount.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/automount.te	2007-12-13 17:37:34.000000000 -0500
 @@ -52,7 +52,8 @@
  files_root_filetrans(automount_t,automount_tmp_t,dir)
  
@@ -4899,7 +4915,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.2.4/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2007-10-29 07:52:49.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/avahi.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/avahi.te	2007-12-13 17:37:34.000000000 -0500
 @@ -85,6 +85,7 @@
  	dbus_connect_system_bus(avahi_t)
  
@@ -4910,7 +4926,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avah
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.2.4/policy/modules/services/bluetooth.fc
 --- nsaserefpolicy/policy/modules/services/bluetooth.fc	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/bluetooth.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/bluetooth.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -22,3 +22,4 @@
  #
  /var/lib/bluetooth(/.*)?	gen_context(system_u:object_r:bluetooth_var_lib_t,s0)
@@ -4918,7 +4934,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/blue
 +/var/run/bluetoothd_address	gen_context(system_u:object_r:bluetooth_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.2.4/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-10-29 07:52:49.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/bluetooth.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/bluetooth.te	2007-12-13 17:37:34.000000000 -0500
 @@ -44,7 +44,7 @@
  allow bluetooth_t self:shm create_shm_perms;
  allow bluetooth_t self:socket create_stream_socket_perms;
@@ -4938,7 +4954,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.2.4/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2007-09-05 15:24:44.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/clamav.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/clamav.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -5,16 +5,18 @@
  /usr/bin/freshclam		--	gen_context(system_u:object_r:freshclam_exec_t,s0)
  
@@ -4962,7 +4978,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
  /var/spool/amavisd/clamd\.sock	-s	gen_context(system_u:object_r:clamd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.2.4/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/clamav.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/clamav.te	2007-12-13 17:37:34.000000000 -0500
 @@ -87,6 +87,7 @@
  kernel_dontaudit_list_proc(clamd_t)
  kernel_read_sysctl(clamd_t)
@@ -5001,7 +5017,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.2.4/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/consolekit.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/consolekit.te	2007-12-13 17:37:34.000000000 -0500
 @@ -36,6 +36,7 @@
  
  domain_read_all_domains_state(consolekit_t)
@@ -5038,7 +5054,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.2.4/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/cron.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/cron.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -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)
@@ -5055,7 +5071,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.2.4/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/cron.if	2007-12-13 14:22:04.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/cron.if	2007-12-17 16:41:07.000000000 -0500
 @@ -35,38 +35,23 @@
  #
  template(`cron_per_role_template',`
@@ -5307,7 +5323,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.2.4/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/cron.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/cron.te	2007-12-13 17:37:34.000000000 -0500
 @@ -50,6 +50,7 @@
  
  type crond_tmp_t;
@@ -5492,7 +5508,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.2.4/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2007-11-16 15:30:49.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/cups.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/cups.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -8,17 +8,15 @@
  /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)
@@ -5543,7 +5559,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
 +/usr/local/Printer/[^/]*/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.2.4/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/cups.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/cups.te	2007-12-13 17:37:34.000000000 -0500
 @@ -43,14 +43,12 @@
  
  type cupsd_var_run_t;
@@ -5816,7 +5832,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
  	seutil_sigchld_newrole(hplip_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.2.4/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2007-11-15 13:40:14.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/cvs.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/cvs.te	2007-12-13 17:37:34.000000000 -0500
 @@ -69,6 +69,7 @@
  fs_getattr_xattr_fs(cvs_t)
  
@@ -5848,7 +5864,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.if serefpolicy-3.2.4/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/dbus.if	2007-12-13 16:46:07.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dbus.if	2007-12-13 17:37:34.000000000 -0500
 @@ -91,7 +91,7 @@
  	# SE-DBus specific permissions
  	allow $1_dbusd_$1_t { $1_dbusd_t self }:dbus send_msg;
@@ -5926,7 +5942,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.if serefpolicy-3.2.4/policy/modules/services/dcc.if
 --- nsaserefpolicy/policy/modules/services/dcc.if	2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/dcc.if	2007-12-13 15:58:07.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dcc.if	2007-12-13 17:37:34.000000000 -0500
 @@ -72,6 +72,24 @@
  
  ########################################
@@ -5954,7 +5970,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.2.4/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/dcc.te	2007-12-13 15:52:57.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dcc.te	2007-12-13 17:37:34.000000000 -0500
 @@ -124,7 +124,7 @@
  # dcc procmail interface local policy
  #
@@ -5975,7 +5991,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.fc serefpolicy-3.2.4/policy/modules/services/dictd.fc
 --- nsaserefpolicy/policy/modules/services/dictd.fc	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/dictd.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dictd.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -4,3 +4,4 @@
  /usr/sbin/dictd		--	gen_context(system_u:object_r:dictd_exec_t,s0)
  
@@ -5983,7 +5999,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dict
 +/var/run/dictd\.pid	--	gen_context(system_u:object_r:dictd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.te serefpolicy-3.2.4/policy/modules/services/dictd.te
 --- nsaserefpolicy/policy/modules/services/dictd.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/dictd.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dictd.te	2007-12-13 17:37:34.000000000 -0500
 @@ -16,6 +16,9 @@
  type dictd_var_lib_t alias var_lib_dictd_t;
  files_type(dictd_var_lib_t)
@@ -6006,7 +6022,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dict
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.2.4/policy/modules/services/dnsmasq.te
 --- nsaserefpolicy/policy/modules/services/dnsmasq.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/dnsmasq.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dnsmasq.te	2007-12-13 17:37:34.000000000 -0500
 @@ -94,3 +94,7 @@
  optional_policy(`
  	udev_read_db(dnsmasq_t)
@@ -6017,7 +6033,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsm
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.2.4/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/dovecot.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dovecot.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -17,19 +17,24 @@
  
  ifdef(`distro_debian', `
@@ -6045,7 +6061,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.2.4/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/dovecot.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dovecot.if	2007-12-13 17:37:34.000000000 -0500
 @@ -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)
@@ -6092,7 +6108,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.2.4/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/dovecot.te	2007-12-13 15:31:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/dovecot.te	2007-12-13 17:37:34.000000000 -0500
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -6231,7 +6247,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.2.4/policy/modules/services/exim.if
 --- nsaserefpolicy/policy/modules/services/exim.if	2007-10-24 15:00:24.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/exim.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/exim.if	2007-12-13 17:37:34.000000000 -0500
 @@ -117,6 +117,27 @@
  
  ########################################
@@ -6262,7 +6278,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.2.4/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2007-10-24 15:17:31.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/exim.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/exim.te	2007-12-13 17:37:34.000000000 -0500
 @@ -21,9 +21,20 @@
  ## </desc>
  gen_tunable(exim_manage_user_files,false)
@@ -6441,7 +6457,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.2.4/policy/modules/services/ftp.if
 --- nsaserefpolicy/policy/modules/services/ftp.if	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/ftp.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ftp.if	2007-12-13 17:37:34.000000000 -0500
 @@ -28,11 +28,13 @@
  		type ftpd_t;
  	')
@@ -6463,7 +6479,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.2.4/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/ftp.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ftp.te	2007-12-13 17:37:34.000000000 -0500
 @@ -106,9 +106,10 @@
  manage_sock_files_pattern(ftpd_t,ftpd_tmpfs_t,ftpd_tmpfs_t)
  fs_tmpfs_filetrans(ftpd_t,ftpd_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
@@ -6519,7 +6535,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.2.4/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-11-14 08:17:58.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/hal.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/hal.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -8,6 +8,7 @@
  /usr/libexec/hal-hotplug-map 		--	gen_context(system_u:object_r:hald_exec_t,s0)
  /usr/libexec/hal-system-sonypic	 	--	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
@@ -6544,7 +6560,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.2.4/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-09-05 15:24:44.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/hal.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/hal.if	2007-12-13 17:37:34.000000000 -0500
 @@ -302,3 +302,42 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -6590,7 +6606,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.2.4/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-11-14 08:17:58.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/hal.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/hal.te	2007-12-13 17:37:34.000000000 -0500
 @@ -49,6 +49,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -6681,7 +6697,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.2.4/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/inetd.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/inetd.te	2007-12-13 17:37:34.000000000 -0500
 @@ -30,6 +30,10 @@
  type inetd_child_var_run_t;
  files_pid_file(inetd_child_var_run_t)
@@ -6737,7 +6753,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.fc serefpolicy-3.2.4/policy/modules/services/kerberos.fc
 --- nsaserefpolicy/policy/modules/services/kerberos.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/kerberos.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/kerberos.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -16,3 +16,4 @@
  
  /var/log/krb5kdc\.log			gen_context(system_u:object_r:krb5kdc_log_t,s0)
@@ -6745,7 +6761,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
 +/var/tmp/host_0			-- 	gen_context(system_u:object_r:krb5_host_rcache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.2.4/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-07-16 14:09:46.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/kerberos.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/kerberos.if	2007-12-13 17:37:34.000000000 -0500
 @@ -43,7 +43,13 @@
  	dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
  	dontaudit $1 krb5kdc_conf_t:file rw_file_perms;
@@ -6826,7 +6842,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.2.4/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/kerberos.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/kerberos.te	2007-12-13 17:37:34.000000000 -0500
 @@ -54,6 +54,9 @@
  type krb5kdc_var_run_t;
  files_pid_file(krb5kdc_var_run_t)
@@ -6907,7 +6923,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.2.4/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mailman.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mailman.te	2007-12-13 17:37:34.000000000 -0500
 @@ -53,10 +53,9 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -6934,13 +6950,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.2.4/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mailscanner.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mailscanner.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -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.2.4/policy/modules/services/mailscanner.if
 --- nsaserefpolicy/policy/modules/services/mailscanner.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mailscanner.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mailscanner.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,59 @@
 +## <summary>Anti-Virus and Anti-Spam Filter</summary>
 +
@@ -7003,7 +7019,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.2.4/policy/modules/services/mailscanner.te
 --- nsaserefpolicy/policy/modules/services/mailscanner.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mailscanner.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mailscanner.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,5 @@
 +
 +policy_module(mailscanner,1.0.0)
@@ -7012,7 +7028,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.2.4/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mta.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mta.if	2007-12-13 17:37:34.000000000 -0500
 @@ -133,6 +133,12 @@
  		sendmail_create_log($1_mail_t)
  	')
@@ -7154,7 +7170,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  ## <summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.2.4/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mta.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mta.te	2007-12-17 13:47:58.000000000 -0500
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -7250,7 +7266,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.fc serefpolicy-3.2.4/policy/modules/services/mysql.fc
 --- nsaserefpolicy/policy/modules/services/mysql.fc	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mysql.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mysql.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -22,3 +22,5 @@
  /var/log/mysql.*	--	gen_context(system_u:object_r:mysqld_log_t,s0)
  
@@ -7259,7 +7275,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
 +/etc/rc\.d/init\.d/mysqld	--	gen_context(system_u:object_r:mysqld_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.2.4/policy/modules/services/mysql.if
 --- nsaserefpolicy/policy/modules/services/mysql.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/mysql.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mysql.if	2007-12-13 17:37:34.000000000 -0500
 @@ -157,3 +157,79 @@
  	logging_search_logs($1)
  	allow $1 mysqld_log_t:file { write append setattr ioctl };
@@ -7342,7 +7358,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.2.4/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/mysql.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/mysql.te	2007-12-13 17:37:34.000000000 -0500
 @@ -25,6 +25,9 @@
  type mysqld_tmp_t;
  files_tmp_file(mysqld_tmp_t)
@@ -7355,7 +7371,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
  # Local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.2.4/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/nagios.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nagios.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -4,13 +4,15 @@
  /usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
  /usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
@@ -7377,7 +7393,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
 +/usr/lib(64)?/cgi-bin/nagios(/.+)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.2.4/policy/modules/services/nagios.if
 --- nsaserefpolicy/policy/modules/services/nagios.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/nagios.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nagios.if	2007-12-13 17:37:34.000000000 -0500
 @@ -44,25 +44,6 @@
  
  ########################################
@@ -7406,7 +7422,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.2.4/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/nagios.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nagios.te	2007-12-13 17:37:34.000000000 -0500
 @@ -8,11 +8,7 @@
  
  type nagios_t;
@@ -7505,7 +7521,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.2.4/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/networkmanager.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/networkmanager.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -5,3 +5,4 @@
  /var/run/NetworkManager(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
@@ -7513,7 +7529,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
 +/var/log/wpa_supplicant\.log	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.2.4/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2007-10-29 07:52:49.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/networkmanager.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/networkmanager.te	2007-12-13 17:37:34.000000000 -0500
 @@ -13,6 +13,9 @@
  type NetworkManager_var_run_t;
  files_pid_file(NetworkManager_var_run_t)
@@ -7601,7 +7617,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.2.4/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/nis.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nis.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -4,6 +4,7 @@
  /sbin/ypbind		--	gen_context(system_u:object_r:ypbind_exec_t,s0)
  
@@ -7612,7 +7628,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.2.4/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2007-07-16 14:09:46.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/nis.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nis.if	2007-12-13 17:37:34.000000000 -0500
 @@ -49,8 +49,8 @@
  	corenet_udp_bind_all_nodes($1)
  	corenet_tcp_bind_generic_port($1)
@@ -7652,7 +7668,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.2.4/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/nis.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nis.te	2007-12-13 17:37:34.000000000 -0500
 @@ -113,6 +113,17 @@
  userdom_dontaudit_use_unpriv_user_fds(ypbind_t)
  userdom_dontaudit_search_sysadm_home_dirs(ypbind_t)
@@ -7710,7 +7726,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.fc serefpolicy-3.2.4/policy/modules/services/nscd.fc
 --- nsaserefpolicy/policy/modules/services/nscd.fc	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/nscd.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nscd.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -9,3 +9,5 @@
  /var/run/\.nscd_socket	-s	gen_context(system_u:object_r:nscd_var_run_t,s0)
  
@@ -7719,7 +7735,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd
 +/etc/rc\.d/init\.d/nscd	--	gen_context(system_u:object_r:httpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.2.4/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/nscd.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nscd.if	2007-12-13 17:37:34.000000000 -0500
 @@ -70,15 +70,14 @@
  interface(`nscd_socket_use',`
  	gen_require(`
@@ -7763,7 +7779,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.2.4/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/nscd.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/nscd.te	2007-12-13 17:37:34.000000000 -0500
 @@ -23,19 +23,22 @@
  type nscd_log_t;
  logging_log_file(nscd_log_t)
@@ -7831,7 +7847,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.2.4/policy/modules/services/ntp.fc
 --- nsaserefpolicy/policy/modules/services/ntp.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/ntp.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ntp.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -17,3 +17,8 @@
  /var/log/xntpd.*		--	gen_context(system_u:object_r:ntpd_log_t,s0)
  
@@ -7843,7 +7859,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
 +/etc/rc\.d/init\.d/ntpd	--	gen_context(system_u:object_r:ntpd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.2.4/policy/modules/services/ntp.if
 --- nsaserefpolicy/policy/modules/services/ntp.if	2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/ntp.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ntp.if	2007-12-13 17:37:34.000000000 -0500
 @@ -53,3 +53,22 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1,ntpdate_exec_t,ntpd_t)
@@ -7869,7 +7885,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.2.4/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/ntp.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ntp.te	2007-12-13 17:37:34.000000000 -0500
 @@ -25,6 +25,12 @@
  type ntpdate_exec_t;
  init_system_domain(ntpd_t,ntpdate_exec_t)
@@ -7933,7 +7949,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.te serefpolicy-3.2.4/policy/modules/services/openct.te
 --- nsaserefpolicy/policy/modules/services/openct.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/openct.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/openct.te	2007-12-13 17:37:34.000000000 -0500
 @@ -22,6 +22,7 @@
  allow openct_t self:process signal_perms;
  
@@ -7944,7 +7960,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
  kernel_read_kernel_sysctls(openct_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-3.2.4/policy/modules/services/openvpn.fc
 --- nsaserefpolicy/policy/modules/services/openvpn.fc	2007-06-11 16:05:22.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/openvpn.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/openvpn.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -11,5 +11,5 @@
  #
  # /var
@@ -7954,7 +7970,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
  /var/run/openvpn(/.*)?		gen_context(system_u:object_r:openvpn_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.2.4/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2007-10-29 07:52:49.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/openvpn.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/openvpn.te	2007-12-13 17:37:34.000000000 -0500
 @@ -8,7 +8,7 @@
  
  ## <desc>
@@ -7988,7 +8004,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.2.4/policy/modules/services/pcscd.te
 --- nsaserefpolicy/policy/modules/services/pcscd.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/pcscd.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/pcscd.te	2007-12-13 17:37:34.000000000 -0500
 @@ -45,6 +45,7 @@
  files_read_etc_files(pcscd_t)
  files_read_etc_runtime_files(pcscd_t)
@@ -7999,7 +8015,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcsc
  libs_use_ld_so(pcscd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.2.4/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/pegasus.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/pegasus.te	2007-12-13 17:37:34.000000000 -0500
 @@ -42,6 +42,7 @@
  allow pegasus_t pegasus_conf_t:file { read_file_perms link unlink };
  allow pegasus_t pegasus_conf_t:lnk_file read_lnk_file_perms;
@@ -8048,7 +8064,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pega
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.fc serefpolicy-3.2.4/policy/modules/services/polkit.fc
 --- nsaserefpolicy/policy/modules/services/polkit.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/polkit.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/polkit.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,5 @@
 +
 +/usr/libexec/polkit-read-auth-helper	--	gen_context(system_u:object_r:polkit_auth_exec_t,s0)
@@ -8057,7 +8073,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polk
 +/var/lib/PolicyKit-public(/.*)?			gen_context(system_u:object_r:polkit_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.2.4/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/polkit.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/polkit.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,60 @@
 +
 +## <summary>policy for polkit_auth</summary>
@@ -8121,7 +8137,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polk
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.2.4/policy/modules/services/polkit.te
 --- nsaserefpolicy/policy/modules/services/polkit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/polkit.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/polkit.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,55 @@
 +policy_module(polkit_auth,1.0.0)
 +
@@ -8180,7 +8196,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polk
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.2.4/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/postfix.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/postfix.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -29,12 +29,10 @@
  /usr/lib/postfix/smtpd	--	gen_context(system_u:object_r:postfix_smtpd_exec_t,s0)
  /usr/lib/postfix/bounce	--	gen_context(system_u:object_r:postfix_bounce_exec_t,s0)
@@ -8196,7 +8212,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.2.4/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/postfix.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/postfix.if	2007-12-13 17:37:34.000000000 -0500
 @@ -427,6 +427,26 @@
  
  ########################################
@@ -8226,7 +8242,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  ## </summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.2.4/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/postfix.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/postfix.te	2007-12-13 17:37:34.000000000 -0500
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -8348,7 +8364,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  # Postfix virtual local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.2.4/policy/modules/services/postgresql.fc
 --- nsaserefpolicy/policy/modules/services/postgresql.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/postgresql.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/postgresql.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -38,3 +38,5 @@
  ')
  
@@ -8357,7 +8373,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +/etc/rc\.d/init\.d/postgresql	--	gen_context(system_u:object_r:postgresql_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.2.4/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2007-11-29 13:29:35.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/postgresql.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/postgresql.if	2007-12-13 17:37:34.000000000 -0500
 @@ -120,3 +120,77 @@
          # Some versions of postgresql put the sock file in /tmp
  	allow $1 postgresql_tmp_t:sock_file write;
@@ -8438,7 +8454,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.2.4/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/postgresql.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/postgresql.te	2007-12-13 17:37:34.000000000 -0500
 @@ -27,6 +27,9 @@
  type postgresql_var_run_t;
  files_pid_file(postgresql_var_run_t)
@@ -8451,7 +8467,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  # postgresql Local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.2.4/policy/modules/services/ppp.fc
 --- nsaserefpolicy/policy/modules/services/ppp.fc	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/ppp.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ppp.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -25,7 +25,7 @@
  #
  # /var
@@ -8463,7 +8479,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
  # Fix pptp sockets
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.2.4/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/ppp.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ppp.te	2007-12-13 17:37:34.000000000 -0500
 @@ -194,6 +194,8 @@
  
  optional_policy(`
@@ -8475,7 +8491,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.2.4/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/procmail.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/procmail.te	2007-12-13 17:37:34.000000000 -0500
 @@ -133,3 +133,7 @@
  	spamassassin_exec_client(procmail_t)
  	spamassassin_read_lib_files(procmail_t)
@@ -8486,7 +8502,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.fc serefpolicy-3.2.4/policy/modules/services/pyzor.fc
 --- nsaserefpolicy/policy/modules/services/pyzor.fc	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/pyzor.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/pyzor.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,6 +1,6 @@
  /etc/pyzor(/.*)?		gen_context(system_u:object_r:pyzor_etc_t, s0)
  
@@ -8497,7 +8513,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
  /usr/bin/pyzord		--	gen_context(system_u:object_r:pyzord_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.2.4/policy/modules/services/pyzor.if
 --- nsaserefpolicy/policy/modules/services/pyzor.if	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/pyzor.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/pyzor.if	2007-12-13 17:37:34.000000000 -0500
 @@ -25,16 +25,18 @@
  #
  template(`pyzor_per_role_template',`
@@ -8526,7 +8542,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.2.4/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/pyzor.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/pyzor.te	2007-12-13 17:37:34.000000000 -0500
 @@ -28,6 +28,9 @@
  type pyzor_var_lib_t;
  files_type(pyzor_var_lib_t)
@@ -8539,7 +8555,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
  # Pyzor local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.2.4/policy/modules/services/razor.fc
 --- nsaserefpolicy/policy/modules/services/razor.fc	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/razor.fc	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/razor.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:ROLE_razor_home_t,s0)
 +HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:user_razor_home_t,s0)
@@ -8548,7 +8564,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razo
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.2.4/policy/modules/services/razor.if
 --- nsaserefpolicy/policy/modules/services/razor.if	2007-07-16 14:09:46.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/razor.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/razor.if	2007-12-13 17:37:34.000000000 -0500
 @@ -137,6 +137,7 @@
  template(`razor_per_role_template',`
  	gen_require(`
@@ -8576,7 +8592,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razo
  	#
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.2.4/policy/modules/services/razor.te
 --- nsaserefpolicy/policy/modules/services/razor.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/razor.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/razor.te	2007-12-13 17:37:34.000000000 -0500
 @@ -23,6 +23,12 @@
  
  razor_common_domain_template(razor)
@@ -8592,7 +8608,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razo
  # Local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.if serefpolicy-3.2.4/policy/modules/services/remotelogin.if
 --- nsaserefpolicy/policy/modules/services/remotelogin.if	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/remotelogin.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/remotelogin.if	2007-12-13 17:37:34.000000000 -0500
 @@ -18,3 +18,20 @@
  	auth_domtrans_login_program($1,remote_login_t)
  ')
@@ -8616,7 +8632,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remo
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-3.2.4/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/remotelogin.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/remotelogin.te	2007-12-13 17:37:34.000000000 -0500
 @@ -85,6 +85,7 @@
  
  miscfiles_read_localization(remote_login_t)
@@ -8627,7 +8643,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remo
  # Only permit unprivileged user domains to be entered via rlogin,
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.2.4/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/rlogin.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/rlogin.te	2007-12-13 17:37:34.000000000 -0500
 @@ -36,6 +36,8 @@
  allow rlogind_t rlogind_devpts_t:chr_file { rw_chr_file_perms setattr };
  term_create_pty(rlogind_t,rlogind_devpts_t)
@@ -8667,7 +8683,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.2.4/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/rpcbind.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/rpcbind.te	2007-12-13 17:37:34.000000000 -0500
 @@ -21,11 +21,13 @@
  # rpcbind local policy
  #
@@ -8693,7 +8709,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcb
  corenet_all_recvfrom_unlabeled(rpcbind_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.2.4/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/rpc.if	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/rpc.if	2007-12-13 17:37:34.000000000 -0500
 @@ -88,8 +88,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -8734,7 +8750,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.2.4/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/rpc.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/rpc.te	2007-12-13 17:37:34.000000000 -0500
 @@ -60,10 +60,14 @@
  manage_files_pattern(rpcd_t,rpcd_var_run_t,rpcd_var_run_t)
  files_pid_filetrans(rpcd_t,rpcd_var_run_t,file)
@@ -8815,7 +8831,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.2.4/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/rshd.te	2007-12-13 13:34:36.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/rshd.te	2007-12-13 17:37:34.000000000 -0500
 @@ -16,7 +16,7 @@
  #
  # Local policy
@@ -8878,7 +8894,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.fc serefpolicy-3.2.4/policy/modules/services/rsync.fc
 --- nsaserefpolicy/policy/modules/services/rsync.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/rsync.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/rsync.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /usr/bin/rsync		--	gen_context(system_u:object_r:rsync_exec_t,s0)
@@ -8886,7 +8902,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsyn
 +/var/log/rsync.log      --	gen_context(system_u:object_r:rsync_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.2.4/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/rsync.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/rsync.te	2007-12-13 17:37:34.000000000 -0500
 @@ -31,6 +31,9 @@
  type rsync_data_t;
  files_type(rsync_data_t)
@@ -8934,7 +8950,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsyn
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.2.4/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/samba.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/samba.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -15,6 +15,7 @@
  /usr/bin/ntlm_auth		--	gen_context(system_u:object_r:winbind_helper_exec_t,s0)
  /usr/bin/smbmount		--	gen_context(system_u:object_r:smbmount_exec_t,s0)
@@ -8954,7 +8970,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.2.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/samba.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/samba.if	2007-12-13 17:37:34.000000000 -0500
 @@ -331,6 +331,25 @@
  
  ########################################
@@ -9094,7 +9110,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.2.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/samba.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/samba.te	2007-12-13 17:37:34.000000000 -0500
 @@ -26,28 +26,28 @@
  
  ## <desc>
@@ -9380,7 +9396,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
 +allow smbcontrol_t nmbd_var_run_t:file { read lock };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.2.4/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/sasl.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/sasl.te	2007-12-13 17:37:34.000000000 -0500
 @@ -107,6 +107,10 @@
  ')
  
@@ -9394,7 +9410,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.2.4/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2007-08-27 13:57:20.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/sendmail.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/sendmail.if	2007-12-13 17:37:34.000000000 -0500
 @@ -149,3 +149,85 @@
  
  	logging_log_filetrans($1,sendmail_log_t,file)
@@ -9483,7 +9499,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.2.4/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/sendmail.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/sendmail.te	2007-12-17 13:48:18.000000000 -0500
 @@ -20,12 +20,16 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -9502,7 +9518,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
  allow sendmail_t self:process signal;
  allow sendmail_t self:fifo_file rw_fifo_file_perms;
  allow sendmail_t self:unix_stream_socket create_stream_socket_perms;
-@@ -97,20 +101,35 @@
+@@ -47,6 +51,7 @@
+ kernel_read_kernel_sysctls(sendmail_t)
+ # for piping mail to a command
+ kernel_read_system_state(sendmail_t)
++kernel_read_network_state(sendmail_t)
+ 
+ corenet_all_recvfrom_unlabeled(sendmail_t)
+ corenet_all_recvfrom_netlabel(sendmail_t)
+@@ -97,20 +102,35 @@
  
  userdom_dontaudit_use_unpriv_user_fds(sendmail_t)
  userdom_dontaudit_search_sysadm_home_dirs(sendmail_t)
@@ -9539,7 +9563,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
  	postfix_exec_master(sendmail_t)
  	postfix_read_config(sendmail_t)
  	postfix_search_spool(sendmail_t)
-@@ -125,24 +144,25 @@
+@@ -125,24 +145,25 @@
  ')
  
  optional_policy(`
@@ -9583,7 +9607,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
 -') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.2.4/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2007-10-29 07:52:49.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/setroubleshoot.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/setroubleshoot.te	2007-12-13 17:37:34.000000000 -0500
 @@ -27,8 +27,8 @@
  # setroubleshootd local policy
  #
@@ -9624,7 +9648,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.2.4/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/snmp.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/snmp.te	2007-12-13 17:37:34.000000000 -0500
 @@ -81,8 +81,7 @@
  files_read_usr_files(snmpd_t)
  files_read_etc_runtime_files(snmpd_t)
@@ -9637,7 +9661,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
  fs_getattr_all_fs(snmpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.fc serefpolicy-3.2.4/policy/modules/services/soundserver.fc
 --- nsaserefpolicy/policy/modules/services/soundserver.fc	2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/soundserver.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/soundserver.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,5 +1,3 @@
 -/etc/nas(/.*)?			gen_context(system_u:object_r:soundd_etc_t,s0)
 -/etc/yiff(/.*)?			gen_context(system_u:object_r:soundd_etc_t,s0)
@@ -9653,7 +9677,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soun
  /var/state/yiff(/.*)?		gen_context(system_u:object_r:soundd_state_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.te serefpolicy-3.2.4/policy/modules/services/soundserver.te
 --- nsaserefpolicy/policy/modules/services/soundserver.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/soundserver.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/soundserver.te	2007-12-13 17:37:34.000000000 -0500
 @@ -10,9 +10,6 @@
  type soundd_exec_t;
  init_daemon_domain(soundd_t,soundd_exec_t)
@@ -9716,7 +9740,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.2.4/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/spamassassin.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/spamassassin.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:user_spamassassin_home_t,s0)
@@ -9725,7 +9749,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
  /usr/bin/spamassassin	--	gen_context(system_u:object_r:spamassassin_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.2.4/policy/modules/services/spamassassin.if
 --- nsaserefpolicy/policy/modules/services/spamassassin.if	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/spamassassin.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/spamassassin.if	2007-12-13 17:37:34.000000000 -0500
 @@ -38,6 +38,8 @@
  	gen_require(`
  		type spamc_exec_t, spamassassin_exec_t;
@@ -9853,7 +9877,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.2.4/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/spamassassin.te	2007-12-13 15:58:16.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/spamassassin.te	2007-12-13 17:37:34.000000000 -0500
 @@ -44,6 +44,15 @@
  type spamassassin_exec_t;
  application_executable_file(spamassassin_exec_t)
@@ -9906,7 +9930,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.2.4/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/squid.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/squid.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -12,3 +12,5 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
@@ -9915,7 +9939,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +/usr/lib64/squid/cachemgr\.cgi	--	gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-3.2.4/policy/modules/services/squid.if
 --- nsaserefpolicy/policy/modules/services/squid.if	2007-05-07 10:32:44.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/squid.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/squid.if	2007-12-13 17:37:34.000000000 -0500
 @@ -131,3 +131,22 @@
  interface(`squid_use',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -9941,7 +9965,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squi
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.2.4/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/squid.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/squid.te	2007-12-13 17:37:34.000000000 -0500
 @@ -36,7 +36,7 @@
  # Local policy
  #
@@ -10000,7 +10024,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.fc serefpolicy-3.2.4/policy/modules/services/ssh.fc
 --- nsaserefpolicy/policy/modules/services/ssh.fc	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/ssh.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ssh.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.ssh(/.*)?			gen_context(system_u:object_r:ROLE_home_ssh_t,s0)
 +HOME_DIR/\.ssh(/.*)?			gen_context(system_u:object_r:user_ssh_home_t,s0)
@@ -10009,7 +10033,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
  /etc/ssh/ssh_host_key 		--	gen_context(system_u:object_r:sshd_key_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.2.4/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-07-23 10:20:13.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/ssh.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ssh.if	2007-12-13 17:37:34.000000000 -0500
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -10171,7 +10195,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.2.4/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/ssh.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/ssh.te	2007-12-13 17:37:34.000000000 -0500
 @@ -24,7 +24,7 @@
  
  # Type for the ssh-agent executable.
@@ -10231,7 +10255,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.2.4/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/telnet.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/telnet.te	2007-12-13 17:37:34.000000000 -0500
 @@ -37,6 +37,8 @@
  allow telnetd_t telnetd_devpts_t:chr_file { rw_chr_file_perms setattr };
  term_create_pty(telnetd_t,telnetd_devpts_t)
@@ -10282,7 +10306,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/teln
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-3.2.4/policy/modules/services/tftp.fc
 --- nsaserefpolicy/policy/modules/services/tftp.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/tftp.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/tftp.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -4,3 +4,4 @@
  
  /tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
@@ -10290,18 +10314,18 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp
 +/var/lib/tftp(/.*)?		gen_context(system_u:object_r:tftpdir_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-3.2.4/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/w3c.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/w3c.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -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.2.4/policy/modules/services/w3c.if
 --- nsaserefpolicy/policy/modules/services/w3c.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/w3c.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/w3c.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +## <summary>W3C</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.2.4/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/w3c.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/w3c.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,14 @@
 +policy_module(w3c,1.2.1)
 +
@@ -10319,7 +10343,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.2.4/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2007-10-15 16:11:05.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/services/xserver.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/xserver.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,13 +1,13 @@
  #
  # HOME_DIR
@@ -10388,7 +10412,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.2.4/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/xserver.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/xserver.if	2007-12-13 17:37:34.000000000 -0500
 @@ -45,7 +45,7 @@
  	# execheap needed until the X module loader is fixed.
  	# NVIDIA Needs execstack
@@ -10919,7 +10943,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.2.4/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/services/xserver.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/services/xserver.te	2007-12-13 17:37:34.000000000 -0500
 @@ -16,6 +16,13 @@
  
  ## <desc>
@@ -11241,7 +11265,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/authlogin.fc serefpolicy-3.2.4/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/authlogin.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/authlogin.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -29,7 +29,6 @@
  /var/db/shadow.*	--	gen_context(system_u:object_r:shadow_t,s0)
  
@@ -11259,7 +11283,16 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.2.4/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-11-29 13:29:35.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/authlogin.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/authlogin.if	2007-12-17 17:05:09.000000000 -0500
+@@ -99,7 +99,7 @@
+ template(`authlogin_per_role_template',`
+ 
+ 	gen_require(`
+-		type system_chkpwd_t, shadow_t;
++		type system_chkpwd_t, shadow_t, updpwd_t;
+ 	')
+ 
+ 	authlogin_common_auth_domain_template($1)
 @@ -169,6 +169,7 @@
  interface(`auth_login_pgm_domain',`
  	gen_require(`
@@ -11396,7 +11429,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.2.4/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/authlogin.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/authlogin.te	2007-12-13 17:37:34.000000000 -0500
 @@ -59,6 +59,9 @@
  type utempter_exec_t;
  application_domain(utempter_t,utempter_exec_t)
@@ -11454,7 +11487,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlo
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.2.4/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2007-09-26 12:15:01.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/fstools.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/fstools.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,3 @@
 -/sbin/badblocks		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -11470,7 +11503,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.2.4/policy/modules/system/fstools.if
 --- nsaserefpolicy/policy/modules/system/fstools.if	2007-08-22 17:33:53.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/fstools.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/fstools.if	2007-12-13 17:37:34.000000000 -0500
 @@ -142,3 +142,20 @@
  
  	allow $1 swapfile_t:file getattr;
@@ -11494,7 +11527,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.2.4/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-10-12 08:56:08.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/fstools.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/fstools.te	2007-12-13 17:37:34.000000000 -0500
 @@ -109,8 +109,7 @@
  
  term_use_console(fsadm_t)
@@ -11513,7 +11546,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.2.4/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2007-10-12 08:56:08.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/getty.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/getty.te	2007-12-13 17:37:34.000000000 -0500
 @@ -33,7 +33,8 @@
  #
  
@@ -11526,7 +11559,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.
  allow getty_t self:fifo_file rw_fifo_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.2.4/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2007-01-02 12:57:49.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/hostname.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/hostname.te	2007-12-13 17:37:34.000000000 -0500
 @@ -8,7 +8,9 @@
  
  type hostname_t;
@@ -11552,7 +11585,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostna
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-3.2.4/policy/modules/system/hotplug.te
 --- nsaserefpolicy/policy/modules/system/hotplug.te	2007-10-12 08:56:08.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/hotplug.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/hotplug.te	2007-12-13 17:37:34.000000000 -0500
 @@ -179,6 +179,7 @@
  	sysnet_read_dhcpc_pid(hotplug_t)
  	sysnet_rw_dhcp_config(hotplug_t)
@@ -11563,7 +11596,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplu
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.2.4/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/init.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/init.if	2007-12-13 17:37:34.000000000 -0500
 @@ -211,6 +211,13 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -11835,7 +11868,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.2.4/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/init.te	2007-12-13 14:23:31.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/init.te	2007-12-13 17:37:34.000000000 -0500
 @@ -10,6 +10,20 @@
  # Declarations
  #
@@ -12014,7 +12047,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.2.4/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/ipsec.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/ipsec.te	2007-12-13 17:37:34.000000000 -0500
 @@ -302,6 +302,7 @@
  corenet_all_recvfrom_unlabeled(racoon_t)
  corenet_tcp_bind_all_nodes(racoon_t)
@@ -12023,9 +12056,21 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.
  
  dev_read_urand(racoon_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.2.4/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2007-12-12 11:35:28.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/libraries.fc	2007-12-17 11:23:08.000000000 -0500
+@@ -292,6 +292,8 @@
+ #
+ # /var
+ #
++/var/cache/ldconfig(/.*)?		    	gen_context(system_u:object_r:ldconfig_cache_t,s0)
++
+ /var/ftp/lib(64)?(/.*)?				gen_context(system_u:object_r:lib_t,s0)
+ /var/ftp/lib(64)?/ld[^/]*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:ld_so_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.2.4/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/libraries.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/libraries.te	2007-12-13 17:37:34.000000000 -0500
 @@ -23,6 +23,9 @@
  init_system_domain(ldconfig_t,ldconfig_exec_t)
  role system_r types ldconfig_t;
@@ -12080,7 +12125,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.2.4/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-10-29 07:52:50.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/locallogin.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/locallogin.te	2007-12-13 17:37:34.000000000 -0500
 @@ -131,6 +131,7 @@
  
  miscfiles_read_localization(local_login_t)
@@ -12112,7 +12157,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locall
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.2.4/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/logging.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/logging.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -42,7 +42,7 @@
  ')
  
@@ -12131,7 +12176,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +/etc/rc\.d/init\.d/auditd	--	gen_context(system_u:object_r:auditd_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.2.4/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/logging.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/logging.if	2007-12-13 17:37:34.000000000 -0500
 @@ -400,25 +400,6 @@
  
  ########################################
@@ -12256,7 +12301,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.2.4/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/logging.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/logging.te	2007-12-13 17:37:34.000000000 -0500
 @@ -61,6 +61,12 @@
  logging_log_file(var_log_t)
  files_mountpoint(var_log_t)
@@ -12280,7 +12325,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.2.4/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/lvm.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/lvm.te	2007-12-13 17:37:34.000000000 -0500
 @@ -44,9 +44,9 @@
  # Cluster LVM daemon local policy
  #
@@ -12428,7 +12473,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/modutils.if serefpolicy-3.2.4/policy/modules/system/modutils.if
 --- nsaserefpolicy/policy/modules/system/modutils.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/modutils.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/modutils.if	2007-12-13 17:37:34.000000000 -0500
 @@ -66,6 +66,25 @@
  
  ########################################
@@ -12457,7 +12502,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/moduti
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.2.4/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-10-12 08:56:08.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/modutils.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/modutils.te	2007-12-13 17:37:34.000000000 -0500
 @@ -42,7 +42,7 @@
  # insmod local policy
  #
@@ -12562,7 +12607,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.2.4/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/mount.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/mount.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,3 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -12571,7 +12616,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.2.4/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/mount.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/mount.te	2007-12-13 17:37:34.000000000 -0500
 @@ -8,7 +8,7 @@
  
  ## <desc>
@@ -12684,7 +12729,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.2.4/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-10-12 08:56:08.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/raid.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/raid.te	2007-12-13 17:37:34.000000000 -0500
 @@ -19,7 +19,7 @@
  # Local policy
  #
@@ -12712,7 +12757,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.2.4/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2007-05-18 11:12:44.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/selinuxutil.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/selinuxutil.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -38,7 +38,7 @@
  /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)
@@ -12724,7 +12769,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.2.4/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-11-29 13:29:35.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/selinuxutil.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/selinuxutil.if	2007-12-17 13:42:30.000000000 -0500
 @@ -215,8 +215,6 @@
  	seutil_domtrans_newrole($1)
  	role $2 types newrole_t;
@@ -12856,8 +12901,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
 +	')
 +
 +	seutil_domtrans_setsebool($1)
-+	role $2 types semanage_t;
-+	allow semanage_t $3:chr_file rw_term_perms;
++	role $2 types setsebool_t;
++	allow setsebool_t $3:chr_file rw_term_perms;
 +')
 +
 +########################################
@@ -13008,7 +13053,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.2.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-11-29 13:29:35.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/selinuxutil.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/selinuxutil.te	2007-12-13 17:37:34.000000000 -0500
 @@ -75,7 +75,6 @@
  type restorecond_exec_t;
  init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -13273,7 +13318,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.2.4/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2007-07-16 14:09:49.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/sysnetwork.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/sysnetwork.if	2007-12-13 17:37:34.000000000 -0500
 @@ -145,6 +145,25 @@
  
  ########################################
@@ -13346,7 +13391,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.2.4/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/sysnetwork.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/sysnetwork.te	2007-12-13 17:37:34.000000000 -0500
 @@ -45,7 +45,7 @@
  dontaudit dhcpc_t self:capability sys_tty_config;
  # for access("/etc/bashrc", X_OK) on Red Hat
@@ -13479,7 +13524,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.2.4/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/udev.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/udev.te	2007-12-13 17:37:34.000000000 -0500
 @@ -96,9 +96,6 @@
  dev_delete_generic_files(udev_t)
  dev_search_usbfs(udev_t)
@@ -13500,7 +13545,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.fc serefpolicy-3.2.4/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/unconfined.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/unconfined.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -10,7 +10,11 @@
  /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  
@@ -13516,7 +13561,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
 +/usr/sbin/sysreport	 	    --	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.2.4/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-11-16 15:30:49.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/unconfined.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/unconfined.if	2007-12-13 17:37:34.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -13766,7 +13811,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.2.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/unconfined.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/unconfined.te	2007-12-17 17:05:56.000000000 -0500
 @@ -9,32 +9,48 @@
  # usage in this module of types created by these
  # calls is not correct, however we dont currently
@@ -13847,17 +13892,23 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
  	unconfined_domain(httpd_unconfined_script_t)
  ')
  
-@@ -71,8 +90,8 @@
- 
- optional_policy(`
- 	cron_per_role_template(unconfined, unconfined_t, unconfined_r)
--	# this is disallowed usage:
--	unconfined_domain(unconfined_crond_t)
-+	unconfined_domain(unconfined_crontab_t)
-+	role system_r types unconfined_crontab_t;
+@@ -69,11 +88,11 @@
+ 	bootloader_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
  ')
  
+-optional_policy(`
+-	cron_per_role_template(unconfined, unconfined_t, unconfined_r)
+-	# this is disallowed usage:
+-	unconfined_domain(unconfined_crond_t)
+-')
++#optional_policy(`
++#	cron_per_role_template(unconfined, unconfined_t, unconfined_r)
++#	unconfined_domain(unconfined_crontab_t)
++#	role system_r types unconfined_crontab_t;
++#')
+ 
  optional_policy(`
+ 	init_dbus_chat_script(unconfined_t)
 @@ -107,6 +126,10 @@
  	optional_policy(`
  		oddjob_dbus_chat(unconfined_t)
@@ -13941,10 +13992,9 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
  optional_policy(`
 -	wine_domtrans(unconfined_t)
 +	wine_run(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
- ')
- 
- optional_policy(`
--	xserver_domtrans_xdm_xserver(unconfined_t)
++')
++
++optional_policy(`
 +	mozilla_per_role_template(unconfined, unconfined_t, unconfined_r)
 +	unconfined_domain(unconfined_mozilla_t)
 +	allow unconfined_mozilla_t self:process { execstack execmem };
@@ -13952,9 +14002,10 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
 +
 +optional_policy(`
 +	kismet_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t })
-+')
-+
-+optional_policy(`
+ ')
+ 
+ optional_policy(`
+-	xserver_domtrans_xdm_xserver(unconfined_t)
 +	xserver_run_xdm_xserver(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t })
 +	xserver_xdm_rw_shm(unconfined_t)
  ')
@@ -13998,7 +14049,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
 +domtrans_pattern(unconfined_t, unconfined_notrans_exec_t, unconfined_notrans_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.2.4/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/userdomain.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/userdomain.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -14011,7 +14062,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.2.4/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-11-29 13:29:35.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/userdomain.if	2007-12-13 16:45:56.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/userdomain.if	2007-12-17 16:38:26.000000000 -0500
 @@ -29,8 +29,9 @@
  	')
  
@@ -15917,7 +15968,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
  ##	Read and write unprivileged user ttys.
  ## </summary>
  ## <param name="domain">
-@@ -5668,6 +5839,24 @@
+@@ -5668,6 +5839,42 @@
  
  ########################################
  ## <summary>
@@ -15938,11 +15989,29 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +')
 +
 +########################################
++## <summary>
++##	dontaudit search keys for all user domains.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_search_all_users_keys',`
++	gen_require(`
++		attribute userdomain;
++	')
++
++	dontaudit $1 userdomain:key search;
++')
++
++########################################
 +## <summary>
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5698,3 +5887,277 @@
+@@ -5698,3 +5905,277 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -16222,7 +16291,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.2.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/userdomain.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/userdomain.te	2007-12-13 17:37:34.000000000 -0500
 @@ -17,20 +17,13 @@
  
  ## <desc>
@@ -16398,12 +16467,12 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.fc serefpolicy-3.2.4/policy/modules/system/virt.fc
 --- nsaserefpolicy/policy/modules/system/virt.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/virt.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/virt.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +/var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.if serefpolicy-3.2.4/policy/modules/system/virt.if
 --- nsaserefpolicy/policy/modules/system/virt.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/virt.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/virt.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,78 @@
 +## <summary>Virtualization </summary>
 +
@@ -16485,14 +16554,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.i
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.te serefpolicy-3.2.4/policy/modules/system/virt.te
 --- nsaserefpolicy/policy/modules/system/virt.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/system/virt.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/virt.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,3 @@
 +# var/lib files
 +type virt_var_lib_t;
 +files_type(virt_var_lib_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.2.4/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2007-06-21 09:32:04.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/xen.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/xen.if	2007-12-13 17:37:34.000000000 -0500
 @@ -191,3 +191,24 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
@@ -16520,7 +16589,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.2.4/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-10-12 08:56:08.000000000 -0400
-+++ serefpolicy-3.2.4/policy/modules/system/xen.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/system/xen.te	2007-12-13 17:37:34.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -16707,17 +16776,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.2.4/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/guest.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/guest.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +# No guest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.2.4/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/guest.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/guest.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.2.4/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/guest.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/guest.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,4 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -16725,17 +16794,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.t
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.2.4/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/logadm.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/logadm.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +# No logadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.2.4/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/logadm.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/logadm.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +## <summary>Policy for logadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.2.4/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/logadm.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/logadm.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -16750,22 +16819,22 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.
 +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.2.4/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/metadata.xml	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/metadata.xml	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +<summary>Policy modules for users</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.2.4/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/webadm.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/webadm.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +# No webadm file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.2.4/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/webadm.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/webadm.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +## <summary>Policy for webadm user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.2.4/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/webadm.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/webadm.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,42 @@
 +policy_module(webadm,1.0.0)
 +
@@ -16811,17 +16880,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.
 +allow webadm_t gadmin_t:dir getattr;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.2.4/policy/modules/users/xguest.fc
 --- nsaserefpolicy/policy/modules/users/xguest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/xguest.fc	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/xguest.fc	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +# No xguest file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.2.4/policy/modules/users/xguest.if
 --- nsaserefpolicy/policy/modules/users/xguest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/xguest.if	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/xguest.if	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1 @@
 +## <summary>Policy for xguest user</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.2.4/policy/modules/users/xguest.te
 --- nsaserefpolicy/policy/modules/users/xguest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.2.4/policy/modules/users/xguest.te	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/modules/users/xguest.te	2007-12-13 17:37:34.000000000 -0500
 @@ -0,0 +1,55 @@
 +policy_module(xguest,1.0.1)
 +
@@ -16880,7 +16949,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.2.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/support/obj_perm_sets.spt	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/support/obj_perm_sets.spt	2007-12-13 17:37:34.000000000 -0500
 @@ -204,7 +204,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -16906,7 +16975,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.2.4/policy/users
 --- nsaserefpolicy/policy/users	2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.2.4/policy/users	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/policy/users	2007-12-13 17:37:34.000000000 -0500
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -16943,7 +17012,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.2
 +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.2.4/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-10-02 09:54:53.000000000 -0400
-+++ serefpolicy-3.2.4/Rules.modular	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/Rules.modular	2007-12-13 17:37:34.000000000 -0500
 @@ -74,8 +74,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -16975,7 +17044,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.2.4/Rules.monolithic
 --- nsaserefpolicy/Rules.monolithic	2007-11-20 06:55:20.000000000 -0500
-+++ serefpolicy-3.2.4/Rules.monolithic	2007-12-13 13:34:37.000000000 -0500
++++ serefpolicy-3.2.4/Rules.monolithic	2007-12-13 17:37:34.000000000 -0500
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 28c20693..68070417 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -302,16 +302,18 @@ fi
 exit 0
 
 
-%triggerpostun targeted -- selinux-policy-targeted < 3.0.8-44-1
-semanage user -m -r s0-s0:c0.c1023 unconfined_u 2> /dev/null
-exit 0
-
-%triggerpostun targeted -- selinux-policy-targeted < 3.0.8-14-1
+%triggerpostun targeted -- selinux-policy-targeted < 3.2.4-3.fc9
 setsebool -P use_nfs_home_dirs=1
-semanage login -m -s "system_u" __default__ 2> /dev/null
-semanage user -a -P unconfined -R "unconfined_r system_r" unconfined_u 2> /dev/null
-semanage user -a -P guest -R guest_r guest_u 2> /dev/null 
-semanage user -a -P xguest -R xguest_r xguest_u 2> /dev/null
+semanage user -l | grep -s unconfined_u 
+if [ $? == 0 ]; then
+   semanage user -m -P unconfined -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u  2> /dev/null
+else
+   semanage user -a -P unconfined -R "unconfined_r system_r" -r s0-s0:c0.c1023 unconfined_u  2> /dev/null
+fi
+seuser=`semanage login -l | grep __default__ | awk '{ print $2 }'`
+[ $seuser == "system_u" ]   && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 __default__
+seuser=`semanage login -l | grep root | awk '{ print $2 }'`
+[ $seuser == "system_u" ]   && semanage login -m -s "unconfined_u"  -r s0-s0:c0.c1023 root
 restorecon -R /root /etc/selinux/targeted 2> /dev/null
 exit 0
 
@@ -380,6 +382,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Dec 17 2007 Dan Walsh <dwalsh@redhat.com> 3.2.4-3
+- Modify default login to unconfined_u
+
 * Thu Dec 13 2007 Dan Walsh <dwalsh@redhat.com> 3.2.4-1
 - Dontaudit dbus user client search of /root