diff --git a/Makefile.devel b/Makefile.devel
index 354624d..ccd143a 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -10,13 +10,14 @@ ifeq ($(MLSENABLED),)
endif
ifeq ($(MLSENABLED),1)
- TYPE ?= mcs
+ NTYPE = mcs
endif
-ifeq ($(NAME), mls)
- TYPE ?= mls
+ifeq ($(NAME),mls)
+ NTYPE = mls
endif
+TYPE ?= $(NTYPE)
+
HEADERDIR := $(SHAREDIR)/devel/include
include $(HEADERDIR)/Makefile
-
diff --git a/policy-20071130.patch b/policy-20071130.patch
index 971e560..bdd1c14 100644
--- a/policy-20071130.patch
+++ b/policy-20071130.patch
@@ -1,6 +1,6 @@
diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.3.1/Changelog
--- nsaserefpolicy/Changelog 2008-02-19 17:24:26.000000000 -0500
-+++ serefpolicy-3.3.1/Changelog 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/Changelog 2008-02-26 08:29:22.000000000 -0500
@@ -1,6 +1,3 @@
-- Pam and samba updates from Stefan Schulze Frielinghaus.
-- Backup update on Debian from Vaclav Ovsik.
@@ -10,13 +10,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.3.1/
- Labeled networking peer object class updates.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context
--- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context 2008-02-26 08:29:22.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.3.1/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.3.1/config/appconfig-mcs/guest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts 2008-02-26 08:29:22.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
@@ -24,7 +24,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u
+system_r:crond_t:s0 guest_r:guest_crond_t:s0
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts 2008-02-26 08:29:22.000000000 -0500
@@ -1,11 +1,7 @@
system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -40,7 +40,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_de
+system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.3.1/config/appconfig-mcs/seusers
--- nsaserefpolicy/config/appconfig-mcs/seusers 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/seusers 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/seusers 2008-02-26 08:29:22.000000000 -0500
@@ -1,3 +1,3 @@
system_u:system_u:s0-mcs_systemhigh
root:root:s0-mcs_systemhigh
@@ -48,7 +48,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.3.1/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.3.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-02-26 08:29:22.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
@@ -61,13 +61,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.3.1/config/appconfig-mcs/userhelper_context
--- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context 2008-02-26 08:29:22.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/x_contexts serefpolicy-3.3.1/config/appconfig-mcs/x_contexts
--- nsaserefpolicy/config/appconfig-mcs/x_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,188 @@
+#
+# Config file for XSELinux extension
@@ -259,7 +259,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_conte
+event * system_u:object_r:default_xevent_t:s0
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.1/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.3.1/config/appconfig-mcs/xguest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts 2008-02-26 08:29:22.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
@@ -268,7 +268,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.3.1/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.3.1/config/appconfig-mls/guest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts 2008-02-26 08:29:22.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
@@ -276,7 +276,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u
+system_r:crond_t:s0 guest_r:guest_crond_t:s0
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.1/config/appconfig-mls/x_contexts
--- nsaserefpolicy/config/appconfig-mls/x_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,188 @@
+#
+# Config file for XSELinux extension
@@ -468,7 +468,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_conte
+event * system_u:object_r:default_xevent_t:s0
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.1/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.3.1/config/appconfig-standard/guest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,4 @@
+system_r:local_login_t guest_r:guest_t
+system_r:remote_login_t guest_r:guest_t
@@ -476,7 +476,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/root_default_contexts serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts
--- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts 2008-02-26 08:29:22.000000000 -0500
@@ -1,11 +1,7 @@
system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -492,7 +492,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/ro
+system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.1/config/appconfig-standard/x_contexts
--- nsaserefpolicy/config/appconfig-standard/x_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,188 @@
+#
+# Config file for XSELinux extension
@@ -684,7 +684,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_
+event * system_u:object_r:default_xevent_t
diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.1/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.3.1/config/appconfig-standard/xguest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,5 @@
+system_r:local_login_t xguest_r:xguest_t
+system_r:remote_login_t xguest_r:xguest_t
@@ -693,7 +693,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.3.1/Makefile
--- nsaserefpolicy/Makefile 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/Makefile 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/Makefile 2008-02-26 08:29:22.000000000 -0500
@@ -235,7 +235,7 @@
appdir := $(contextpath)
user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -738,7 +738,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/M
# create-base-per-role-tmpl modulenames,outputfile
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.3.1/policy/flask/access_vectors
--- nsaserefpolicy/policy/flask/access_vectors 2008-02-15 09:52:54.000000000 -0500
-+++ serefpolicy-3.3.1/policy/flask/access_vectors 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/flask/access_vectors 2008-02-26 08:29:22.000000000 -0500
@@ -407,141 +407,159 @@
#
# SE-X Windows stuff
@@ -973,7 +973,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors
#
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-3.3.1/policy/flask/security_classes
--- nsaserefpolicy/policy/flask/security_classes 2008-02-15 09:52:54.000000000 -0500
-+++ serefpolicy-3.3.1/policy/flask/security_classes 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/flask/security_classes 2008-02-26 08:29:22.000000000 -0500
@@ -50,21 +50,19 @@
# passwd/chfn/chsh
class passwd # userspace
@@ -1021,7 +1021,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classe
# FLASK
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.3.1/policy/global_tunables
--- nsaserefpolicy/policy/global_tunables 2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.3.1/policy/global_tunables 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/global_tunables 2008-02-26 08:29:22.000000000 -0500
@@ -34,7 +34,7 @@
## <desc>
@@ -1062,7 +1062,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables seref
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.3.1/policy/mls
--- nsaserefpolicy/policy/mls 2008-02-01 09:12:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/mls 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/mls 2008-02-26 08:29:22.000000000 -0500
@@ -371,78 +371,53 @@
@@ -1344,7 +1344,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.3.1
#
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.3.1/policy/modules/admin/anaconda.te
--- nsaserefpolicy/policy/modules/admin/anaconda.te 2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/anaconda.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/anaconda.te 2008-02-26 08:29:22.000000000 -0500
@@ -31,16 +31,13 @@
modutils_domtrans_insmod(anaconda_t)
@@ -1365,7 +1365,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anacond
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.3.1/policy/modules/admin/consoletype.te
--- nsaserefpolicy/policy/modules/admin/consoletype.te 2008-02-18 14:30:19.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/consoletype.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/consoletype.te 2008-02-26 08:29:22.000000000 -0500
@@ -8,9 +8,11 @@
type consoletype_t;
@@ -1391,7 +1391,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/console
init_use_fds(consoletype_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-3.3.1/policy/modules/admin/firstboot.if
--- nsaserefpolicy/policy/modules/admin/firstboot.if 2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/firstboot.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/firstboot.if 2008-02-26 08:29:22.000000000 -0500
@@ -141,4 +141,6 @@
')
@@ -1401,7 +1401,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstbo
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.3.1/policy/modules/admin/firstboot.te
--- nsaserefpolicy/policy/modules/admin/firstboot.te 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/firstboot.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/firstboot.te 2008-02-26 08:29:22.000000000 -0500
@@ -120,6 +120,10 @@
usermanage_domtrans_admin_passwd(firstboot_t)
')
@@ -1423,7 +1423,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.3.1/policy/modules/admin/kismet.fc
--- nsaserefpolicy/policy/modules/admin/kismet.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/kismet.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/kismet.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,5 @@
+
+/usr/bin/kismet -- gen_context(system_u:object_r:kismet_exec_t,s0)
@@ -1432,7 +1432,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.3.1/policy/modules/admin/kismet.if
--- nsaserefpolicy/policy/modules/admin/kismet.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/kismet.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/kismet.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,275 @@
+
+## <summary>policy for kismet</summary>
@@ -1711,7 +1711,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.3.1/policy/modules/admin/kismet.te
--- nsaserefpolicy/policy/modules/admin/kismet.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/kismet.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/kismet.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,55 @@
+
+policy_module(kismet,1.0.0)
@@ -1770,7 +1770,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.3.1/policy/modules/admin/kudzu.te
--- nsaserefpolicy/policy/modules/admin/kudzu.te 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/kudzu.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/kudzu.te 2008-02-26 08:29:22.000000000 -0500
@@ -21,8 +21,8 @@
# Local policy
#
@@ -1831,7 +1831,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.3.1/policy/modules/admin/logrotate.te
--- nsaserefpolicy/policy/modules/admin/logrotate.te 2008-02-19 17:24:26.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/logrotate.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/logrotate.te 2008-02-26 08:29:22.000000000 -0500
@@ -96,9 +96,11 @@
files_read_etc_files(logrotate_t)
files_read_etc_runtime_files(logrotate_t)
@@ -1846,7 +1846,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrota
init_domtrans_script(logrotate_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.3.1/policy/modules/admin/logwatch.te
--- nsaserefpolicy/policy/modules/admin/logwatch.te 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/logwatch.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/logwatch.te 2008-02-26 08:29:22.000000000 -0500
@@ -59,10 +59,9 @@
files_read_usr_files(logwatch_t)
files_search_spool(logwatch_t)
@@ -1878,7 +1878,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.3.1/policy/modules/admin/netutils.te
--- nsaserefpolicy/policy/modules/admin/netutils.te 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/netutils.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/netutils.te 2008-02-26 08:29:22.000000000 -0500
@@ -94,6 +94,10 @@
')
@@ -1907,7 +1907,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.3.1/policy/modules/admin/prelink.te
--- nsaserefpolicy/policy/modules/admin/prelink.te 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/prelink.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/prelink.te 2008-02-26 08:29:22.000000000 -0500
@@ -26,7 +26,7 @@
# Local policy
#
@@ -1967,7 +1967,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.3.1/policy/modules/admin/rpm.fc
--- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/rpm.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/rpm.fc 2008-02-26 08:29:22.000000000 -0500
@@ -11,6 +11,7 @@
/usr/sbin/system-install-packages -- gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -1996,7 +1996,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc
ifdef(`distro_suse', `
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.3.1/policy/modules/admin/rpm.if
--- nsaserefpolicy/policy/modules/admin/rpm.if 2007-05-18 11:12:44.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/rpm.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/rpm.if 2008-02-26 08:29:22.000000000 -0500
@@ -152,6 +152,24 @@
########################################
@@ -2265,7 +2265,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.3.1/policy/modules/admin/rpm.te
--- nsaserefpolicy/policy/modules/admin/rpm.te 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/rpm.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/rpm.te 2008-02-26 08:29:22.000000000 -0500
@@ -31,6 +31,9 @@
files_type(rpm_var_lib_t)
typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -2340,7 +2340,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.3.1/policy/modules/admin/sudo.if
--- nsaserefpolicy/policy/modules/admin/sudo.if 2007-12-04 11:02:51.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/sudo.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/sudo.if 2008-02-26 08:29:22.000000000 -0500
@@ -55,7 +55,7 @@
#
@@ -2441,7 +2441,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.3.1/policy/modules/admin/su.if
--- nsaserefpolicy/policy/modules/admin/su.if 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/su.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/su.if 2008-02-26 08:29:22.000000000 -0500
@@ -41,15 +41,13 @@
allow $2 $1_su_t:process signal;
@@ -2569,7 +2569,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.3.1/policy/modules/admin/tmpreaper.te
--- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2007-10-02 09:54:52.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/tmpreaper.te 2008-02-26 08:29:22.000000000 -0500
@@ -28,6 +28,7 @@
files_purge_tmp(tmpreaper_t)
# why does it need setattr?
@@ -2600,7 +2600,7 @@ 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.3.1/policy/modules/admin/usermanage.te
--- nsaserefpolicy/policy/modules/admin/usermanage.te 2008-02-19 17:24:26.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/usermanage.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/usermanage.te 2008-02-26 08:29:22.000000000 -0500
@@ -97,6 +97,7 @@
# allow checking if a shell is executable
@@ -2656,7 +2656,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.te serefpolicy-3.3.1/policy/modules/admin/vpn.te
--- nsaserefpolicy/policy/modules/admin/vpn.te 2008-02-18 14:30:19.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/admin/vpn.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/admin/vpn.te 2008-02-26 08:29:22.000000000 -0500
@@ -24,7 +24,8 @@
allow vpnc_t self:capability { dac_override net_admin ipc_lock net_raw };
@@ -2669,7 +2669,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te
allow vpnc_t self:rawip_socket create_socket_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.fc serefpolicy-3.3.1/policy/modules/apps/ethereal.fc
--- nsaserefpolicy/policy/modules/apps/ethereal.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/ethereal.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/ethereal.fc 2008-02-26 08:29:22.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)
@@ -2678,7 +2678,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.3.1/policy/modules/apps/ethereal.if
--- nsaserefpolicy/policy/modules/apps/ethereal.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/ethereal.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/ethereal.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,6 +35,7 @@
template(`ethereal_per_role_template',`
@@ -2736,7 +2736,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.3.1/policy/modules/apps/ethereal.te
--- nsaserefpolicy/policy/modules/apps/ethereal.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/ethereal.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/ethereal.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,13 @@
type tethereal_tmp_t;
files_tmp_file(tethereal_tmp_t)
@@ -2753,7 +2753,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.3.1/policy/modules/apps/evolution.fc
--- nsaserefpolicy/policy/modules/apps/evolution.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/evolution.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/evolution.fc 2008-02-26 08:29:22.000000000 -0500
@@ -2,13 +2,13 @@
# HOME_DIR/
#
@@ -2773,7 +2773,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/evolution.if serefpolicy-3.3.1/policy/modules/apps/evolution.if
--- nsaserefpolicy/policy/modules/apps/evolution.if 2007-10-29 07:52:48.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/evolution.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/evolution.if 2008-02-26 08:29:22.000000000 -0500
@@ -247,7 +247,7 @@
mta_read_config($1_evolution_t)
@@ -2812,7 +2812,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolutio
nscd_socket_use($1_evolution_webcal_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.3.1/policy/modules/apps/games.if
--- nsaserefpolicy/policy/modules/apps/games.if 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/games.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/games.if 2008-02-26 08:29:22.000000000 -0500
@@ -146,7 +146,7 @@
')
@@ -2824,7 +2824,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gift.fc serefpolicy-3.3.1/policy/modules/apps/gift.fc
--- nsaserefpolicy/policy/modules/apps/gift.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/gift.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gift.fc 2008-02-26 08:29:22.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)
@@ -2833,7 +2833,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.3.1/policy/modules/apps/gift.if
--- nsaserefpolicy/policy/modules/apps/gift.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/gift.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gift.if 2008-02-26 08:29:22.000000000 -0500
@@ -43,9 +43,9 @@
application_domain($1_gift_t,gift_exec_t)
role $3 types $1_gift_t;
@@ -2907,7 +2907,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.3.1/policy/modules/apps/gift.te
--- nsaserefpolicy/policy/modules/apps/gift.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/gift.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gift.te 2008-02-26 08:29:22.000000000 -0500
@@ -11,3 +11,7 @@
type giftd_exec_t;
@@ -2918,7 +2918,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.3.1/policy/modules/apps/gnome.fc
--- nsaserefpolicy/policy/modules/apps/gnome.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/gnome.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gnome.fc 2008-02-26 08:29:22.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)
@@ -2934,7 +2934,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.3.1/policy/modules/apps/gnome.if
--- nsaserefpolicy/policy/modules/apps/gnome.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/gnome.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gnome.if 2008-02-26 08:29:22.000000000 -0500
@@ -33,9 +33,60 @@
## </param>
#
@@ -3167,7 +3167,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.3.1/policy/modules/apps/gnome.te
--- nsaserefpolicy/policy/modules/apps/gnome.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/gnome.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gnome.te 2008-02-26 08:29:22.000000000 -0500
@@ -8,8 +8,19 @@
attribute gnomedomain;
@@ -3193,7 +3193,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te
+typealias user_gconf_tmp_t alias unconfined_gconf_tmp_t;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.3.1/policy/modules/apps/gpg.fc
--- nsaserefpolicy/policy/modules/apps/gpg.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/gpg.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gpg.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,9 +1,9 @@
-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)
@@ -3210,7 +3210,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc s
+/usr/lib(64)?/gnupg/gpgkeys.* -- gen_context(system_u:object_r:gpg_helper_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.3.1/policy/modules/apps/gpg.if
--- nsaserefpolicy/policy/modules/apps/gpg.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/gpg.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gpg.if 2008-02-26 08:29:22.000000000 -0500
@@ -38,6 +38,10 @@
gen_require(`
type gpg_exec_t, gpg_helper_exec_t;
@@ -3531,7 +3531,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if s
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.3.1/policy/modules/apps/gpg.te
--- nsaserefpolicy/policy/modules/apps/gpg.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/gpg.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/gpg.te 2008-02-26 08:29:22.000000000 -0500
@@ -7,15 +7,228 @@
#
@@ -3767,7 +3767,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te s
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/irc.fc serefpolicy-3.3.1/policy/modules/apps/irc.fc
--- nsaserefpolicy/policy/modules/apps/irc.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/irc.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/irc.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,7 +1,7 @@
#
# /home
@@ -3779,7 +3779,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.3.1/policy/modules/apps/irc.if
--- nsaserefpolicy/policy/modules/apps/irc.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/irc.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/irc.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,6 +35,7 @@
template(`irc_per_role_template',`
gen_require(`
@@ -3836,7 +3836,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.3.1/policy/modules/apps/irc.te
--- nsaserefpolicy/policy/modules/apps/irc.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/irc.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/irc.te 2008-02-26 08:29:22.000000000 -0500
@@ -8,3 +8,10 @@
type irc_exec_t;
@@ -3850,7 +3850,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.3.1/policy/modules/apps/java.fc
--- nsaserefpolicy/policy/modules/apps/java.fc 2007-03-01 10:01:48.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/java.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/java.fc 2008-02-26 08:29:22.000000000 -0500
@@ -11,6 +11,7 @@
#
/usr/(.*/)?bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0)
@@ -3878,7 +3878,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.3.1/policy/modules/apps/java.if
--- nsaserefpolicy/policy/modules/apps/java.if 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/java.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/java.if 2008-02-26 08:29:22.000000000 -0500
@@ -32,7 +32,7 @@
## </summary>
## </param>
@@ -4113,7 +4113,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.3.1/policy/modules/apps/java.te
--- nsaserefpolicy/policy/modules/apps/java.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/java.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/java.te 2008-02-26 08:29:22.000000000 -0500
@@ -6,16 +6,10 @@
# Declarations
#
@@ -4161,7 +4161,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.3.1/policy/modules/apps/loadkeys.te
--- nsaserefpolicy/policy/modules/apps/loadkeys.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/loadkeys.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/loadkeys.te 2008-02-26 08:29:22.000000000 -0500
@@ -44,3 +44,5 @@
optional_policy(`
nscd_dontaudit_search_pid(loadkeys_t)
@@ -4170,7 +4170,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.3.1/policy/modules/apps/mono.if
--- nsaserefpolicy/policy/modules/apps/mono.if 2007-01-02 12:57:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/mono.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mono.if 2008-02-26 08:29:22.000000000 -0500
@@ -18,3 +18,109 @@
corecmd_search_bin($1)
domtrans_pattern($1, mono_exec_t, mono_t)
@@ -4283,7 +4283,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.3.1/policy/modules/apps/mono.te
--- nsaserefpolicy/policy/modules/apps/mono.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/mono.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mono.te 2008-02-26 08:29:22.000000000 -0500
@@ -15,7 +15,7 @@
# Local policy
#
@@ -4303,7 +4303,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.3.1/policy/modules/apps/mozilla.fc
--- nsaserefpolicy/policy/modules/apps/mozilla.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/mozilla.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mozilla.fc 2008-02-26 08:29:22.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)
@@ -4320,7 +4320,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.3.1/policy/modules/apps/mozilla.if
--- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-10-29 07:52:48.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mozilla.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,7 +35,10 @@
template(`mozilla_per_role_template',`
gen_require(`
@@ -4763,7 +4763,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.3.1/policy/modules/apps/mozilla.te
--- nsaserefpolicy/policy/modules/apps/mozilla.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/mozilla.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mozilla.te 2008-02-26 08:29:22.000000000 -0500
@@ -6,15 +6,15 @@
# Declarations
#
@@ -4789,7 +4789,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.3.1/policy/modules/apps/mplayer.fc
--- nsaserefpolicy/policy/modules/apps/mplayer.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/mplayer.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mplayer.fc 2008-02-26 08:29:22.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)
@@ -4798,7 +4798,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.3.1/policy/modules/apps/mplayer.if
--- nsaserefpolicy/policy/modules/apps/mplayer.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/mplayer.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mplayer.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,6 +35,7 @@
template(`mplayer_per_role_template',`
gen_require(`
@@ -4898,7 +4898,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.3.1/policy/modules/apps/mplayer.te
--- nsaserefpolicy/policy/modules/apps/mplayer.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/mplayer.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/mplayer.te 2008-02-26 08:29:22.000000000 -0500
@@ -22,3 +22,7 @@
type mplayer_exec_t;
corecmd_executable_file(mplayer_exec_t)
@@ -4909,7 +4909,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.3.1/policy/modules/apps/nsplugin.fc
--- nsaserefpolicy/policy/modules/apps/nsplugin.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,7 @@
+
+/usr/lib(64)?/nspluginwrapper/npviewer.bin -- gen_context(system_u:object_r:nsplugin_exec_t,s0)
@@ -4920,7 +4920,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin
+HOME_DIR/\.macromedia(/.*)? gen_context(system_u:object_r:user_nsplugin_home_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.3.1/policy/modules/apps/nsplugin.if
--- nsaserefpolicy/policy/modules/apps/nsplugin.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,339 @@
+
+## <summary>policy for nsplugin</summary>
@@ -5263,7 +5263,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.3.1/policy/modules/apps/nsplugin.te
--- nsaserefpolicy/policy/modules/apps/nsplugin.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/nsplugin.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,149 @@
+
+policy_module(nsplugin,1.0.0)
@@ -5416,7 +5416,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin
+nsplugin_domtrans(nsplugin_config_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.3.1/policy/modules/apps/screen.fc
--- nsaserefpolicy/policy/modules/apps/screen.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/screen.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/screen.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,7 +1,7 @@
#
# /home
@@ -5428,7 +5428,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.3.1/policy/modules/apps/screen.if
--- nsaserefpolicy/policy/modules/apps/screen.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/screen.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/screen.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,6 +35,7 @@
template(`screen_per_role_template',`
gen_require(`
@@ -5483,7 +5483,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.3.1/policy/modules/apps/screen.te
--- nsaserefpolicy/policy/modules/apps/screen.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/screen.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/screen.te 2008-02-26 08:29:22.000000000 -0500
@@ -11,3 +11,7 @@
type screen_exec_t;
@@ -5494,7 +5494,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/slocate.te serefpolicy-3.3.1/policy/modules/apps/slocate.te
--- nsaserefpolicy/policy/modules/apps/slocate.te 2007-10-02 09:54:50.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/slocate.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/slocate.te 2008-02-26 08:29:22.000000000 -0500
@@ -39,6 +39,7 @@
files_list_all(locate_t)
@@ -5505,7 +5505,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.
files_read_etc_files(locate_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-3.3.1/policy/modules/apps/thunderbird.fc
--- nsaserefpolicy/policy/modules/apps/thunderbird.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/thunderbird.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/thunderbird.fc 2008-02-26 08:29:22.000000000 -0500
@@ -3,4 +3,4 @@
#
/usr/bin/thunderbird.* -- gen_context(system_u:object_r:thunderbird_exec_t,s0)
@@ -5514,7 +5514,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.3.1/policy/modules/apps/thunderbird.if
--- nsaserefpolicy/policy/modules/apps/thunderbird.if 2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/thunderbird.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/thunderbird.if 2008-02-26 08:29:22.000000000 -0500
@@ -43,9 +43,9 @@
application_domain($1_thunderbird_t,thunderbird_exec_t)
role $3 types $1_thunderbird_t;
@@ -5573,7 +5573,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderb
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.te serefpolicy-3.3.1/policy/modules/apps/thunderbird.te
--- nsaserefpolicy/policy/modules/apps/thunderbird.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/thunderbird.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/thunderbird.te 2008-02-26 08:29:22.000000000 -0500
@@ -8,3 +8,7 @@
type thunderbird_exec_t;
@@ -5584,7 +5584,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.3.1/policy/modules/apps/tvtime.if
--- nsaserefpolicy/policy/modules/apps/tvtime.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/tvtime.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/tvtime.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,6 +35,7 @@
template(`tvtime_per_role_template',`
gen_require(`
@@ -5662,7 +5662,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.i
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.te serefpolicy-3.3.1/policy/modules/apps/tvtime.te
--- nsaserefpolicy/policy/modules/apps/tvtime.te 2007-10-02 09:54:50.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/tvtime.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/tvtime.te 2008-02-26 08:29:22.000000000 -0500
@@ -11,3 +11,9 @@
type tvtime_dir_t;
@@ -5675,7 +5675,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.3.1/policy/modules/apps/uml.fc
--- nsaserefpolicy/policy/modules/apps/uml.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/uml.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/uml.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,7 +1,7 @@
#
# HOME_DIR/
@@ -5687,7 +5687,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.3.1/policy/modules/apps/userhelper.if
--- nsaserefpolicy/policy/modules/apps/userhelper.if 2007-07-23 10:20:12.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/userhelper.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/userhelper.if 2008-02-26 08:29:22.000000000 -0500
@@ -181,24 +181,6 @@
nscd_socket_use($1_userhelper_t)
')
@@ -5754,7 +5754,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelp
allow $2 $1_userhelper_t:process sigchld;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.3.1/policy/modules/apps/vmware.fc
--- nsaserefpolicy/policy/modules/apps/vmware.fc 2007-10-12 08:56:02.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/vmware.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/vmware.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,9 +1,9 @@
#
# HOME_DIR/
@@ -5805,7 +5805,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.f
+/usr/lib/vmware-tools/sbin64/vmware.* -- gen_context(system_u:object_r:vmware_host_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-3.3.1/policy/modules/apps/vmware.if
--- nsaserefpolicy/policy/modules/apps/vmware.if 2007-02-19 11:32:52.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/vmware.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/vmware.if 2008-02-26 08:29:22.000000000 -0500
@@ -164,7 +164,7 @@
sysnet_dns_name_resolve($1_vmware_t)
sysnet_read_config($1_vmware_t)
@@ -5840,7 +5840,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.3.1/policy/modules/apps/vmware.te
--- nsaserefpolicy/policy/modules/apps/vmware.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/vmware.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/vmware.te 2008-02-26 08:29:22.000000000 -0500
@@ -22,17 +22,21 @@
type vmware_var_run_t;
files_pid_file(vmware_var_run_t)
@@ -5908,7 +5908,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.t
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.3.1/policy/modules/apps/wine.if
--- nsaserefpolicy/policy/modules/apps/wine.if 2007-09-12 10:34:17.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/apps/wine.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/wine.if 2008-02-26 08:29:22.000000000 -0500
@@ -49,3 +49,53 @@
role $2 types wine_t;
allow wine_t $3:chr_file rw_term_perms;
@@ -5965,7 +5965,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.3.1/policy/modules/apps/wine.te
--- nsaserefpolicy/policy/modules/apps/wine.te 2007-12-19 05:32:09.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/apps/wine.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/apps/wine.te 2008-02-26 08:29:22.000000000 -0500
@@ -9,6 +9,7 @@
type wine_t;
type wine_exec_t;
@@ -5996,7 +5996,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.fc serefpolicy-3.3.1/policy/modules/kernel/corecommands.fc
--- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/corecommands.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/corecommands.fc 2008-02-26 08:29:22.000000000 -0500
@@ -7,11 +7,11 @@
/bin/d?ash -- gen_context(system_u:object_r:shell_exec_t,s0)
/bin/bash -- gen_context(system_u:object_r:shell_exec_t,s0)
@@ -6088,7 +6088,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.3.1/policy/modules/kernel/corecommands.if
--- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-11-14 08:17:58.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/corecommands.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/corecommands.if 2008-02-26 08:29:22.000000000 -0500
@@ -875,6 +875,7 @@
read_lnk_files_pattern($1,bin_t,bin_t)
@@ -6099,7 +6099,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/coreco
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.3.1/policy/modules/kernel/corenetwork.if.in
--- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in 2008-02-01 09:12:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.if.in 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.if.in 2008-02-26 08:29:22.000000000 -0500
@@ -1441,10 +1441,11 @@
#
interface(`corenet_tcp_bind_all_unreserved_ports',`
@@ -6129,7 +6129,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corene
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in
--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-02-01 09:12:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/corenetwork.te.in 2008-02-26 08:29:22.000000000 -0500
@@ -82,6 +82,7 @@
network_port(clockspeed, udp,4041,s0)
network_port(cluster, tcp,5149,s0, udp,5149,s0, tcp,40040,s0, tcp,50006,s0, udp,50006,s0, tcp,50007,s0, udp,50007,s0, tcp,50008,s0, udp,50008,s0)
@@ -6199,7 +6199,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corene
network_port(xen, tcp,8002,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.3.1/policy/modules/kernel/devices.fc
--- nsaserefpolicy/policy/modules/kernel/devices.fc 2007-12-12 11:35:27.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/devices.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/devices.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,7 +1,7 @@
/dev -d gen_context(system_u:object_r:device_t,s0)
@@ -6301,7 +6301,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.3.1/policy/modules/kernel/devices.if
--- nsaserefpolicy/policy/modules/kernel/devices.if 2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/devices.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/devices.if 2008-02-26 08:29:22.000000000 -0500
@@ -65,7 +65,7 @@
relabelfrom_dirs_pattern($1,device_t,device_node)
@@ -6575,7 +6575,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.3.1/policy/modules/kernel/devices.te
--- nsaserefpolicy/policy/modules/kernel/devices.te 2007-12-19 05:32:07.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/devices.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/devices.te 2008-02-26 08:29:22.000000000 -0500
@@ -32,6 +32,12 @@
type apm_bios_t;
dev_node(apm_bios_t)
@@ -6617,7 +6617,7 @@ 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.3.1/policy/modules/kernel/domain.te
--- nsaserefpolicy/policy/modules/kernel/domain.te 2007-12-19 05:32:07.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/domain.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/domain.te 2008-02-26 08:29:22.000000000 -0500
@@ -5,6 +5,13 @@
#
# Declarations
@@ -6679,7 +6679,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.3.1/policy/modules/kernel/files.if
--- nsaserefpolicy/policy/modules/kernel/files.if 2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/files.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/files.if 2008-02-26 08:29:22.000000000 -0500
@@ -1266,6 +1266,24 @@
########################################
@@ -6795,7 +6795,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.3.1/policy/modules/kernel/files.te
--- nsaserefpolicy/policy/modules/kernel/files.te 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/files.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/files.te 2008-02-26 08:29:22.000000000 -0500
@@ -55,6 +55,8 @@
# compatibility aliases for removed types:
typealias etc_t alias automount_etc_t;
@@ -6807,7 +6807,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.3.1/policy/modules/kernel/filesystem.if
--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-10-24 15:00:24.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.if 2008-02-26 08:29:22.000000000 -0500
@@ -310,6 +310,25 @@
########################################
@@ -7001,7 +7001,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.3.1/policy/modules/kernel/filesystem.te
--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2007-12-19 05:32:07.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/filesystem.te 2008-02-26 08:29:22.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);
@@ -7033,7 +7033,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesy
# iso9660_t is the type for CD filesystems
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.3.1/policy/modules/kernel/kernel.if
--- nsaserefpolicy/policy/modules/kernel/kernel.if 2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/kernel.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/kernel.if 2008-02-26 08:29:22.000000000 -0500
@@ -851,9 +851,8 @@
type proc_t, proc_afs_t;
')
@@ -7063,7 +7063,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.3.1/policy/modules/kernel/kernel.te
--- nsaserefpolicy/policy/modules/kernel/kernel.te 2007-12-19 05:32:07.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/kernel.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/kernel.te 2008-02-26 08:29:22.000000000 -0500
@@ -259,6 +259,8 @@
fs_rw_tmpfs_chr_files(kernel_t)
')
@@ -7089,7 +7089,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-3.3.1/policy/modules/kernel/mls.if
--- nsaserefpolicy/policy/modules/kernel/mls.if 2008-02-01 09:12:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/mls.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/mls.if 2008-02-26 08:29:22.000000000 -0500
@@ -612,6 +612,26 @@
########################################
## <summary>
@@ -7146,7 +7146,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if
## <param name="domain">
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.3.1/policy/modules/kernel/selinux.if
--- nsaserefpolicy/policy/modules/kernel/selinux.if 2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/selinux.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/selinux.if 2008-02-26 08:29:22.000000000 -0500
@@ -164,6 +164,7 @@
type security_t;
')
@@ -7239,7 +7239,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.3.1/policy/modules/kernel/selinux.te
--- nsaserefpolicy/policy/modules/kernel/selinux.te 2007-12-19 05:32:07.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/selinux.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/selinux.te 2008-02-26 08:29:22.000000000 -0500
@@ -10,6 +10,7 @@
attribute can_setenforce;
attribute can_setsecparam;
@@ -7262,7 +7262,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/storage.fc serefpolicy-3.3.1/policy/modules/kernel/storage.fc
--- nsaserefpolicy/policy/modules/kernel/storage.fc 2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/storage.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/storage.fc 2008-02-26 08:29:22.000000000 -0500
@@ -13,6 +13,7 @@
/dev/cm20.* -b gen_context(system_u:object_r:removable_device_t,s0)
/dev/dasd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -7273,7 +7273,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
/dev/gscd -b gen_context(system_u:object_r:removable_device_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.3.1/policy/modules/kernel/storage.if
--- nsaserefpolicy/policy/modules/kernel/storage.if 2008-02-26 08:17:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/storage.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/storage.if 2008-02-26 08:29:22.000000000 -0500
@@ -81,6 +81,26 @@
########################################
@@ -7303,7 +7303,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
## SELinux protections for filesystem objects, and
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.3.1/policy/modules/kernel/terminal.if
--- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-09-12 10:34:17.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/kernel/terminal.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/kernel/terminal.if 2008-02-26 08:29:22.000000000 -0500
@@ -525,11 +525,13 @@
interface(`term_use_generic_ptys',`
gen_require(`
@@ -7332,7 +7332,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/termin
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.if serefpolicy-3.3.1/policy/modules/services/aide.if
--- nsaserefpolicy/policy/modules/services/aide.if 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/aide.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/aide.if 2008-02-26 08:29:22.000000000 -0500
@@ -79,10 +79,12 @@
allow $1 aide_t:process { ptrace signal_perms };
@@ -7350,7 +7350,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.fc serefpolicy-3.3.1/policy/modules/services/amavis.fc
--- nsaserefpolicy/policy/modules/services/amavis.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/amavis.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/amavis.fc 2008-02-26 08:29:22.000000000 -0500
@@ -14,3 +14,5 @@
/var/run/amavis(d)?(/.*)? gen_context(system_u:object_r:amavis_var_run_t,s0)
/var/spool/amavisd(/.*)? gen_context(system_u:object_r:amavis_spool_t,s0)
@@ -7359,7 +7359,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
+/etc/rc.d/init.d/amavis -- gen_context(system_u:object_r:amavis_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-3.3.1/policy/modules/services/amavis.if
--- nsaserefpolicy/policy/modules/services/amavis.if 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/amavis.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/amavis.if 2008-02-26 08:29:22.000000000 -0500
@@ -189,6 +189,25 @@
########################################
@@ -7433,7 +7433,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.3.1/policy/modules/services/amavis.te
--- nsaserefpolicy/policy/modules/services/amavis.te 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/amavis.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/amavis.te 2008-02-26 08:29:22.000000000 -0500
@@ -38,6 +38,9 @@
type amavis_spool_t;
files_type(amavis_spool_t)
@@ -7446,7 +7446,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
# amavis local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.3.1/policy/modules/services/apache.fc
--- nsaserefpolicy/policy/modules/services/apache.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apache.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/apache.fc 2008-02-26 08:29:22.000000000 -0500
@@ -16,7 +16,6 @@
/usr/lib/apache-ssl/.+ -- gen_context(system_u:object_r:httpd_exec_t,s0)
@@ -7474,7 +7474,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.3.1/policy/modules/services/apache.if
--- nsaserefpolicy/policy/modules/services/apache.if 2007-10-23 17:17:42.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apache.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/apache.if 2008-02-26 08:29:22.000000000 -0500
@@ -18,10 +18,6 @@
attribute httpd_script_exec_type;
type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -7786,7 +7786,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.3.1/policy/modules/services/apache.te
--- nsaserefpolicy/policy/modules/services/apache.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/apache.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/apache.te 2008-02-26 08:29:22.000000000 -0500
@@ -20,6 +20,8 @@
# Declarations
#
@@ -8277,7 +8277,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apac
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.3.1/policy/modules/services/apcupsd.fc
--- nsaserefpolicy/policy/modules/services/apcupsd.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apcupsd.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/apcupsd.fc 2008-02-26 08:29:22.000000000 -0500
@@ -13,3 +13,5 @@
/var/www/apcupsd/upsfstats\.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
/var/www/apcupsd/upsimage\.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
@@ -8286,7 +8286,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
+/etc/rc.d/init.d/apcupsd -- gen_context(system_u:object_r:apcupsd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.3.1/policy/modules/services/apcupsd.if
--- nsaserefpolicy/policy/modules/services/apcupsd.if 2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/apcupsd.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/apcupsd.if 2008-02-26 08:29:22.000000000 -0500
@@ -90,10 +90,102 @@
## </summary>
## </param>
@@ -8393,7 +8393,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.3.1/policy/modules/services/apcupsd.te
--- nsaserefpolicy/policy/modules/services/apcupsd.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/apcupsd.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/apcupsd.te 2008-02-26 08:29:22.000000000 -0500
@@ -22,6 +22,9 @@
type apcupsd_var_run_t;
files_pid_file(apcupsd_var_run_t)
@@ -8418,7 +8418,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcu
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-3.3.1/policy/modules/services/apm.te
--- nsaserefpolicy/policy/modules/services/apm.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/apm.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/apm.te 2008-02-26 08:29:22.000000000 -0500
@@ -190,6 +190,10 @@
dbus_stub(apmd_t)
@@ -8432,7 +8432,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.fc serefpolicy-3.3.1/policy/modules/services/arpwatch.fc
--- nsaserefpolicy/policy/modules/services/arpwatch.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/arpwatch.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/arpwatch.fc 2008-02-26 08:29:22.000000000 -0500
@@ -9,3 +9,5 @@
#
/var/arpwatch(/.*)? gen_context(system_u:object_r:arpwatch_data_t,s0)
@@ -8441,7 +8441,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpw
+/etc/rc.d/init.d/arpwatch -- gen_context(system_u:object_r:arpwatch_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.if serefpolicy-3.3.1/policy/modules/services/arpwatch.if
--- nsaserefpolicy/policy/modules/services/arpwatch.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/arpwatch.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/arpwatch.if 2008-02-26 08:29:22.000000000 -0500
@@ -90,3 +90,73 @@
dontaudit $1 arpwatch_t:packet_socket { read write };
@@ -8518,7 +8518,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpw
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.3.1/policy/modules/services/arpwatch.te
--- nsaserefpolicy/policy/modules/services/arpwatch.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/arpwatch.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/arpwatch.te 2008-02-26 08:29:22.000000000 -0500
@@ -19,6 +19,9 @@
type arpwatch_var_run_t;
files_pid_file(arpwatch_var_run_t)
@@ -8531,7 +8531,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpw
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.fc serefpolicy-3.3.1/policy/modules/services/asterisk.fc
--- nsaserefpolicy/policy/modules/services/asterisk.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/asterisk.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/asterisk.fc 2008-02-26 08:29:22.000000000 -0500
@@ -6,3 +6,4 @@
/var/log/asterisk(/.*)? gen_context(system_u:object_r:asterisk_log_t,s0)
/var/run/asterisk(/.*)? gen_context(system_u:object_r:asterisk_var_run_t,s0)
@@ -8539,7 +8539,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aste
+/etc/rc.d/init.d/asterisk -- gen_context(system_u:object_r:asterisk_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.3.1/policy/modules/services/asterisk.if
--- nsaserefpolicy/policy/modules/services/asterisk.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/asterisk.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/asterisk.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,83 @@
## <summary>Asterisk IP telephony server</summary>
+
@@ -8626,7 +8626,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aste
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.3.1/policy/modules/services/asterisk.te
--- nsaserefpolicy/policy/modules/services/asterisk.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/asterisk.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/asterisk.te 2008-02-26 08:29:22.000000000 -0500
@@ -31,6 +31,9 @@
type asterisk_var_run_t;
files_pid_file(asterisk_var_run_t)
@@ -8639,7 +8639,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aste
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-3.3.1/policy/modules/services/automount.fc
--- nsaserefpolicy/policy/modules/services/automount.fc 2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/automount.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/automount.fc 2008-02-26 08:29:22.000000000 -0500
@@ -12,4 +12,7 @@
# /var
#
@@ -8651,7 +8651,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.if serefpolicy-3.3.1/policy/modules/services/automount.if
--- nsaserefpolicy/policy/modules/services/automount.if 2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/automount.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/automount.if 2008-02-26 08:29:22.000000000 -0500
@@ -74,3 +74,109 @@
dontaudit $1 automount_tmp_t:dir getattr;
@@ -8764,7 +8764,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.3.1/policy/modules/services/automount.te
--- nsaserefpolicy/policy/modules/services/automount.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/automount.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/automount.te 2008-02-26 08:29:22.000000000 -0500
@@ -20,6 +20,9 @@
files_tmp_file(automount_tmp_t)
files_mountpoint(automount_tmp_t)
@@ -8851,7 +8851,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/auto
optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.fc serefpolicy-3.3.1/policy/modules/services/avahi.fc
--- nsaserefpolicy/policy/modules/services/avahi.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/avahi.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/avahi.fc 2008-02-26 08:29:22.000000000 -0500
@@ -3,3 +3,7 @@
/usr/sbin/avahi-dnsconfd -- gen_context(system_u:object_r:avahi_exec_t,s0)
@@ -8862,7 +8862,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avah
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.3.1/policy/modules/services/avahi.if
--- nsaserefpolicy/policy/modules/services/avahi.if 2007-05-02 15:04:46.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/avahi.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/avahi.if 2008-02-26 08:29:22.000000000 -0500
@@ -57,3 +57,64 @@
dontaudit $1 avahi_var_run_t:dir search_dir_perms;
@@ -8930,7 +8930,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avah
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.3.1/policy/modules/services/avahi.te
--- nsaserefpolicy/policy/modules/services/avahi.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/avahi.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/avahi.te 2008-02-26 08:29:22.000000000 -0500
@@ -13,6 +13,9 @@
type avahi_var_run_t;
files_pid_file(avahi_var_run_t)
@@ -8960,7 +8960,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/bind.fc serefpolicy-3.3.1/policy/modules/services/bind.fc
--- nsaserefpolicy/policy/modules/services/bind.fc 2007-10-15 16:11:05.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/bind.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bind.fc 2008-02-26 08:29:22.000000000 -0500
@@ -49,3 +49,5 @@
/var/named/chroot/var/log/named.* -- gen_context(system_u:object_r:named_log_t,s0)
/var/named/dynamic(/.*)? gen_context(system_u:object_r:named_cache_t,s0)
@@ -8969,7 +8969,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind
+/etc/rc.d/init.d/named -- gen_context(system_u:object_r:named_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.3.1/policy/modules/services/bind.if
--- nsaserefpolicy/policy/modules/services/bind.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/bind.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bind.if 2008-02-26 08:29:22.000000000 -0500
@@ -254,3 +254,94 @@
interface(`bind_udp_chat_named',`
refpolicywarn(`$0($*) has been deprecated.')
@@ -9067,7 +9067,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.3.1/policy/modules/services/bind.te
--- nsaserefpolicy/policy/modules/services/bind.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/bind.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bind.te 2008-02-26 08:29:22.000000000 -0500
@@ -53,6 +53,9 @@
init_system_domain(ndc_t,ndc_exec_t)
role system_r types ndc_t;
@@ -9097,7 +9097,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind
domain_use_interactive_fds(ndc_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.fc serefpolicy-3.3.1/policy/modules/services/bitlbee.fc
--- nsaserefpolicy/policy/modules/services/bitlbee.fc 2007-09-17 15:56:47.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/bitlbee.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bitlbee.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,3 +1,6 @@
/usr/sbin/bitlbee -- gen_context(system_u:object_r:bitlbee_exec_t,s0)
/etc/bitlbee(/.*)? gen_context(system_u:object_r:bitlbee_conf_t,s0)
@@ -9107,7 +9107,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitl
+/etc/rc.d/init.d/bitlbee -- gen_context(system_u:object_r:bitlbee_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.if serefpolicy-3.3.1/policy/modules/services/bitlbee.if
--- nsaserefpolicy/policy/modules/services/bitlbee.if 2007-09-17 15:56:47.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/bitlbee.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bitlbee.if 2008-02-26 08:29:22.000000000 -0500
@@ -20,3 +20,70 @@
allow $1 bitlbee_conf_t:file { read getattr };
')
@@ -9181,7 +9181,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitl
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.3.1/policy/modules/services/bitlbee.te
--- nsaserefpolicy/policy/modules/services/bitlbee.te 2007-09-17 15:56:47.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/bitlbee.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bitlbee.te 2008-02-26 08:29:22.000000000 -0500
@@ -17,6 +17,9 @@
type bitlbee_var_t;
files_type(bitlbee_var_t)
@@ -9204,7 +9204,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitl
# grant read-only access to the user help files
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.3.1/policy/modules/services/bluetooth.fc
--- nsaserefpolicy/policy/modules/services/bluetooth.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/bluetooth.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bluetooth.fc 2008-02-26 08:29:22.000000000 -0500
@@ -22,3 +22,8 @@
#
/var/lib/bluetooth(/.*)? gen_context(system_u:object_r:bluetooth_var_lib_t,s0)
@@ -9216,7 +9216,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/blue
+/etc/rc.d/init.d/pand -- gen_context(system_u:object_r:bluetooth_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.3.1/policy/modules/services/bluetooth.if
--- nsaserefpolicy/policy/modules/services/bluetooth.if 2007-10-29 07:52:49.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/bluetooth.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bluetooth.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,7 +35,7 @@
template(`bluetooth_per_role_template',`
gen_require(`
@@ -9326,7 +9326,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/blue
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.3.1/policy/modules/services/bluetooth.te
--- nsaserefpolicy/policy/modules/services/bluetooth.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/bluetooth.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/bluetooth.te 2008-02-26 08:29:22.000000000 -0500
@@ -32,19 +32,22 @@
type bluetooth_var_run_t;
files_pid_file(bluetooth_var_run_t)
@@ -9387,7 +9387,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/canna.fc serefpolicy-3.3.1/policy/modules/services/canna.fc
--- nsaserefpolicy/policy/modules/services/canna.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/canna.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/canna.fc 2008-02-26 08:29:22.000000000 -0500
@@ -20,3 +20,5 @@
/var/run/\.iroha_unix -d gen_context(system_u:object_r:canna_var_run_t,s0)
/var/run/\.iroha_unix/.* -s gen_context(system_u:object_r:canna_var_run_t,s0)
@@ -9396,7 +9396,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cann
+/etc/rc.d/init.d/canna -- gen_context(system_u:object_r:canna_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.if serefpolicy-3.3.1/policy/modules/services/canna.if
--- nsaserefpolicy/policy/modules/services/canna.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/canna.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/canna.if 2008-02-26 08:29:22.000000000 -0500
@@ -18,3 +18,74 @@
files_search_pids($1)
stream_connect_pattern($1,canna_var_run_t,canna_var_run_t,canna_t)
@@ -9474,7 +9474,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cann
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.te serefpolicy-3.3.1/policy/modules/services/canna.te
--- nsaserefpolicy/policy/modules/services/canna.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/canna.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/canna.te 2008-02-26 08:29:22.000000000 -0500
@@ -19,6 +19,9 @@
type canna_var_run_t;
files_pid_file(canna_var_run_t)
@@ -9487,7 +9487,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cann
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.3.1/policy/modules/services/clamav.fc
--- nsaserefpolicy/policy/modules/services/clamav.fc 2007-09-05 15:24:44.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/clamav.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/clamav.fc 2008-02-26 08:29:22.000000000 -0500
@@ -5,16 +5,20 @@
/usr/bin/freshclam -- gen_context(system_u:object_r:freshclam_exec_t,s0)
@@ -9513,7 +9513,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
+/etc/rc.d/init.d/clamd-wrapper -- gen_context(system_u:object_r:clamd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-3.3.1/policy/modules/services/clamav.if
--- nsaserefpolicy/policy/modules/services/clamav.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/clamav.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/clamav.if 2008-02-26 08:29:22.000000000 -0500
@@ -91,3 +91,97 @@
domtrans_pattern($1,clamscan_exec_t,clamscan_t)
@@ -9614,7 +9614,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.3.1/policy/modules/services/clamav.te
--- nsaserefpolicy/policy/modules/services/clamav.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/clamav.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/clamav.te 2008-02-26 08:29:22.000000000 -0500
@@ -48,6 +48,9 @@
type freshclam_var_log_t;
logging_log_file(freshclam_var_log_t)
@@ -9663,7 +9663,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.fc serefpolicy-3.3.1/policy/modules/services/consolekit.fc
--- nsaserefpolicy/policy/modules/services/consolekit.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/consolekit.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/consolekit.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,3 +1,6 @@
/usr/sbin/console-kit-daemon -- gen_context(system_u:object_r:consolekit_exec_t,s0)
@@ -9673,7 +9673,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
+/var/log/ConsoleKit(/.*)? gen_context(system_u:object_r:consolekit_log_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.3.1/policy/modules/services/consolekit.if
--- nsaserefpolicy/policy/modules/services/consolekit.if 2007-03-20 09:23:13.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/consolekit.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/consolekit.if 2008-02-26 08:29:22.000000000 -0500
@@ -38,3 +38,24 @@
allow $1 consolekit_t:dbus send_msg;
allow consolekit_t $1:dbus send_msg;
@@ -9701,7 +9701,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.3.1/policy/modules/services/consolekit.te
--- nsaserefpolicy/policy/modules/services/consolekit.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/consolekit.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/consolekit.te 2008-02-26 10:37:39.000000000 -0500
@@ -13,6 +13,9 @@
type consolekit_var_run_t;
files_pid_file(consolekit_var_run_t)
@@ -9741,12 +9741,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
# needs to read /var/lib/dbus/machine-id
files_read_var_lib_files(consolekit_t)
-@@ -47,16 +57,32 @@
+@@ -47,16 +57,33 @@
auth_use_nsswitch(consolekit_t)
+init_telinit(consolekit_t)
+init_rw_utmp(consolekit_t)
++init_chat(consolekit_t)
+
libs_use_ld_so(consolekit_t)
libs_use_shared_libs(consolekit_t)
@@ -9777,7 +9778,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
optional_policy(`
unconfined_dbus_chat(consolekit_t)
-@@ -64,6 +90,33 @@
+@@ -64,6 +91,33 @@
')
optional_policy(`
@@ -9813,7 +9814,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.3.1/policy/modules/services/cron.fc
--- nsaserefpolicy/policy/modules/services/cron.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cron.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cron.fc 2008-02-26 08:29:22.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)
@@ -9830,7 +9831,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.3.1/policy/modules/services/cron.if
--- nsaserefpolicy/policy/modules/services/cron.if 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/cron.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cron.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,38 +35,23 @@
#
template(`cron_per_role_template',`
@@ -10144,7 +10145,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.3.1/policy/modules/services/cron.te
--- nsaserefpolicy/policy/modules/services/cron.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cron.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cron.te 2008-02-26 10:50:57.000000000 -0500
@@ -12,14 +12,6 @@
## <desc>
@@ -10412,7 +10413,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron
-') dnl end TODO
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.3.1/policy/modules/services/cups.fc
--- nsaserefpolicy/policy/modules/services/cups.fc 2007-11-16 15:30:49.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cups.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cups.fc 2008-02-26 08:29:22.000000000 -0500
@@ -8,24 +8,28 @@
/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)
@@ -10469,7 +10470,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
+/usr/local/linuxprinter/ppd(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.3.1/policy/modules/services/cups.if
--- nsaserefpolicy/policy/modules/services/cups.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cups.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cups.if 2008-02-26 08:29:22.000000000 -0500
@@ -247,3 +247,102 @@
files_search_pids($1)
stream_connect_pattern($1,ptal_var_run_t,ptal_var_run_t,ptal_t)
@@ -10575,7 +10576,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.3.1/policy/modules/services/cups.te
--- nsaserefpolicy/policy/modules/services/cups.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cups.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cups.te 2008-02-26 08:29:22.000000000 -0500
@@ -43,14 +43,12 @@
type cupsd_var_run_t;
@@ -10868,7 +10869,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.if serefpolicy-3.3.1/policy/modules/services/cvs.if
--- nsaserefpolicy/policy/modules/services/cvs.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cvs.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cvs.if 2008-02-26 08:29:22.000000000 -0500
@@ -36,3 +36,72 @@
can_exec($1,cvs_exec_t)
@@ -10944,7 +10945,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.3.1/policy/modules/services/cvs.te
--- nsaserefpolicy/policy/modules/services/cvs.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cvs.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cvs.te 2008-02-26 08:29:22.000000000 -0500
@@ -28,6 +28,9 @@
type cvs_var_run_t;
files_pid_file(cvs_var_run_t)
@@ -10986,13 +10987,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.
-')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.fc serefpolicy-3.3.1/policy/modules/services/cyphesis.fc
--- nsaserefpolicy/policy/modules/services/cyphesis.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cyphesis.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cyphesis.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,2 @@
+
+/usr/bin/cyphesis -- gen_context(system_u:object_r:cyphesis_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.if serefpolicy-3.3.1/policy/modules/services/cyphesis.if
--- nsaserefpolicy/policy/modules/services/cyphesis.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cyphesis.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cyphesis.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,19 @@
+## <summary>policy for cyphesis</summary>
+
@@ -11015,7 +11016,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyph
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.te serefpolicy-3.3.1/policy/modules/services/cyphesis.te
--- nsaserefpolicy/policy/modules/services/cyphesis.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cyphesis.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cyphesis.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,92 @@
+policy_module(cyphesis,1.0.0)
+
@@ -11111,7 +11112,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyph
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.fc serefpolicy-3.3.1/policy/modules/services/cyrus.fc
--- nsaserefpolicy/policy/modules/services/cyrus.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cyrus.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cyrus.fc 2008-02-26 08:29:22.000000000 -0500
@@ -2,3 +2,5 @@
/usr/lib(64)?/cyrus-imapd/cyrus-master -- gen_context(system_u:object_r:cyrus_exec_t,s0)
@@ -11120,7 +11121,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyru
+/etc/rc.d/init.d/cyrus -- gen_context(system_u:object_r:cyrus_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.if serefpolicy-3.3.1/policy/modules/services/cyrus.if
--- nsaserefpolicy/policy/modules/services/cyrus.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cyrus.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cyrus.if 2008-02-26 08:29:22.000000000 -0500
@@ -39,3 +39,74 @@
files_search_var_lib($1)
stream_connect_pattern($1,cyrus_var_lib_t,cyrus_var_lib_t,cyrus_t)
@@ -11198,7 +11199,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyru
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.3.1/policy/modules/services/cyrus.te
--- nsaserefpolicy/policy/modules/services/cyrus.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/cyrus.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/cyrus.te 2008-02-26 08:29:22.000000000 -0500
@@ -19,6 +19,9 @@
type cyrus_var_run_t;
files_pid_file(cyrus_var_run_t)
@@ -11211,7 +11212,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyru
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.3.1/policy/modules/services/dbus.if
--- nsaserefpolicy/policy/modules/services/dbus.if 2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dbus.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dbus.if 2008-02-26 08:29:22.000000000 -0500
@@ -53,6 +53,7 @@
gen_require(`
type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t;
@@ -11471,7 +11472,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.3.1/policy/modules/services/dbus.te
--- nsaserefpolicy/policy/modules/services/dbus.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dbus.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dbus.te 2008-02-26 10:53:25.000000000 -0500
@@ -9,6 +9,7 @@
#
# Delcarations
@@ -11480,7 +11481,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
type dbusd_etc_t alias etc_dbusd_t;
files_type(dbusd_etc_t)
-@@ -21,7 +22,7 @@
+@@ -21,11 +22,23 @@
files_tmp_file(system_dbusd_tmp_t)
type system_dbusd_var_lib_t;
@@ -11489,7 +11490,23 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
type system_dbusd_var_run_t;
files_pid_file(system_dbusd_var_run_t)
-@@ -35,7 +36,7 @@
+
++ifdef(`enable_mcs',`
++ init_ranged_daemon_domain(system_dbusd_t,system_dbusd_exec_t,s0 - mcs_systemhigh)
++')
++
++ifdef(`enable_mls',`
++ init_ranged_daemon_domain(system_dbusd_t,system_dbusd_exec_t,s0 - mls_systemhigh)
++ mls_fd_use_all_levels(system_dbusd_t)
++ mls_rangetrans_target(system_dbusd_t)
++ mls_file_read_all_levels(system_dbusd_t)
++ mls_socket_write_all_levels(system_dbusd_t)
++')
++
+ ##############################
+ #
+ # Local policy
+@@ -35,7 +48,7 @@
# cjp: dac_override should probably go in a distro_debian
allow system_dbusd_t self:capability { dac_override setgid setpcap setuid };
dontaudit system_dbusd_t self:capability sys_tty_config;
@@ -11498,7 +11515,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
allow system_dbusd_t self:fifo_file { read write };
allow system_dbusd_t self:dbus { send_msg acquire_svc };
allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
-@@ -65,6 +66,7 @@
+@@ -65,6 +78,7 @@
fs_getattr_all_fs(system_dbusd_t)
fs_search_auto_mountpoints(system_dbusd_t)
@@ -11506,7 +11523,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
selinux_get_fs_mount(system_dbusd_t)
selinux_validate_context(system_dbusd_t)
-@@ -121,9 +123,20 @@
+@@ -91,6 +105,7 @@
+
+ init_use_fds(system_dbusd_t)
+ init_use_script_ptys(system_dbusd_t)
++init_domtrans_script(system_dbusd_t)
+
+ libs_use_ld_so(system_dbusd_t)
+ libs_use_shared_libs(system_dbusd_t)
+@@ -121,9 +136,20 @@
')
optional_policy(`
@@ -11529,7 +11554,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.3.1/policy/modules/services/dcc.if
--- nsaserefpolicy/policy/modules/services/dcc.if 2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/dcc.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dcc.if 2008-02-26 08:29:22.000000000 -0500
@@ -72,6 +72,24 @@
########################################
@@ -11557,7 +11582,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.3.1/policy/modules/services/dcc.te
--- nsaserefpolicy/policy/modules/services/dcc.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dcc.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dcc.te 2008-02-26 08:29:22.000000000 -0500
@@ -105,6 +105,8 @@
files_read_etc_files(cdcc_t)
files_read_etc_runtime_files(cdcc_t)
@@ -11719,7 +11744,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.fc serefpolicy-3.3.1/policy/modules/services/ddclient.fc
--- nsaserefpolicy/policy/modules/services/ddclient.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ddclient.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ddclient.fc 2008-02-26 08:29:22.000000000 -0500
@@ -9,3 +9,5 @@
/var/log/ddtcd\.log.* -- gen_context(system_u:object_r:ddclient_log_t,s0)
/var/run/ddclient\.pid -- gen_context(system_u:object_r:ddclient_var_run_t,s0)
@@ -11728,7 +11753,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddcl
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.if serefpolicy-3.3.1/policy/modules/services/ddclient.if
--- nsaserefpolicy/policy/modules/services/ddclient.if 2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/ddclient.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ddclient.if 2008-02-26 08:29:22.000000000 -0500
@@ -18,3 +18,81 @@
corecmd_search_bin($1)
domtrans_pattern($1, ddclient_exec_t, ddclient_t)
@@ -11813,7 +11838,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddcl
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.te serefpolicy-3.3.1/policy/modules/services/ddclient.te
--- nsaserefpolicy/policy/modules/services/ddclient.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ddclient.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ddclient.te 2008-02-26 08:29:22.000000000 -0500
@@ -25,6 +25,9 @@
type ddclient_var_run_t;
files_pid_file(ddclient_var_run_t)
@@ -11826,7 +11851,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddcl
# Declarations
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.fc serefpolicy-3.3.1/policy/modules/services/dhcp.fc
--- nsaserefpolicy/policy/modules/services/dhcp.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dhcp.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dhcp.fc 2008-02-26 08:29:22.000000000 -0500
@@ -5,3 +5,6 @@
/var/lib/dhcp(3)?/dhcpd\.leases.* -- gen_context(system_u:object_r:dhcpd_state_t,s0)
@@ -11836,7 +11861,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.3.1/policy/modules/services/dhcp.if
--- nsaserefpolicy/policy/modules/services/dhcp.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dhcp.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dhcp.if 2008-02-26 08:29:22.000000000 -0500
@@ -19,3 +19,71 @@
sysnet_search_dhcp_state($1)
allow $1 dhcpd_state_t:file setattr;
@@ -11911,7 +11936,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.3.1/policy/modules/services/dhcp.te
--- nsaserefpolicy/policy/modules/services/dhcp.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dhcp.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dhcp.te 2008-02-26 08:29:22.000000000 -0500
@@ -19,18 +19,20 @@
type dhcpd_var_run_t;
files_pid_file(dhcpd_var_run_t)
@@ -11969,7 +11994,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.fc serefpolicy-3.3.1/policy/modules/services/dictd.fc
--- nsaserefpolicy/policy/modules/services/dictd.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dictd.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dictd.fc 2008-02-26 08:29:22.000000000 -0500
@@ -4,3 +4,6 @@
/usr/sbin/dictd -- gen_context(system_u:object_r:dictd_exec_t,s0)
@@ -11979,7 +12004,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dict
+/etc/rc.d/init.d/dictd -- gen_context(system_u:object_r:dictd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.if serefpolicy-3.3.1/policy/modules/services/dictd.if
--- nsaserefpolicy/policy/modules/services/dictd.if 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dictd.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dictd.if 2008-02-26 08:29:22.000000000 -0500
@@ -14,3 +14,73 @@
interface(`dictd_tcp_connect',`
refpolicywarn(`$0($*) has been deprecated.')
@@ -12056,7 +12081,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dict
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.te serefpolicy-3.3.1/policy/modules/services/dictd.te
--- nsaserefpolicy/policy/modules/services/dictd.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dictd.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dictd.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,12 @@
type dictd_var_lib_t alias var_lib_dictd_t;
files_type(dictd_var_lib_t)
@@ -12082,7 +12107,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.fc serefpolicy-3.3.1/policy/modules/services/dnsmasq.fc
--- nsaserefpolicy/policy/modules/services/dnsmasq.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,4 +1,7 @@
/usr/sbin/dnsmasq -- gen_context(system_u:object_r:dnsmasq_exec_t,s0)
@@ -12093,7 +12118,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsm
+/etc/rc.d/init.d/dnsmasq -- gen_context(system_u:object_r:dnsmasq_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.3.1/policy/modules/services/dnsmasq.if
--- nsaserefpolicy/policy/modules/services/dnsmasq.if 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,106 @@
## <summary>dnsmasq DNS forwarder and DHCP server</summary>
+
@@ -12203,7 +12228,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsm
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.3.1/policy/modules/services/dnsmasq.te
--- nsaserefpolicy/policy/modules/services/dnsmasq.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dnsmasq.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,9 @@
type dnsmasq_var_run_t;
files_pid_file(dnsmasq_var_run_t)
@@ -12242,7 +12267,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.3.1/policy/modules/services/dovecot.fc
--- nsaserefpolicy/policy/modules/services/dovecot.fc 2008-02-26 08:17:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dovecot.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dovecot.fc 2008-02-26 08:29:22.000000000 -0500
@@ -17,23 +17,24 @@
ifdef(`distro_debian', `
@@ -12275,8 +12300,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
+/etc/rc.d/init.d/dovecot -- gen_context(system_u:object_r:dovecot_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.3.1/policy/modules/services/dovecot.if
--- nsaserefpolicy/policy/modules/services/dovecot.if 2008-02-26 08:17:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dovecot.if 2008-02-26 08:24:17.000000000 -0500
-@@ -21,18 +21,126 @@
++++ serefpolicy-3.3.1/policy/modules/services/dovecot.if 2008-02-26 10:29:56.000000000 -0500
+@@ -21,14 +21,53 @@
########################################
## <summary>
@@ -12293,9 +12318,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
## </param>
+## <rolecap/>
#
--interface(`dovecot_dontaudit_unlink_lib_files',`
+interface(`dovecot_auth_stream_connect',`
- gen_require(`
++ gen_require(`
+ type dovecot_auth_t, dovecot_var_run_t;
+ ')
+
@@ -12322,6 +12346,23 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
+ domtrans_pattern($1,dovecot_deliver_exec_t,dovecot_deliver_t)
+')
+
++########################################
++### <summary>
++### Do not audit attempts to delete dovecot lib files.
++### </summary>
++### <param name="domain">
++### <summary>
++### Domain to not audit.
++### </summary>
++### </param>
++##
+ interface(`dovecot_dontaudit_unlink_lib_files',`
+ gen_require(`
+ type dovecot_var_lib_t;
+@@ -36,3 +75,89 @@
+
+ dontaudit $1 dovecot_var_lib_t:file unlink;
+ ')
+
+########################################
+## <summary>
@@ -12371,14 +12412,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
+ type dovecot_etc_t;
+ type dovecot_log_t;
+ type dovecot_spool_t;
- type dovecot_var_lib_t;
++ type dovecot_var_lib_t;
+ type dovecot_var_run_t;
+
+ type dovecot_cert_t;
+ type dovecot_passwd_t;
- ')
-
-- dontaudit $1 dovecot_var_lib_t:file unlink;
++ ')
++
+ allow $1 dovecot_t:process { ptrace signal_perms getattr };
+ read_files_pattern($1, dovecot_t, dovecot_t)
+
@@ -12406,12 +12446,12 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dove
+ manage_all_pattern($1,dovecot_cert_t)
+
+ manage_all_pattern($1,dovecot_passwd_t)
- ')
++')
+
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.3.1/policy/modules/services/dovecot.te
--- nsaserefpolicy/policy/modules/services/dovecot.te 2008-02-26 08:17:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dovecot.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/dovecot.te 2008-02-26 08:29:22.000000000 -0500
@@ -15,6 +15,12 @@
domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
role system_r types dovecot_auth_t;
@@ -12556,7 +12596,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.3.1/policy/modules/services/exim.if
--- nsaserefpolicy/policy/modules/services/exim.if 2007-10-24 15:00:24.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/exim.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/exim.if 2008-02-26 08:29:22.000000000 -0500
@@ -97,6 +97,26 @@
########################################
@@ -12586,7 +12626,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim
## </summary>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.3.1/policy/modules/services/exim.te
--- nsaserefpolicy/policy/modules/services/exim.te 2007-10-24 15:17:31.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/exim.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/exim.te 2008-02-26 08:29:22.000000000 -0500
@@ -21,9 +21,20 @@
## </desc>
gen_tunable(exim_manage_user_files,false)
@@ -12765,7 +12805,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.3.1/policy/modules/services/fail2ban.fc
--- nsaserefpolicy/policy/modules/services/fail2ban.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,3 +1,7 @@
/usr/bin/fail2ban -- gen_context(system_u:object_r:fail2ban_exec_t,s0)
+/usr/bin/fail2ban-server -- gen_context(system_u:object_r:fail2ban_exec_t,s0)
@@ -12776,7 +12816,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.3.1/policy/modules/services/fail2ban.if
--- nsaserefpolicy/policy/modules/services/fail2ban.if 2007-03-22 14:30:09.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.if 2008-02-26 08:29:22.000000000 -0500
@@ -78,3 +78,68 @@
files_search_pids($1)
allow $1 fail2ban_var_run_t:file read_file_perms;
@@ -12848,7 +12888,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.3.1/policy/modules/services/fail2ban.te
--- nsaserefpolicy/policy/modules/services/fail2ban.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/fail2ban.te 2008-02-26 08:29:22.000000000 -0500
@@ -18,6 +18,9 @@
type fail2ban_var_run_t;
files_pid_file(fail2ban_var_run_t)
@@ -12881,7 +12921,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.fc serefpolicy-3.3.1/policy/modules/services/fetchmail.fc
--- nsaserefpolicy/policy/modules/services/fetchmail.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/fetchmail.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/fetchmail.fc 2008-02-26 08:29:22.000000000 -0500
@@ -17,3 +17,4 @@
/var/run/fetchmail/.* -- gen_context(system_u:object_r:fetchmail_var_run_t,s0)
@@ -12889,7 +12929,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetc
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.3.1/policy/modules/services/fetchmail.if
--- nsaserefpolicy/policy/modules/services/fetchmail.if 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/fetchmail.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/fetchmail.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,44 @@
## <summary>Remote-mail retrieval and forwarding utility</summary>
+
@@ -12937,7 +12977,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetc
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.fc serefpolicy-3.3.1/policy/modules/services/ftp.fc
--- nsaserefpolicy/policy/modules/services/ftp.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ftp.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ftp.fc 2008-02-26 08:29:22.000000000 -0500
@@ -27,3 +27,6 @@
/var/log/vsftpd.* -- gen_context(system_u:object_r:xferlog_t,s0)
/var/log/xferlog.* -- gen_context(system_u:object_r:xferlog_t,s0)
@@ -12947,7 +12987,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.
+/etc/rc.d/init.d/proftpd -- gen_context(system_u:object_r:ftp_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.3.1/policy/modules/services/ftp.if
--- nsaserefpolicy/policy/modules/services/ftp.if 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/ftp.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ftp.if 2008-02-26 08:29:22.000000000 -0500
@@ -28,11 +28,13 @@
type ftpd_t;
')
@@ -13066,7 +13106,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.3.1/policy/modules/services/ftp.te
--- nsaserefpolicy/policy/modules/services/ftp.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ftp.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ftp.te 2008-02-26 08:29:22.000000000 -0500
@@ -75,6 +75,9 @@
type xferlog_t;
logging_log_file(xferlog_t)
@@ -13132,13 +13172,13 @@ 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/gnomeclock.fc serefpolicy-3.3.1/policy/modules/services/gnomeclock.fc
--- nsaserefpolicy/policy/modules/services/gnomeclock.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/gnomeclock.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/gnomeclock.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,2 @@
+
+/usr/libexec/gnome-clock-applet-mechanism -- gen_context(system_u:object_r:gnomeclock_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.if serefpolicy-3.3.1/policy/modules/services/gnomeclock.if
--- nsaserefpolicy/policy/modules/services/gnomeclock.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/gnomeclock.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/gnomeclock.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,75 @@
+
+## <summary>policy for gnomeclock</summary>
@@ -13217,7 +13257,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnom
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.te serefpolicy-3.3.1/policy/modules/services/gnomeclock.te
--- nsaserefpolicy/policy/modules/services/gnomeclock.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/gnomeclock.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/gnomeclock.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,51 @@
+policy_module(gnomeclock,1.0.0)
+########################################
@@ -13272,7 +13312,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnom
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.3.1/policy/modules/services/hal.fc
--- nsaserefpolicy/policy/modules/services/hal.fc 2007-11-14 08:17:58.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/hal.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/hal.fc 2008-02-26 08:29:22.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)
@@ -13297,7 +13337,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.3.1/policy/modules/services/hal.if
--- nsaserefpolicy/policy/modules/services/hal.if 2007-09-05 15:24:44.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/hal.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/hal.if 2008-02-26 08:29:22.000000000 -0500
@@ -302,3 +302,42 @@
files_search_pids($1)
allow $1 hald_var_run_t:file rw_file_perms;
@@ -13343,7 +13383,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.3.1/policy/modules/services/hal.te
--- nsaserefpolicy/policy/modules/services/hal.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/hal.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/hal.te 2008-02-26 08:29:22.000000000 -0500
@@ -49,6 +49,9 @@
type hald_var_lib_t;
files_type(hald_var_lib_t)
@@ -13456,7 +13496,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.
+cron_read_system_job_lib_files(hald_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.3.1/policy/modules/services/inetd.te
--- nsaserefpolicy/policy/modules/services/inetd.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/inetd.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/inetd.te 2008-02-26 08:29:22.000000000 -0500
@@ -30,6 +30,10 @@
type inetd_child_var_run_t;
files_pid_file(inetd_child_var_run_t)
@@ -13512,7 +13552,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inet
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.fc serefpolicy-3.3.1/policy/modules/services/inn.fc
--- nsaserefpolicy/policy/modules/services/inn.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/inn.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/inn.fc 2008-02-26 08:29:22.000000000 -0500
@@ -64,3 +64,5 @@
/var/run/news(/.*)? gen_context(system_u:object_r:innd_var_run_t,s0)
@@ -13521,7 +13561,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.
+/etc/rc.d/init.d/innd -- gen_context(system_u:object_r:innd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.if serefpolicy-3.3.1/policy/modules/services/inn.if
--- nsaserefpolicy/policy/modules/services/inn.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/inn.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/inn.if 2008-02-26 08:29:22.000000000 -0500
@@ -176,3 +176,80 @@
corecmd_search_bin($1)
domtrans_pattern($1,innd_exec_t,innd_t)
@@ -13605,7 +13645,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-3.3.1/policy/modules/services/inn.te
--- nsaserefpolicy/policy/modules/services/inn.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/inn.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/inn.te 2008-02-26 08:29:22.000000000 -0500
@@ -22,7 +22,10 @@
files_pid_file(innd_var_run_t)
@@ -13620,7 +13660,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.
#
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.fc serefpolicy-3.3.1/policy/modules/services/jabber.fc
--- nsaserefpolicy/policy/modules/services/jabber.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/jabber.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/jabber.fc 2008-02-26 08:29:22.000000000 -0500
@@ -2,3 +2,4 @@
/var/lib/jabber(/.*)? gen_context(system_u:object_r:jabberd_var_lib_t,s0)
@@ -13628,7 +13668,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabb
+/etc/rc.d/init.d/jabber -- gen_context(system_u:object_r:jabber_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.if serefpolicy-3.3.1/policy/modules/services/jabber.if
--- nsaserefpolicy/policy/modules/services/jabber.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/jabber.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/jabber.if 2008-02-26 08:29:22.000000000 -0500
@@ -13,3 +13,73 @@
interface(`jabber_tcp_connect',`
refpolicywarn(`$0($*) has been deprecated.')
@@ -13705,7 +13745,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabb
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.te serefpolicy-3.3.1/policy/modules/services/jabber.te
--- nsaserefpolicy/policy/modules/services/jabber.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/jabber.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/jabber.te 2008-02-26 08:29:22.000000000 -0500
@@ -19,6 +19,9 @@
type jabberd_var_run_t;
files_pid_file(jabberd_var_run_t)
@@ -13718,7 +13758,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabb
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.3.1/policy/modules/services/kerberos.fc
--- nsaserefpolicy/policy/modules/services/kerberos.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/kerberos.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/kerberos.fc 2008-02-26 08:29:22.000000000 -0500
@@ -16,3 +16,9 @@
/var/log/krb5kdc\.log gen_context(system_u:object_r:krb5kdc_log_t,s0)
@@ -13731,7 +13771,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
+/etc/rc.d/init.d/krb5kdc -- gen_context(system_u:object_r:kerberos_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.3.1/policy/modules/services/kerberos.if
--- nsaserefpolicy/policy/modules/services/kerberos.if 2007-07-16 14:09:46.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/kerberos.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/kerberos.if 2008-02-26 08:29:22.000000000 -0500
@@ -43,7 +43,13 @@
dontaudit $1 krb5kdc_conf_t:dir list_dir_perms;
dontaudit $1 krb5kdc_conf_t:file rw_file_perms;
@@ -13917,7 +13957,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.3.1/policy/modules/services/kerberos.te
--- nsaserefpolicy/policy/modules/services/kerberos.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/kerberos.te 2008-02-26 08:29:22.000000000 -0500
@@ -54,6 +54,12 @@
type krb5kdc_var_run_t;
files_pid_file(krb5kdc_var_run_t)
@@ -14004,7 +14044,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerb
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.fc serefpolicy-3.3.1/policy/modules/services/kerneloops.fc
--- nsaserefpolicy/policy/modules/services/kerneloops.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/kerneloops.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/kerneloops.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,4 @@
+
+/usr/sbin/kerneloops -- gen_context(system_u:object_r:kerneloops_exec_t,s0)
@@ -14012,7 +14052,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kern
+/etc/rc.d/init.d/kerneloops -- gen_context(system_u:object_r:kerneloops_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.3.1/policy/modules/services/kerneloops.if
--- nsaserefpolicy/policy/modules/services/kerneloops.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/kerneloops.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/kerneloops.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,104 @@
+
+## <summary>policy for kerneloops</summary>
@@ -14120,7 +14160,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kern
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.3.1/policy/modules/services/kerneloops.te
--- nsaserefpolicy/policy/modules/services/kerneloops.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/kerneloops.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/kerneloops.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,57 @@
+policy_module(kerneloops,1.0.0)
+
@@ -14181,7 +14221,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kern
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-3.3.1/policy/modules/services/ldap.fc
--- nsaserefpolicy/policy/modules/services/ldap.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ldap.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ldap.fc 2008-02-26 08:29:22.000000000 -0500
@@ -14,3 +14,5 @@
/var/run/openldap(/.*)? gen_context(system_u:object_r:slapd_var_run_t,s0)
/var/run/slapd\.args -- gen_context(system_u:object_r:slapd_var_run_t,s0)
@@ -14190,7 +14230,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap
+/etc/rc.d/init.d/ldap -- gen_context(system_u:object_r:ldap_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-3.3.1/policy/modules/services/ldap.if
--- nsaserefpolicy/policy/modules/services/ldap.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ldap.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ldap.if 2008-02-26 08:29:22.000000000 -0500
@@ -73,3 +73,80 @@
allow $1 slapd_var_run_t:sock_file write;
allow $1 slapd_t:unix_stream_socket connectto;
@@ -14274,7 +14314,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.3.1/policy/modules/services/ldap.te
--- nsaserefpolicy/policy/modules/services/ldap.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ldap.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ldap.te 2008-02-26 08:29:22.000000000 -0500
@@ -31,6 +31,9 @@
type slapd_var_run_t;
files_pid_file(slapd_var_run_t)
@@ -14287,7 +14327,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-3.3.1/policy/modules/services/lpd.fc
--- nsaserefpolicy/policy/modules/services/lpd.fc 2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/lpd.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/lpd.fc 2008-02-26 08:29:22.000000000 -0500
@@ -22,6 +22,8 @@
/usr/sbin/lpinfo -- gen_context(system_u:object_r:lpr_exec_t,s0)
/usr/sbin/lpmove -- gen_context(system_u:object_r:lpr_exec_t,s0)
@@ -14304,7 +14344,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-3.3.1/policy/modules/services/lpd.if
--- nsaserefpolicy/policy/modules/services/lpd.if 2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/lpd.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/lpd.if 2008-02-26 08:29:22.000000000 -0500
@@ -336,10 +336,8 @@
')
@@ -14319,7 +14359,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.3.1/policy/modules/services/mailman.fc
--- nsaserefpolicy/policy/modules/services/mailman.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mailman.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mailman.fc 2008-02-26 08:29:22.000000000 -0500
@@ -31,3 +31,4 @@
/var/lock/mailman(/.*)? gen_context(system_u:object_r:mailman_lock_t,s0)
/var/spool/mailman(/.*)? gen_context(system_u:object_r:mailman_data_t,s0)
@@ -14327,7 +14367,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
+/usr/lib/mailman/mail/mailman -- gen_context(system_u:object_r:mailman_mail_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.3.1/policy/modules/services/mailman.if
--- nsaserefpolicy/policy/modules/services/mailman.if 2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mailman.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mailman.if 2008-02-26 08:29:22.000000000 -0500
@@ -211,6 +211,7 @@
type mailman_data_t;
')
@@ -14364,7 +14404,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
## <param name="domain">
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.3.1/policy/modules/services/mailman.te
--- nsaserefpolicy/policy/modules/services/mailman.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mailman.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mailman.te 2008-02-26 08:29:22.000000000 -0500
@@ -53,10 +53,9 @@
apache_use_fds(mailman_cgi_t)
apache_dontaudit_append_log(mailman_cgi_t)
@@ -14395,13 +14435,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mail
optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.3.1/policy/modules/services/mailscanner.fc
--- nsaserefpolicy/policy/modules/services/mailscanner.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mailscanner.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mailscanner.fc 2008-02-26 08:29:22.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.3.1/policy/modules/services/mailscanner.if
--- nsaserefpolicy/policy/modules/services/mailscanner.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mailscanner.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mailscanner.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,59 @@
+## <summary>Anti-Virus and Anti-Spam Filter</summary>
+
@@ -14464,7 +14504,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.3.1/policy/modules/services/mailscanner.te
--- nsaserefpolicy/policy/modules/services/mailscanner.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mailscanner.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mailscanner.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,5 @@
+
+policy_module(mailscanner,1.0.0)
@@ -14473,7 +14513,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.3.1/policy/modules/services/mta.if
--- nsaserefpolicy/policy/modules/services/mta.if 2007-12-06 13:12:03.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mta.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mta.if 2008-02-26 08:29:22.000000000 -0500
@@ -133,6 +133,12 @@
sendmail_create_log($1_mail_t)
')
@@ -14645,7 +14685,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.3.1/policy/modules/services/mta.te
--- nsaserefpolicy/policy/modules/services/mta.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mta.te 2008-02-26 08:29:22.000000000 -0500
@@ -6,6 +6,8 @@
# Declarations
#
@@ -14774,7 +14814,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.3.1/policy/modules/services/munin.fc
--- nsaserefpolicy/policy/modules/services/munin.fc 2007-04-30 10:41:38.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/munin.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/munin.fc 2008-02-26 08:29:22.000000000 -0500
@@ -6,6 +6,9 @@
/usr/share/munin/plugins/.* -- gen_context(system_u:object_r:munin_exec_t,s0)
@@ -14789,7 +14829,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/muni
+/etc/rc.d/init.d/munin-node -- gen_context(system_u:object_r:munin_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.if serefpolicy-3.3.1/policy/modules/services/munin.if
--- nsaserefpolicy/policy/modules/services/munin.if 2007-11-15 13:40:14.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/munin.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/munin.if 2008-02-26 08:29:22.000000000 -0500
@@ -80,3 +80,85 @@
dontaudit $1 munin_var_lib_t:dir search_dir_perms;
@@ -14878,7 +14918,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/muni
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.3.1/policy/modules/services/munin.te
--- nsaserefpolicy/policy/modules/services/munin.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/munin.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/munin.te 2008-02-26 08:29:22.000000000 -0500
@@ -25,26 +25,33 @@
type munin_var_run_t alias lrrd_var_run_t;
files_pid_file(munin_var_run_t)
@@ -14996,7 +15036,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/muni
+manage_files_pattern(munin_t, httpd_munin_content_t, httpd_munin_content_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.fc serefpolicy-3.3.1/policy/modules/services/mysql.fc
--- nsaserefpolicy/policy/modules/services/mysql.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mysql.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mysql.fc 2008-02-26 08:29:22.000000000 -0500
@@ -22,3 +22,5 @@
/var/log/mysql.* -- gen_context(system_u:object_r:mysqld_log_t,s0)
@@ -15005,7 +15045,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.3.1/policy/modules/services/mysql.if
--- nsaserefpolicy/policy/modules/services/mysql.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mysql.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mysql.if 2008-02-26 08:29:22.000000000 -0500
@@ -157,3 +157,74 @@
logging_search_logs($1)
allow $1 mysqld_log_t:file { write append setattr ioctl };
@@ -15083,7 +15123,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.3.1/policy/modules/services/mysql.te
--- nsaserefpolicy/policy/modules/services/mysql.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/mysql.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/mysql.te 2008-02-26 08:29:22.000000000 -0500
@@ -25,6 +25,9 @@
type mysqld_tmp_t;
files_tmp_file(mysqld_tmp_t)
@@ -15114,7 +15154,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysq
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.3.1/policy/modules/services/nagios.fc
--- nsaserefpolicy/policy/modules/services/nagios.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nagios.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nagios.fc 2008-02-26 08:29:22.000000000 -0500
@@ -4,13 +4,19 @@
/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)
@@ -15140,7 +15180,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.3.1/policy/modules/services/nagios.if
--- nsaserefpolicy/policy/modules/services/nagios.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nagios.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nagios.if 2008-02-26 08:29:22.000000000 -0500
@@ -44,7 +44,7 @@
########################################
@@ -15252,7 +15292,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagi
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.3.1/policy/modules/services/nagios.te
--- nsaserefpolicy/policy/modules/services/nagios.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nagios.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nagios.te 2008-02-26 08:29:22.000000000 -0500
@@ -8,11 +8,7 @@
type nagios_t;
@@ -15358,7 +15398,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.3.1/policy/modules/services/networkmanager.fc
--- nsaserefpolicy/policy/modules/services/networkmanager.fc 2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,7 +1,9 @@
/usr/s?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
/usr/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
@@ -15371,7 +15411,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.if serefpolicy-3.3.1/policy/modules/services/networkmanager.if
--- nsaserefpolicy/policy/modules/services/networkmanager.if 2007-06-12 10:15:45.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.if 2008-02-26 08:29:22.000000000 -0500
@@ -97,3 +97,21 @@
allow $1 NetworkManager_t:dbus send_msg;
allow NetworkManager_t $1:dbus send_msg;
@@ -15396,7 +15436,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.3.1/policy/modules/services/networkmanager.te
--- nsaserefpolicy/policy/modules/services/networkmanager.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/networkmanager.te 2008-02-26 08:29:22.000000000 -0500
@@ -13,6 +13,9 @@
type NetworkManager_var_run_t;
files_pid_file(NetworkManager_var_run_t)
@@ -15505,7 +15545,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/netw
optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.3.1/policy/modules/services/nis.fc
--- nsaserefpolicy/policy/modules/services/nis.fc 2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nis.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nis.fc 2008-02-26 08:29:22.000000000 -0500
@@ -4,9 +4,14 @@
/sbin/ypbind -- gen_context(system_u:object_r:ypbind_exec_t,s0)
@@ -15523,7 +15563,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
+/etc/rc.d/init.d/ypxfrd -- gen_context(system_u:object_r:nis_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.3.1/policy/modules/services/nis.if
--- nsaserefpolicy/policy/modules/services/nis.if 2007-07-16 14:09:46.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/nis.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nis.if 2008-02-26 08:29:22.000000000 -0500
@@ -49,8 +49,8 @@
corenet_udp_bind_all_nodes($1)
corenet_tcp_bind_generic_port($1)
@@ -15657,7 +15697,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.3.1/policy/modules/services/nis.te
--- nsaserefpolicy/policy/modules/services/nis.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nis.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nis.te 2008-02-26 08:29:22.000000000 -0500
@@ -44,6 +44,9 @@
type ypxfr_exec_t;
init_daemon_domain(ypxfr_t,ypxfr_exec_t)
@@ -15725,7 +15765,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.3.1/policy/modules/services/nscd.fc
--- nsaserefpolicy/policy/modules/services/nscd.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nscd.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nscd.fc 2008-02-26 08:29:22.000000000 -0500
@@ -9,3 +9,5 @@
/var/run/\.nscd_socket -s gen_context(system_u:object_r:nscd_var_run_t,s0)
@@ -15734,7 +15774,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.3.1/policy/modules/services/nscd.if
--- nsaserefpolicy/policy/modules/services/nscd.if 2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/nscd.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nscd.if 2008-02-26 08:29:22.000000000 -0500
@@ -70,15 +70,14 @@
interface(`nscd_socket_use',`
gen_require(`
@@ -15824,7 +15864,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.3.1/policy/modules/services/nscd.te
--- nsaserefpolicy/policy/modules/services/nscd.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nscd.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nscd.te 2008-02-26 08:29:22.000000000 -0500
@@ -23,19 +23,22 @@
type nscd_log_t;
logging_log_file(nscd_log_t)
@@ -15892,7 +15932,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.3.1/policy/modules/services/ntp.fc
--- nsaserefpolicy/policy/modules/services/ntp.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ntp.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ntp.fc 2008-02-26 08:29:22.000000000 -0500
@@ -17,3 +17,8 @@
/var/log/xntpd.* -- gen_context(system_u:object_r:ntpd_log_t,s0)
@@ -15904,7 +15944,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.3.1/policy/modules/services/ntp.if
--- nsaserefpolicy/policy/modules/services/ntp.if 2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/ntp.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ntp.if 2008-02-26 08:29:22.000000000 -0500
@@ -53,3 +53,76 @@
corecmd_search_bin($1)
domtrans_pattern($1,ntpdate_exec_t,ntpd_t)
@@ -15984,7 +16024,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.3.1/policy/modules/services/ntp.te
--- nsaserefpolicy/policy/modules/services/ntp.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ntp.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ntp.te 2008-02-26 08:29:22.000000000 -0500
@@ -25,6 +25,12 @@
type ntpdate_exec_t;
init_system_domain(ntpd_t,ntpdate_exec_t)
@@ -16051,7 +16091,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.3.1/policy/modules/services/nx.fc
--- nsaserefpolicy/policy/modules/services/nx.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/nx.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/nx.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,3 +1,5 @@
+
+/usr/libexec/nx/nxserver -- gen_context(system_u:object_r:nx_server_exec_t,s0)
@@ -16060,7 +16100,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.f
/opt/NX/home/nx/\.ssh(/.*)? gen_context(system_u:object_r:nx_server_home_ssh_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.3.1/policy/modules/services/oddjob.fc
--- nsaserefpolicy/policy/modules/services/oddjob.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/oddjob.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/oddjob.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,4 +1,4 @@
-/usr/lib/oddjob/mkhomedir -- gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
+/usr/lib(64)?/oddjob/mkhomedir -- gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
@@ -16069,7 +16109,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddj
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.3.1/policy/modules/services/oddjob.if
--- nsaserefpolicy/policy/modules/services/oddjob.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/oddjob.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/oddjob.if 2008-02-26 08:29:22.000000000 -0500
@@ -44,6 +44,7 @@
')
@@ -16080,7 +16120,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddj
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.3.1/policy/modules/services/oddjob.te
--- nsaserefpolicy/policy/modules/services/oddjob.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/oddjob.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/oddjob.te 2008-02-26 08:29:22.000000000 -0500
@@ -10,14 +10,20 @@
type oddjob_exec_t;
domain_type(oddjob_t)
@@ -16148,7 +16188,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddj
userdom_generic_user_home_dir_filetrans_generic_user_home_content(oddjob_mkhomedir_t,notdevfile_class_set)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openct.te serefpolicy-3.3.1/policy/modules/services/openct.te
--- nsaserefpolicy/policy/modules/services/openct.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/openct.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/openct.te 2008-02-26 08:29:22.000000000 -0500
@@ -22,6 +22,7 @@
allow openct_t self:process signal_perms;
@@ -16159,7 +16199,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.3.1/policy/modules/services/openvpn.fc
--- nsaserefpolicy/policy/modules/services/openvpn.fc 2007-06-11 16:05:22.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/openvpn.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/openvpn.fc 2008-02-26 08:29:22.000000000 -0500
@@ -11,5 +11,7 @@
#
# /var
@@ -16171,7 +16211,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
+/etc/rc.d/init.d/openvpn -- gen_context(system_u:object_r:openvpn_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.3.1/policy/modules/services/openvpn.if
--- nsaserefpolicy/policy/modules/services/openvpn.if 2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/openvpn.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/openvpn.if 2008-02-26 08:29:22.000000000 -0500
@@ -90,3 +90,74 @@
read_files_pattern($1,openvpn_etc_t,openvpn_etc_t)
read_lnk_files_pattern($1,openvpn_etc_t,openvpn_etc_t)
@@ -16249,7 +16289,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/open
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.3.1/policy/modules/services/openvpn.te
--- nsaserefpolicy/policy/modules/services/openvpn.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/openvpn.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/openvpn.te 2008-02-26 08:29:22.000000000 -0500
@@ -8,7 +8,7 @@
## <desc>
@@ -16307,7 +16347,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.3.1/policy/modules/services/pcscd.te
--- nsaserefpolicy/policy/modules/services/pcscd.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/pcscd.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/pcscd.te 2008-02-26 08:29:22.000000000 -0500
@@ -45,6 +45,7 @@
files_read_etc_files(pcscd_t)
files_read_etc_runtime_files(pcscd_t)
@@ -16318,7 +16358,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.3.1/policy/modules/services/pegasus.te
--- nsaserefpolicy/policy/modules/services/pegasus.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/pegasus.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/pegasus.te 2008-02-26 08:29:22.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;
@@ -16367,7 +16407,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.3.1/policy/modules/services/polkit.fc
--- nsaserefpolicy/policy/modules/services/polkit.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/polkit.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/polkit.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,8 @@
+
+/usr/libexec/polkit-read-auth-helper -- gen_context(system_u:object_r:polkit_auth_exec_t,s0)
@@ -16379,7 +16419,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.3.1/policy/modules/services/polkit.if
--- nsaserefpolicy/policy/modules/services/polkit.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/polkit.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/polkit.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,189 @@
+
+## <summary>policy for polkit_auth</summary>
@@ -16572,7 +16612,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.3.1/policy/modules/services/polkit.te
--- nsaserefpolicy/policy/modules/services/polkit.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/polkit.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/polkit.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,157 @@
+policy_module(polkit_auth,1.0.0)
+
@@ -16733,7 +16773,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polk
+manage_files_pattern(polkit_grant_t, system_crond_var_lib_t, system_crond_var_lib_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.3.1/policy/modules/services/postfix.fc
--- nsaserefpolicy/policy/modules/services/postfix.fc 2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/postfix.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postfix.fc 2008-02-26 08:29:22.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)
@@ -16749,7 +16789,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.3.1/policy/modules/services/postfix.if
--- nsaserefpolicy/policy/modules/services/postfix.if 2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postfix.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postfix.if 2008-02-26 08:29:22.000000000 -0500
@@ -206,9 +206,8 @@
type postfix_etc_t;
')
@@ -16826,7 +16866,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/postfixpolicyd.fc serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.fc
--- nsaserefpolicy/policy/modules/services/postfixpolicyd.fc 2007-11-08 09:29:27.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.fc 2008-02-26 08:29:22.000000000 -0500
@@ -3,3 +3,5 @@
/usr/sbin/policyd -- gen_context(system_u:object_r:postfix_policyd_exec_t, s0)
@@ -16835,7 +16875,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
+/etc/rc.d/init.d/postfixpolicyd -- gen_context(system_u:object_r:postfixpolicyd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.if serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.if
--- nsaserefpolicy/policy/modules/services/postfixpolicyd.if 2007-11-08 09:29:27.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,68 @@
## <summary>Postfix policy server</summary>
+
@@ -16907,7 +16947,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.te serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.te
--- nsaserefpolicy/policy/modules/services/postfixpolicyd.te 2007-11-08 09:29:27.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postfixpolicyd.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,9 @@
type postfix_policyd_var_run_t;
files_pid_file(postfix_policyd_var_run_t)
@@ -16920,7 +16960,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
# Local Policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.3.1/policy/modules/services/postfix.te
--- nsaserefpolicy/policy/modules/services/postfix.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postfix.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postfix.te 2008-02-26 08:29:22.000000000 -0500
@@ -6,6 +6,14 @@
# Declarations
#
@@ -17081,7 +17121,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.fc serefpolicy-3.3.1/policy/modules/services/postgresql.fc
--- nsaserefpolicy/policy/modules/services/postgresql.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postgresql.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postgresql.fc 2008-02-26 08:29:22.000000000 -0500
@@ -38,3 +38,5 @@
')
@@ -17090,7 +17130,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.3.1/policy/modules/services/postgresql.if
--- nsaserefpolicy/policy/modules/services/postgresql.if 2007-11-29 13:29:35.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postgresql.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postgresql.if 2008-02-26 08:29:22.000000000 -0500
@@ -120,3 +120,72 @@
# Some versions of postgresql put the sock file in /tmp
allow $1 postgresql_tmp_t:sock_file write;
@@ -17166,7 +17206,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.3.1/policy/modules/services/postgresql.te
--- nsaserefpolicy/policy/modules/services/postgresql.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postgresql.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postgresql.te 2008-02-26 08:29:22.000000000 -0500
@@ -27,6 +27,9 @@
type postgresql_var_run_t;
files_pid_file(postgresql_var_run_t)
@@ -17187,7 +17227,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-3.3.1/policy/modules/services/postgrey.fc
--- nsaserefpolicy/policy/modules/services/postgrey.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postgrey.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postgrey.fc 2008-02-26 08:29:22.000000000 -0500
@@ -7,3 +7,7 @@
/var/run/postgrey(/.*)? gen_context(system_u:object_r:postgrey_var_run_t,s0)
@@ -17198,7 +17238,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
+/var/spool/postfix/postgrey(/.*)? gen_context(system_u:object_r:postgrey_spool_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.3.1/policy/modules/services/postgrey.if
--- nsaserefpolicy/policy/modules/services/postgrey.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postgrey.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postgrey.if 2008-02-26 08:29:22.000000000 -0500
@@ -19,3 +19,74 @@
allow $1 postgrey_var_run_t:sock_file write;
files_search_pids($1)
@@ -17276,7 +17316,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.3.1/policy/modules/services/postgrey.te
--- nsaserefpolicy/policy/modules/services/postgrey.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postgrey.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/postgrey.te 2008-02-26 08:29:22.000000000 -0500
@@ -13,26 +13,37 @@
type postgrey_etc_t;
files_config_file(postgrey_etc_t)
@@ -17330,7 +17370,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.3.1/policy/modules/services/ppp.fc
--- nsaserefpolicy/policy/modules/services/ppp.fc 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ppp.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ppp.fc 2008-02-26 08:29:22.000000000 -0500
@@ -33,3 +33,5 @@
/var/log/ppp-connect-errors.* -- gen_context(system_u:object_r:pppd_log_t,s0)
@@ -17339,7 +17379,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
+/etc/rc.d/init.d/ppp -- gen_context(system_u:object_r:pppd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.3.1/policy/modules/services/ppp.if
--- nsaserefpolicy/policy/modules/services/ppp.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ppp.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ppp.if 2008-02-26 08:29:22.000000000 -0500
@@ -297,38 +297,42 @@
type pppd_t, pppd_tmp_t, pppd_log_t, pppd_lock_t;
type pppd_etc_t, pppd_script_t, pppd_secret_t;
@@ -17399,7 +17439,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
-')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.3.1/policy/modules/services/ppp.te
--- nsaserefpolicy/policy/modules/services/ppp.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ppp.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ppp.te 2008-02-26 08:29:22.000000000 -0500
@@ -196,6 +196,12 @@
optional_policy(`
@@ -17427,7 +17467,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.
allow pptp_t self:unix_stream_socket { connectto create_stream_socket_perms };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.3.1/policy/modules/services/prelude.fc
--- nsaserefpolicy/policy/modules/services/prelude.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/prelude.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/prelude.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,13 @@
+
+/sbin/audisp-prelude -- gen_context(system_u:object_r:audisp_prelude_exec_t,s0)
@@ -17444,7 +17484,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prel
+/usr/share/prewikka/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_prewikka_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.3.1/policy/modules/services/prelude.if
--- nsaserefpolicy/policy/modules/services/prelude.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/prelude.if 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/prelude.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,128 @@
+
+## <summary>policy for prelude</summary>
@@ -17576,7 +17616,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prel
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.3.1/policy/modules/services/prelude.te
--- nsaserefpolicy/policy/modules/services/prelude.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/prelude.te 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/prelude.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,152 @@
+policy_module(prelude,1.0.0)
+
@@ -17732,7 +17772,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prel
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.3.1/policy/modules/services/privoxy.fc
--- nsaserefpolicy/policy/modules/services/privoxy.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/privoxy.fc 2008-02-26 08:24:17.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/privoxy.fc 2008-02-26 08:29:22.000000000 -0500
@@ -4,3 +4,6 @@
/usr/sbin/privoxy -- gen_context(system_u:object_r:privoxy_exec_t,s0)
@@ -17742,7 +17782,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/priv
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.if serefpolicy-3.3.1/policy/modules/services/privoxy.if
--- nsaserefpolicy/policy/modules/services/privoxy.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/privoxy.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/privoxy.if 2008-02-26 08:29:22.000000000 -0500
@@ -2,6 +2,25 @@
########################################
@@ -17801,7 +17841,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/priv
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.3.1/policy/modules/services/privoxy.te
--- nsaserefpolicy/policy/modules/services/privoxy.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/privoxy.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/privoxy.te 2008-02-26 08:29:22.000000000 -0500
@@ -19,6 +19,9 @@
type privoxy_var_run_t;
files_pid_file(privoxy_var_run_t)
@@ -17814,7 +17854,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/priv
# Local Policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.fc serefpolicy-3.3.1/policy/modules/services/procmail.fc
--- nsaserefpolicy/policy/modules/services/procmail.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/procmail.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/procmail.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,2 +1,5 @@
/usr/bin/procmail -- gen_context(system_u:object_r:procmail_exec_t,s0)
@@ -17823,7 +17863,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/proc
+/var/log/procmail(/.*)? gen_context(system_u:object_r:procmail_log_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.if serefpolicy-3.3.1/policy/modules/services/procmail.if
--- nsaserefpolicy/policy/modules/services/procmail.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/procmail.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/procmail.if 2008-02-26 08:29:22.000000000 -0500
@@ -39,3 +39,41 @@
corecmd_search_bin($1)
can_exec($1,procmail_exec_t)
@@ -17868,7 +17908,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/proc
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.3.1/policy/modules/services/procmail.te
--- nsaserefpolicy/policy/modules/services/procmail.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/procmail.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/procmail.te 2008-02-26 08:29:22.000000000 -0500
@@ -14,6 +14,10 @@
type procmail_tmp_t;
files_tmp_file(procmail_tmp_t)
@@ -17943,13 +17983,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/proc
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/publicfile.if serefpolicy-3.3.1/policy/modules/services/publicfile.if
--- nsaserefpolicy/policy/modules/services/publicfile.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/publicfile.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/publicfile.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,2 @@
## <summary>publicfile supplies files to the public through HTTP and FTP</summary>
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.3.1/policy/modules/services/pyzor.fc
--- nsaserefpolicy/policy/modules/services/pyzor.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/pyzor.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/pyzor.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,9 +1,11 @@
/etc/pyzor(/.*)? gen_context(system_u:object_r:pyzor_etc_t, s0)
@@ -17965,7 +18005,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
+/etc/rc.d/init.d/pyzord -- gen_context(system_u:object_r:pyzord_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.3.1/policy/modules/services/pyzor.if
--- nsaserefpolicy/policy/modules/services/pyzor.if 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/pyzor.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/pyzor.if 2008-02-26 08:29:22.000000000 -0500
@@ -25,16 +25,18 @@
#
template(`pyzor_per_role_template',`
@@ -18073,7 +18113,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.3.1/policy/modules/services/pyzor.te
--- nsaserefpolicy/policy/modules/services/pyzor.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/pyzor.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/pyzor.te 2008-02-26 08:29:22.000000000 -0500
@@ -28,6 +28,12 @@
type pyzor_var_lib_t;
files_type(pyzor_var_lib_t)
@@ -18112,7 +18152,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzo
########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.if serefpolicy-3.3.1/policy/modules/services/qmail.if
--- nsaserefpolicy/policy/modules/services/qmail.if 2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/qmail.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/qmail.if 2008-02-26 08:29:22.000000000 -0500
@@ -197,3 +197,4 @@
domtrans_pattern(qmail_smtpd_t, $2, $1)
@@ -18120,7 +18160,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmai
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.te serefpolicy-3.3.1/policy/modules/services/qmail.te
--- nsaserefpolicy/policy/modules/services/qmail.te 2007-10-02 09:54:52.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/qmail.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/qmail.te 2008-02-26 08:29:22.000000000 -0500
@@ -85,6 +85,8 @@
libs_use_ld_so(qmail_inject_t)
libs_use_shared_libs(qmail_inject_t)
@@ -18169,7 +18209,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmai
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-3.3.1/policy/modules/services/radius.fc
--- nsaserefpolicy/policy/modules/services/radius.fc 2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/radius.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/radius.fc 2008-02-26 08:29:22.000000000 -0500
@@ -20,3 +20,5 @@
/var/run/radiusd(/.*)? gen_context(system_u:object_r:radiusd_var_run_t,s0)
@@ -18178,7 +18218,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
+/etc/rc.d/init.d/radiusd -- gen_context(system_u:object_r:radius_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.if serefpolicy-3.3.1/policy/modules/services/radius.if
--- nsaserefpolicy/policy/modules/services/radius.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/radius.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/radius.if 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,25 @@
########################################
@@ -18244,7 +18284,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.3.1/policy/modules/services/radius.te
--- nsaserefpolicy/policy/modules/services/radius.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/radius.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/radius.te 2008-02-26 08:29:22.000000000 -0500
@@ -25,6 +25,9 @@
type radiusd_var_run_t;
files_pid_file(radiusd_var_run_t)
@@ -18257,7 +18297,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radi
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.fc serefpolicy-3.3.1/policy/modules/services/radvd.fc
--- nsaserefpolicy/policy/modules/services/radvd.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/radvd.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/radvd.fc 2008-02-26 08:29:22.000000000 -0500
@@ -5,3 +5,4 @@
/var/run/radvd\.pid -- gen_context(system_u:object_r:radvd_var_run_t,s0)
@@ -18265,7 +18305,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radv
+/etc/rc.d/init.d/radvd -- gen_context(system_u:object_r:radvd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.if serefpolicy-3.3.1/policy/modules/services/radvd.if
--- nsaserefpolicy/policy/modules/services/radvd.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/radvd.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/radvd.if 2008-02-26 08:29:22.000000000 -0500
@@ -2,6 +2,25 @@
########################################
@@ -18321,7 +18361,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radv
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.3.1/policy/modules/services/radvd.te
--- nsaserefpolicy/policy/modules/services/radvd.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/radvd.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/radvd.te 2008-02-26 08:29:22.000000000 -0500
@@ -15,6 +15,9 @@
type radvd_etc_t;
files_config_file(radvd_etc_t)
@@ -18334,7 +18374,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radv
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.3.1/policy/modules/services/razor.fc
--- nsaserefpolicy/policy/modules/services/razor.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/razor.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/razor.fc 2008-02-26 08:29:22.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)
@@ -18343,7 +18383,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.3.1/policy/modules/services/razor.if
--- nsaserefpolicy/policy/modules/services/razor.if 2007-07-16 14:09:46.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/razor.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/razor.if 2008-02-26 08:29:22.000000000 -0500
@@ -137,6 +137,7 @@
template(`razor_per_role_template',`
gen_require(`
@@ -18414,7 +18454,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.3.1/policy/modules/services/razor.te
--- nsaserefpolicy/policy/modules/services/razor.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/razor.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/razor.te 2008-02-26 08:29:22.000000000 -0500
@@ -23,6 +23,12 @@
razor_common_domain_template(razor)
@@ -18430,7 +18470,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/rdisc.if serefpolicy-3.3.1/policy/modules/services/rdisc.if
--- nsaserefpolicy/policy/modules/services/rdisc.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rdisc.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rdisc.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,20 @@
## <summary>Network router discovery daemon</summary>
+
@@ -18454,7 +18494,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rdis
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.if serefpolicy-3.3.1/policy/modules/services/remotelogin.if
--- nsaserefpolicy/policy/modules/services/remotelogin.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/remotelogin.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/remotelogin.if 2008-02-26 08:29:22.000000000 -0500
@@ -35,3 +35,4 @@
allow $1 remote_login_t:process signal;
@@ -18462,7 +18502,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.3.1/policy/modules/services/remotelogin.te
--- nsaserefpolicy/policy/modules/services/remotelogin.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/remotelogin.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/remotelogin.te 2008-02-26 08:29:22.000000000 -0500
@@ -85,6 +85,7 @@
miscfiles_read_localization(remote_login_t)
@@ -18473,7 +18513,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/ricci.if serefpolicy-3.3.1/policy/modules/services/ricci.if
--- nsaserefpolicy/policy/modules/services/ricci.if 2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ricci.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ricci.if 2008-02-26 08:29:22.000000000 -0500
@@ -165,3 +165,4 @@
domtrans_pattern($1,ricci_modstorage_exec_t,ricci_modstorage_t)
@@ -18481,7 +18521,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricc
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.3.1/policy/modules/services/rlogin.te
--- nsaserefpolicy/policy/modules/services/rlogin.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rlogin.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rlogin.te 2008-02-26 08:29:22.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)
@@ -18521,7 +18561,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlog
-')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.fc serefpolicy-3.3.1/policy/modules/services/roundup.fc
--- nsaserefpolicy/policy/modules/services/roundup.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/roundup.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/roundup.fc 2008-02-26 08:29:22.000000000 -0500
@@ -7,3 +7,5 @@
# /var
#
@@ -18530,7 +18570,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roun
+/etc/rc.d/init.d/roundup -- gen_context(system_u:object_r:roundup_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.if serefpolicy-3.3.1/policy/modules/services/roundup.if
--- nsaserefpolicy/policy/modules/services/roundup.if 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/roundup.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/roundup.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,68 @@
## <summary>Roundup Issue Tracking System policy</summary>
+
@@ -18602,7 +18642,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roun
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.te serefpolicy-3.3.1/policy/modules/services/roundup.te
--- nsaserefpolicy/policy/modules/services/roundup.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/roundup.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/roundup.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,9 @@
type roundup_var_lib_t;
files_type(roundup_var_lib_t)
@@ -18615,7 +18655,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roun
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.3.1/policy/modules/services/rpcbind.fc
--- nsaserefpolicy/policy/modules/services/rpcbind.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/rpcbind.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rpcbind.fc 2008-02-26 08:29:22.000000000 -0500
@@ -5,3 +5,5 @@
/var/run/rpc.statd\.pid -- gen_context(system_u:object_r:rpcbind_var_run_t,s0)
/var/run/rpcbind\.lock -- gen_context(system_u:object_r:rpcbind_var_run_t,s0)
@@ -18624,7 +18664,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcb
+/etc/rc.d/init.d/rpcbind -- gen_context(system_u:object_r:rpcbind_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.3.1/policy/modules/services/rpcbind.if
--- nsaserefpolicy/policy/modules/services/rpcbind.if 2007-07-16 14:09:46.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/rpcbind.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rpcbind.if 2008-02-26 08:29:22.000000000 -0500
@@ -95,3 +95,70 @@
manage_files_pattern($1,rpcbind_var_lib_t,rpcbind_var_lib_t)
files_search_var_lib($1)
@@ -18698,7 +18738,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcb
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.3.1/policy/modules/services/rpcbind.te
--- nsaserefpolicy/policy/modules/services/rpcbind.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rpcbind.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rpcbind.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,16 +16,21 @@
type rpcbind_var_lib_t;
files_type(rpcbind_var_lib_t)
@@ -18732,7 +18772,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.3.1/policy/modules/services/rpc.if
--- nsaserefpolicy/policy/modules/services/rpc.if 2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rpc.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rpc.if 2008-02-26 08:29:22.000000000 -0500
@@ -88,8 +88,11 @@
# bind to arbitary unused ports
corenet_tcp_bind_generic_port($1_t)
@@ -18773,7 +18813,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.3.1/policy/modules/services/rpc.te
--- nsaserefpolicy/policy/modules/services/rpc.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rpc.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rpc.te 2008-02-26 08:29:22.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)
@@ -18858,7 +18898,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.3.1/policy/modules/services/rshd.te
--- nsaserefpolicy/policy/modules/services/rshd.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rshd.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rshd.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,7 +16,7 @@
#
# Local policy
@@ -18921,7 +18961,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.3.1/policy/modules/services/rsync.fc
--- nsaserefpolicy/policy/modules/services/rsync.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rsync.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rsync.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,2 +1,4 @@
/usr/bin/rsync -- gen_context(system_u:object_r:rsync_exec_t,s0)
@@ -18929,7 +18969,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.3.1/policy/modules/services/rsync.te
--- nsaserefpolicy/policy/modules/services/rsync.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rsync.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rsync.te 2008-02-26 08:29:22.000000000 -0500
@@ -31,6 +31,9 @@
type rsync_data_t;
files_type(rsync_data_t)
@@ -18977,7 +19017,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsyn
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.fc serefpolicy-3.3.1/policy/modules/services/rwho.fc
--- nsaserefpolicy/policy/modules/services/rwho.fc 2007-09-12 10:34:18.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/rwho.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rwho.fc 2008-02-26 08:29:22.000000000 -0500
@@ -3,3 +3,5 @@
/var/spool/rwho(/.*)? gen_context(system_u:object_r:rwho_spool_t,s0)
@@ -18986,7 +19026,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
+/etc/rc.d/init.d/rwhod -- gen_context(system_u:object_r:rwho_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.3.1/policy/modules/services/rwho.if
--- nsaserefpolicy/policy/modules/services/rwho.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rwho.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rwho.if 2008-02-26 08:29:22.000000000 -0500
@@ -118,6 +118,25 @@
########################################
@@ -19039,7 +19079,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-3.3.1/policy/modules/services/rwho.te
--- nsaserefpolicy/policy/modules/services/rwho.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/rwho.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/rwho.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,9 @@
type rwho_spool_t;
files_type(rwho_spool_t)
@@ -19052,7 +19092,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho
# rwho local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.3.1/policy/modules/services/samba.fc
--- nsaserefpolicy/policy/modules/services/samba.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/samba.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/samba.fc 2008-02-26 08:29:22.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)
@@ -19080,7 +19120,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samb
+/etc/rc.d/init.d/smb -- gen_context(system_u:object_r:samba_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.3.1/policy/modules/services/samba.if
--- nsaserefpolicy/policy/modules/services/samba.if 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/samba.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/samba.if 2008-02-26 08:29:22.000000000 -0500
@@ -331,6 +331,25 @@
########################################
@@ -19339,7 +19379,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.3.1/policy/modules/services/samba.te
--- nsaserefpolicy/policy/modules/services/samba.te 2008-02-19 17:24:26.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/samba.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/samba.te 2008-02-26 08:29:22.000000000 -0500
@@ -59,6 +59,13 @@
## </desc>
gen_tunable(samba_share_nfs,false)
@@ -19647,7 +19687,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.fc serefpolicy-3.3.1/policy/modules/services/sasl.fc
--- nsaserefpolicy/policy/modules/services/sasl.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/sasl.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/sasl.fc 2008-02-26 08:29:22.000000000 -0500
@@ -8,3 +8,5 @@
# /var
#
@@ -19656,7 +19696,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl
+/etc/rc.d/init.d/sasl -- gen_context(system_u:object_r:sasl_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.if serefpolicy-3.3.1/policy/modules/services/sasl.if
--- nsaserefpolicy/policy/modules/services/sasl.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/sasl.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/sasl.if 2008-02-26 08:29:22.000000000 -0500
@@ -21,6 +21,25 @@
########################################
@@ -19713,7 +19753,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.3.1/policy/modules/services/sasl.te
--- nsaserefpolicy/policy/modules/services/sasl.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/sasl.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/sasl.te 2008-02-26 08:29:22.000000000 -0500
@@ -23,6 +23,9 @@
type saslauthd_var_run_t;
files_pid_file(saslauthd_var_run_t)
@@ -19737,7 +19777,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.3.1/policy/modules/services/sendmail.if
--- nsaserefpolicy/policy/modules/services/sendmail.if 2007-08-27 13:57:20.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/sendmail.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/sendmail.if 2008-02-26 08:29:22.000000000 -0500
@@ -149,3 +149,85 @@
logging_log_filetrans($1,sendmail_log_t,file)
@@ -19826,7 +19866,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.3.1/policy/modules/services/sendmail.te
--- nsaserefpolicy/policy/modules/services/sendmail.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/sendmail.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/sendmail.te 2008-02-26 09:14:48.000000000 -0500
@@ -20,13 +20,17 @@
mta_mailserver_delivery(sendmail_t)
mta_mailserver_sender(sendmail_t)
@@ -19843,7 +19883,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
-allow sendmail_t self:capability { setuid setgid net_bind_service sys_nice chown sys_tty_config };
-allow sendmail_t self:process signal;
+allow sendmail_t self:capability { dac_override setuid setgid net_bind_service sys_nice chown sys_tty_config };
-+allow sendmail_t self:process { signal signull };
++allow sendmail_t self:process { setrlimit signal signull };
allow sendmail_t self:fifo_file rw_fifo_file_perms;
allow sendmail_t self:unix_stream_socket create_stream_socket_perms;
allow sendmail_t self:unix_dgram_socket create_socket_perms;
@@ -19855,7 +19895,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
corenet_all_recvfrom_unlabeled(sendmail_t)
corenet_all_recvfrom_netlabel(sendmail_t)
-@@ -69,13 +74,16 @@
+@@ -69,19 +74,23 @@
# for piping mail to a command
corecmd_exec_shell(sendmail_t)
@@ -19872,7 +19912,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
init_use_fds(sendmail_t)
init_use_script_ptys(sendmail_t)
-@@ -97,20 +105,35 @@
+ # sendmail wants to read /var/run/utmp if the controlling tty is /dev/console
+ init_read_utmp(sendmail_t)
+ init_dontaudit_write_utmp(sendmail_t)
++init_rw_script_tmp_files(sendmail_t)
+
+ auth_use_nsswitch(sendmail_t)
+
+@@ -97,20 +106,35 @@
userdom_dontaudit_use_unpriv_user_fds(sendmail_t)
userdom_dontaudit_search_sysadm_home_dirs(sendmail_t)
@@ -19909,7 +19956,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)
-@@ -118,6 +141,7 @@
+@@ -118,6 +142,7 @@
optional_policy(`
procmail_domtrans(sendmail_t)
@@ -19917,7 +19964,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/send
')
optional_policy(`
-@@ -125,24 +149,25 @@
+@@ -125,24 +150,25 @@
')
optional_policy(`
@@ -19961,7 +20008,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.fc serefpolicy-3.3.1/policy/modules/services/setroubleshoot.fc
--- nsaserefpolicy/policy/modules/services/setroubleshoot.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/setroubleshoot.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/setroubleshoot.fc 2008-02-26 08:29:22.000000000 -0500
@@ -5,3 +5,5 @@
/var/log/setroubleshoot(/.*)? gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
@@ -19970,7 +20017,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
+/etc/rc.d/init.d/setroubleshoot -- gen_context(system_u:object_r:setroubleshoot_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.3.1/policy/modules/services/setroubleshoot.if
--- nsaserefpolicy/policy/modules/services/setroubleshoot.if 2007-09-04 15:22:23.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/setroubleshoot.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/setroubleshoot.if 2008-02-26 08:29:22.000000000 -0500
@@ -16,8 +16,8 @@
')
@@ -20059,7 +20106,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setr
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.3.1/policy/modules/services/setroubleshoot.te
--- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/setroubleshoot.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/setroubleshoot.te 2008-02-26 08:29:22.000000000 -0500
@@ -22,13 +22,16 @@
type setroubleshoot_var_run_t;
files_pid_file(setroubleshoot_var_run_t)
@@ -20138,7 +20185,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/smartmon.fc serefpolicy-3.3.1/policy/modules/services/smartmon.fc
--- nsaserefpolicy/policy/modules/services/smartmon.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/smartmon.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/smartmon.fc 2008-02-26 08:29:22.000000000 -0500
@@ -8,3 +8,4 @@
#
/var/run/smartd\.pid -- gen_context(system_u:object_r:fsdaemon_var_run_t,s0)
@@ -20146,7 +20193,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smar
+/etc/rc.d/init.d/smartd -- gen_context(system_u:object_r:smartmon_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.if serefpolicy-3.3.1/policy/modules/services/smartmon.if
--- nsaserefpolicy/policy/modules/services/smartmon.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/smartmon.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/smartmon.if 2008-02-26 08:29:22.000000000 -0500
@@ -20,6 +20,25 @@
########################################
@@ -20199,7 +20246,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smar
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.3.1/policy/modules/services/smartmon.te
--- nsaserefpolicy/policy/modules/services/smartmon.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/smartmon.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/smartmon.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,6 +16,9 @@
type fsdaemon_tmp_t;
files_tmp_file(fsdaemon_tmp_t)
@@ -20212,7 +20259,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smar
# Local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.3.1/policy/modules/services/snmp.fc
--- nsaserefpolicy/policy/modules/services/snmp.fc 2007-06-19 16:23:06.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/snmp.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/snmp.fc 2008-02-26 08:29:22.000000000 -0500
@@ -17,3 +17,6 @@
/var/run/snmpd -d gen_context(system_u:object_r:snmpd_var_run_t,s0)
@@ -20222,7 +20269,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
+/etc/rc.d/init.d/snmptrapd -- gen_context(system_u:object_r:snmp_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.3.1/policy/modules/services/snmp.if
--- nsaserefpolicy/policy/modules/services/snmp.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/snmp.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/snmp.if 2008-02-26 08:29:22.000000000 -0500
@@ -87,6 +87,25 @@
########################################
@@ -20279,7 +20326,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.3.1/policy/modules/services/snmp.te
--- nsaserefpolicy/policy/modules/services/snmp.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/snmp.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/snmp.te 2008-02-26 08:29:22.000000000 -0500
@@ -18,6 +18,9 @@
type snmpd_var_lib_t;
files_type(snmpd_var_lib_t)
@@ -20310,7 +20357,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.3.1/policy/modules/services/soundserver.fc
--- nsaserefpolicy/policy/modules/services/soundserver.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/soundserver.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/soundserver.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,10 +1,12 @@
-/etc/nas(/.*)? gen_context(system_u:object_r:soundd_etc_t,s0)
-/etc/yiff(/.*)? gen_context(system_u:object_r:soundd_etc_t,s0)
@@ -20329,7 +20376,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soun
+/etc/rc.d/init.d/nasd -- gen_context(system_u:object_r:soundd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.if serefpolicy-3.3.1/policy/modules/services/soundserver.if
--- nsaserefpolicy/policy/modules/services/soundserver.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/soundserver.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/soundserver.if 2008-02-26 08:29:22.000000000 -0500
@@ -13,3 +13,74 @@
interface(`soundserver_tcp_connect',`
refpolicywarn(`$0($*) has been deprecated.')
@@ -20407,7 +20454,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soun
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.te serefpolicy-3.3.1/policy/modules/services/soundserver.te
--- nsaserefpolicy/policy/modules/services/soundserver.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/soundserver.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/soundserver.te 2008-02-26 08:29:22.000000000 -0500
@@ -10,9 +10,6 @@
type soundd_exec_t;
init_daemon_domain(soundd_t,soundd_exec_t)
@@ -20478,7 +20525,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.3.1/policy/modules/services/spamassassin.fc
--- nsaserefpolicy/policy/modules/services/spamassassin.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/spamassassin.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/spamassassin.fc 2008-02-26 08:29:22.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)
@@ -20505,7 +20552,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
+/etc/rc.d/init.d/spamd -- gen_context(system_u:object_r:spamd_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.3.1/policy/modules/services/spamassassin.if
--- nsaserefpolicy/policy/modules/services/spamassassin.if 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/spamassassin.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/spamassassin.if 2008-02-26 08:29:22.000000000 -0500
@@ -34,10 +34,11 @@
# cjp: when tunables are available, spamc stuff should be
# toggled on activation of spamc, and similarly for spamd.
@@ -21072,7 +21119,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.3.1/policy/modules/services/spamassassin.te
--- nsaserefpolicy/policy/modules/services/spamassassin.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/spamassassin.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/spamassassin.te 2008-02-26 08:33:39.000000000 -0500
@@ -21,8 +21,9 @@
gen_tunable(spamd_enable_home_dirs,true)
@@ -21117,6 +21164,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spam
########################################
#
+@@ -53,7 +70,7 @@
+ # setuids to the user running spamc. Comment this if you are not
+ # using this ability.
+
+-allow spamd_t self:capability { setuid setgid dac_override sys_tty_config };
++allow spamd_t self:capability { kill setuid setgid dac_override sys_tty_config };
+ dontaudit spamd_t self:capability sys_tty_config;
+ allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow spamd_t self:fd use;
@@ -71,6 +88,9 @@
allow spamd_t self:udp_socket create_socket_perms;
allow spamd_t self:netlink_route_socket r_netlink_socket_perms;
@@ -21400,7 +21456,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.3.1/policy/modules/services/squid.fc
--- nsaserefpolicy/policy/modules/services/squid.fc 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/squid.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/squid.fc 2008-02-26 08:29:22.000000000 -0500
@@ -12,3 +12,8 @@
/var/run/squid\.pid -- gen_context(system_u:object_r:squid_var_run_t,s0)
@@ -21412,7 +21468,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.if serefpolicy-3.3.1/policy/modules/services/squid.if
--- nsaserefpolicy/policy/modules/services/squid.if 2007-05-07 10:32:44.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/squid.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/squid.if 2008-02-26 08:29:22.000000000 -0500
@@ -131,3 +131,95 @@
interface(`squid_use',`
refpolicywarn(`$0($*) has been deprecated.')
@@ -21511,7 +21567,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.3.1/policy/modules/services/squid.te
--- nsaserefpolicy/policy/modules/services/squid.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/squid.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/squid.te 2008-02-26 08:29:22.000000000 -0500
@@ -31,12 +31,15 @@
type squid_var_run_t;
files_pid_file(squid_var_run_t)
@@ -21586,7 +21642,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.3.1/policy/modules/services/ssh.fc
--- nsaserefpolicy/policy/modules/services/ssh.fc 2007-10-12 08:56:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/ssh.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ssh.fc 2008-02-26 08:29:22.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)
@@ -21595,7 +21651,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.3.1/policy/modules/services/ssh.if
--- nsaserefpolicy/policy/modules/services/ssh.if 2008-02-06 10:33:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ssh.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ssh.if 2008-02-26 08:29:22.000000000 -0500
@@ -36,6 +36,7 @@
gen_require(`
attribute ssh_server;
@@ -21766,7 +21822,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.
optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.3.1/policy/modules/services/ssh.te
--- nsaserefpolicy/policy/modules/services/ssh.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ssh.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/ssh.te 2008-02-26 08:29:22.000000000 -0500
@@ -24,7 +24,7 @@
# Type for the ssh-agent executable.
@@ -21827,7 +21883,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.3.1/policy/modules/services/telnet.te
--- nsaserefpolicy/policy/modules/services/telnet.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/telnet.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/telnet.te 2008-02-26 08:29:22.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)
@@ -21878,7 +21934,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.3.1/policy/modules/services/tftp.fc
--- nsaserefpolicy/policy/modules/services/tftp.fc 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/tftp.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/tftp.fc 2008-02-26 08:29:22.000000000 -0500
@@ -4,5 +4,5 @@
/tftpboot -d gen_context(system_u:object_r:tftpdir_t,s0)
@@ -21888,7 +21944,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.if serefpolicy-3.3.1/policy/modules/services/tftp.if
--- nsaserefpolicy/policy/modules/services/tftp.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/tftp.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/tftp.if 2008-02-26 08:29:22.000000000 -0500
@@ -31,10 +31,10 @@
allow $1 tftp_t:process { ptrace signal_perms getattr };
ps_process_pattern($1, tftp_t)
@@ -21905,7 +21961,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.3.1/policy/modules/services/tftp.te
--- nsaserefpolicy/policy/modules/services/tftp.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/tftp.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/tftp.te 2008-02-26 08:29:22.000000000 -0500
@@ -37,7 +37,6 @@
allow tftpd_t self:udp_socket create_socket_perms;
allow tftpd_t self:unix_dgram_socket create_socket_perms;
@@ -21950,13 +22006,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/timidity.if serefpolicy-3.3.1/policy/modules/services/timidity.if
--- nsaserefpolicy/policy/modules/services/timidity.if 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/timidity.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/timidity.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,2 @@
## <summary>MIDI to WAV converter and player configured as a service</summary>
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.fc serefpolicy-3.3.1/policy/modules/services/tor.fc
--- nsaserefpolicy/policy/modules/services/tor.fc 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/tor.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/tor.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,8 +1,10 @@
/etc/tor(/.*)? gen_context(system_u:object_r:tor_etc_t,s0)
@@ -21971,7 +22027,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.
+/etc/rc.d/init.d/tor -- gen_context(system_u:object_r:tor_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-3.3.1/policy/modules/services/tor.if
--- nsaserefpolicy/policy/modules/services/tor.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/tor.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/tor.if 2008-02-26 08:29:22.000000000 -0500
@@ -20,6 +20,25 @@
########################################
@@ -22032,7 +22088,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.3.1/policy/modules/services/tor.te
--- nsaserefpolicy/policy/modules/services/tor.te 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/tor.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/tor.te 2008-02-26 08:29:22.000000000 -0500
@@ -26,6 +26,9 @@
type tor_var_run_t;
files_pid_file(tor_var_run_t)
@@ -22045,7 +22101,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.
# tor local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.if serefpolicy-3.3.1/policy/modules/services/uucp.if
--- nsaserefpolicy/policy/modules/services/uucp.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/uucp.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/uucp.if 2008-02-26 08:29:22.000000000 -0500
@@ -94,18 +94,18 @@
ps_process_pattern($1, uucp_t)
@@ -22073,13 +22129,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-3.3.1/policy/modules/services/w3c.fc
--- nsaserefpolicy/policy/modules/services/w3c.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/w3c.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/w3c.fc 2008-02-26 08:29:22.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.3.1/policy/modules/services/w3c.if
--- nsaserefpolicy/policy/modules/services/w3c.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/w3c.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/w3c.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,20 @@
+## <summary>W3C</summary>
+
@@ -22103,7 +22159,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.3.1/policy/modules/services/w3c.te
--- nsaserefpolicy/policy/modules/services/w3c.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/w3c.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/w3c.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,14 @@
+policy_module(w3c,1.2.1)
+
@@ -22121,19 +22177,19 @@ 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/watchdog.if serefpolicy-3.3.1/policy/modules/services/watchdog.if
--- nsaserefpolicy/policy/modules/services/watchdog.if 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/watchdog.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/watchdog.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,2 @@
## <summary>Software watchdog</summary>
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xprint.if serefpolicy-3.3.1/policy/modules/services/xprint.if
--- nsaserefpolicy/policy/modules/services/xprint.if 2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/xprint.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/xprint.if 2008-02-26 08:29:22.000000000 -0500
@@ -1 +1,2 @@
## <summary>X print server</summary>
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.3.1/policy/modules/services/xserver.fc
--- nsaserefpolicy/policy/modules/services/xserver.fc 2007-10-15 16:11:05.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/xserver.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/xserver.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,13 +1,13 @@
#
# HOME_DIR
@@ -22202,12 +22258,11 @@ 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.3.1/policy/modules/services/xserver.if
--- nsaserefpolicy/policy/modules/services/xserver.if 2007-12-04 11:02:50.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-02-26 08:24:18.000000000 -0500
-@@ -15,6 +15,12 @@
++++ serefpolicy-3.3.1/policy/modules/services/xserver.if 2008-02-26 09:47:22.000000000 -0500
+@@ -15,6 +15,11 @@
template(`xserver_common_domain_template',`
gen_require(`
type xkb_var_lib_t, xserver_exec_t, xserver_log_t;
-+ type xdm_xserver_tmp_t;
+ attribute x_server_domain;
+ type x_rootwindow_t, x_rootcolormap_t, x_rootscreen_t;
+ class x_drawable all_x_drawable_perms;
@@ -22216,7 +22271,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
')
##############################
-@@ -22,7 +28,10 @@
+@@ -22,7 +27,10 @@
# Declarations
#
@@ -22228,7 +22283,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
domain_type($1_xserver_t)
domain_entry_file($1_xserver_t,xserver_exec_t)
-@@ -45,7 +54,7 @@
+@@ -45,7 +53,7 @@
# execheap needed until the X module loader is fixed.
# NVIDIA Needs execstack
@@ -22237,7 +22292,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
dontaudit $1_xserver_t self:capability chown;
allow $1_xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
allow $1_xserver_t self:memprotect mmap_zero;
-@@ -83,6 +92,11 @@
+@@ -83,6 +91,11 @@
manage_files_pattern($1_xserver_t,xserver_log_t,xserver_log_t)
logging_log_filetrans($1_xserver_t,xserver_log_t,file)
@@ -22249,7 +22304,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
kernel_read_system_state($1_xserver_t)
kernel_read_device_sysctls($1_xserver_t)
kernel_read_modprobe_sysctls($1_xserver_t)
-@@ -115,18 +129,23 @@
+@@ -115,18 +128,23 @@
dev_rw_agp($1_xserver_t)
dev_rw_framebuffer($1_xserver_t)
dev_manage_dri_dev($1_xserver_t)
@@ -22275,7 +22330,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
files_read_etc_files($1_xserver_t)
files_read_etc_runtime_files($1_xserver_t)
-@@ -140,12 +159,16 @@
+@@ -140,12 +158,16 @@
fs_getattr_xattr_fs($1_xserver_t)
fs_search_nfs($1_xserver_t)
fs_search_auto_mountpoints($1_xserver_t)
@@ -22293,7 +22348,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
term_setattr_unallocated_ttys($1_xserver_t)
term_use_unallocated_ttys($1_xserver_t)
-@@ -153,13 +176,17 @@
+@@ -153,13 +175,17 @@
libs_use_shared_libs($1_xserver_t)
logging_send_syslog_msg($1_xserver_t)
@@ -22312,7 +22367,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
ifndef(`distro_redhat',`
allow $1_xserver_t self:process { execmem execheap execstack };
-@@ -169,6 +196,46 @@
+@@ -169,6 +195,46 @@
allow $1_xserver_t self:process { execmem execheap execstack };
')
@@ -22359,7 +22414,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
optional_policy(`
apm_stream_connect($1_xserver_t)
')
-@@ -223,8 +290,10 @@
+@@ -223,8 +289,10 @@
template(`xserver_per_role_template',`
gen_require(`
@@ -22372,7 +22427,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
')
##############################
-@@ -232,189 +301,119 @@
+@@ -232,189 +300,119 @@
# Declarations
#
@@ -22493,16 +22548,16 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
optional_policy(`
- userhelper_search_config($1_xserver_t)
-- ')
--
++ userhelper_search_config(xdm_xserver_t)
+ ')
+
- ifdef(`TODO',`
- ifdef(`xdm.te', `
- allow $1_t xdm_tmp_t:sock_file unlink;
- allow $1_xserver_t xdm_var_run_t:dir search;
-+ userhelper_search_config(xdm_xserver_t)
- ')
+- ')
- ') dnl end TODO
-
+-
##############################
#
- # $1_xauth_t Local policy
@@ -22511,11 +22566,11 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
- allow $1_xauth_t self:process signal;
- allow $1_xauth_t self:unix_stream_socket create_stream_socket_perms;
-+ domtrans_pattern($2, xauth_exec_t, xauth_t)
-
+-
- allow $1_xauth_t $1_xauth_home_t:file manage_file_perms;
- userdom_user_home_dir_filetrans($1,$1_xauth_t,$1_xauth_home_t,file)
--
++ domtrans_pattern($2, xauth_exec_t, xauth_t)
+
- manage_dirs_pattern($1_xauth_t,$1_xauth_tmp_t,$1_xauth_tmp_t)
- manage_files_pattern($1_xauth_t,$1_xauth_tmp_t,$1_xauth_tmp_t)
- files_tmp_filetrans($1_xauth_t, $1_xauth_tmp_t, { file dir })
@@ -22533,10 +22588,10 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
-
- allow xdm_t $1_xauth_home_t:file manage_file_perms;
- userdom_user_home_dir_filetrans($1,xdm_t,$1_xauth_home_t,file)
+-
+- domain_use_interactive_fds($1_xauth_t)
+ ps_process_pattern($2,xauth_t)
-- domain_use_interactive_fds($1_xauth_t)
--
- files_read_etc_files($1_xauth_t)
- files_search_pids($1_xauth_t)
-
@@ -22599,34 +22654,34 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
+ optional_policy(`
+ xserver_read_user_iceauth($1, $2)
+ ')
-
-- libs_use_ld_so($1_iceauth_t)
-- libs_use_shared_libs($1_iceauth_t)
++
+ ##############################
+ #
+ # User X object manager local policy
+ #
-- userdom_use_user_terminals($1,$1_iceauth_t)
+- libs_use_ld_so($1_iceauth_t)
+- libs_use_shared_libs($1_iceauth_t)
+ # Device rules
+ allow xdm_x_domain $2:x_device { read getattr setattr setfocus grab bell };
+- userdom_use_user_terminals($1,$1_iceauth_t)
++ allow $2 { input_xevent_t xdm_input_xevent_type }:x_event send;
++ allow $2 { x_rootwindow_t xdm_x_domain }:x_drawable send;
+
- tunable_policy(`use_nfs_home_dirs',`
- fs_manage_nfs_files($1_iceauth_t)
- ')
-+ allow $2 { input_xevent_t xdm_input_xevent_type }:x_event send;
-+ allow $2 { x_rootwindow_t xdm_x_domain }:x_drawable send;
++ mls_xwin_read_to_clearance($2)
- tunable_policy(`use_samba_home_dirs',`
- fs_manage_cifs_files($1_iceauth_t)
- ')
-+ mls_xwin_read_to_clearance($2)
-+
+ xserver_user_x_domain_template($1,$1_t,$1_t,$1_tmpfs_t)
')
#######################################
-@@ -521,19 +520,18 @@
+@@ -521,19 +519,18 @@
## </param>
#
template(`xserver_user_client_template',`
@@ -22654,7 +22709,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
# for when /tmp/.X11-unix is created by the system
allow $2 xdm_t:fd use;
-@@ -542,25 +540,356 @@
+@@ -542,25 +539,356 @@
allow $2 xdm_tmp_t:sock_file { read write };
dontaudit $2 xdm_t:tcp_socket { read write };
@@ -23017,7 +23072,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
')
')
-@@ -593,26 +922,44 @@
+@@ -593,26 +921,44 @@
#
template(`xserver_use_user_fonts',`
gen_require(`
@@ -23069,15 +23124,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
## Transition to a user Xauthority domain.
## </summary>
## <desc>
-@@ -638,10 +985,77 @@
+@@ -638,10 +984,77 @@
#
template(`xserver_domtrans_user_xauth',`
gen_require(`
- type $1_xauth_t, xauth_exec_t;
+ type xauth_exec_t, xauth_t;
- ')
-
-- domtrans_pattern($2, xauth_exec_t, $1_xauth_t)
++ ')
++
+ domtrans_pattern($2, xauth_exec_t, xauth_t)
+')
+
@@ -23142,14 +23196,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
+template(`xserver_read_user_iceauth',`
+ gen_require(`
+ type user_iceauth_home_t;
-+ ')
-+
+ ')
+
+- domtrans_pattern($2, xauth_exec_t, $1_xauth_t)
+ # Read .Iceauthority file
+ allow $2 user_iceauth_home_t:file { getattr read };
')
########################################
-@@ -671,10 +1085,10 @@
+@@ -671,10 +1084,10 @@
#
template(`xserver_user_home_dir_filetrans_user_xauth',`
gen_require(`
@@ -23162,7 +23217,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
')
########################################
-@@ -760,7 +1174,7 @@
+@@ -760,7 +1173,7 @@
type xconsole_device_t;
')
@@ -23171,7 +23226,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
')
########################################
-@@ -860,6 +1274,25 @@
+@@ -860,6 +1273,25 @@
########################################
## <summary>
@@ -23197,7 +23252,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
## Read xdm-writable configuration files.
## </summary>
## <param name="domain">
-@@ -914,6 +1347,7 @@
+@@ -914,6 +1346,7 @@
files_search_tmp($1)
allow $1 xdm_tmp_t:dir list_dir_perms;
create_sock_files_pattern($1,xdm_tmp_t,xdm_tmp_t)
@@ -23205,7 +23260,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
')
########################################
-@@ -955,6 +1389,24 @@
+@@ -955,6 +1388,24 @@
########################################
## <summary>
@@ -23230,7 +23285,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
## Execute the X server in the XDM X server domain.
## </summary>
## <param name="domain">
-@@ -965,15 +1417,47 @@
+@@ -965,15 +1416,47 @@
#
interface(`xserver_domtrans_xdm_xserver',`
gen_require(`
@@ -23279,7 +23334,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
## Make an X session script an entrypoint for the specified domain.
## </summary>
## <param name="domain">
-@@ -1123,7 +1607,7 @@
+@@ -1123,7 +1606,7 @@
type xdm_xserver_tmp_t;
')
@@ -23288,7 +23343,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
')
########################################
-@@ -1312,3 +1796,108 @@
+@@ -1312,3 +1795,108 @@
files_search_tmp($1)
stream_connect_pattern($1,xdm_xserver_tmp_t,xdm_xserver_tmp_t,xdm_xserver_t)
')
@@ -23399,7 +23454,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.3.1/policy/modules/services/xserver.te
--- nsaserefpolicy/policy/modules/services/xserver.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/xserver.te 2008-02-26 08:29:22.000000000 -0500
@@ -16,21 +16,79 @@
## <desc>
@@ -23958,7 +24013,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.fc serefpolicy-3.3.1/policy/modules/services/zabbix.fc
--- nsaserefpolicy/policy/modules/services/zabbix.fc 2007-04-11 15:52:54.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/services/zabbix.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/zabbix.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,5 +1,8 @@
+
/usr/bin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0)
@@ -23970,7 +24025,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabb
+/etc/rc.d/init.d/zabbix -- gen_context(system_u:object_r:zabbix_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.if serefpolicy-3.3.1/policy/modules/services/zabbix.if
--- nsaserefpolicy/policy/modules/services/zabbix.if 2008-02-06 10:33:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/zabbix.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/zabbix.if 2008-02-26 08:29:22.000000000 -0500
@@ -79,6 +79,25 @@
########################################
@@ -24029,7 +24084,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabb
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.te serefpolicy-3.3.1/policy/modules/services/zabbix.te
--- nsaserefpolicy/policy/modules/services/zabbix.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/zabbix.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/zabbix.te 2008-02-26 08:29:22.000000000 -0500
@@ -18,6 +18,9 @@
type zabbix_var_run_t;
files_pid_file(zabbix_var_run_t)
@@ -24042,7 +24097,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabb
# zabbix local policy
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.fc serefpolicy-3.3.1/policy/modules/services/zebra.fc
--- nsaserefpolicy/policy/modules/services/zebra.fc 2006-11-16 17:15:20.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/zebra.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/zebra.fc 2008-02-26 08:29:22.000000000 -0500
@@ -14,3 +14,10 @@
/var/run/\.zebra -s gen_context(system_u:object_r:zebra_var_run_t,s0)
/var/run/\.zserv -s gen_context(system_u:object_r:zebra_var_run_t,s0)
@@ -24056,7 +24111,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebr
+/etc/rc.d/init.d/zebra -- gen_context(system_u:object_r:zebra_script_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.3.1/policy/modules/services/zebra.if
--- nsaserefpolicy/policy/modules/services/zebra.if 2008-02-06 10:33:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/zebra.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/zebra.if 2008-02-26 08:29:22.000000000 -0500
@@ -18,12 +18,32 @@
files_search_etc($1)
@@ -24133,7 +24188,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebr
')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-3.3.1/policy/modules/services/zebra.te
--- nsaserefpolicy/policy/modules/services/zebra.te 2008-02-06 10:33:21.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/zebra.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/services/zebra.te 2008-02-26 08:29:22.000000000 -0500
@@ -30,6 +30,9 @@
type zebra_var_run_t;
files_pid_file(zebra_var_run_t)
@@ -24155,7 +24210,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebr
allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.3.1/policy/modules/system/authlogin.fc
--- nsaserefpolicy/policy/modules/system/authlogin.fc 2008-02-19 17:24:26.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/authlogin.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/authlogin.fc 2008-02-26 08:29:22.000000000 -0500
@@ -40,6 +40,10 @@
/var/log/wtmp.* -- gen_context(system_u:object_r:wtmp_t,s0)
@@ -24170,7 +24225,7 @@ 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.3.1/policy/modules/system/authlogin.if
--- nsaserefpolicy/policy/modules/system/authlogin.if 2008-02-01 09:12:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/authlogin.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/authlogin.if 2008-02-26 08:29:22.000000000 -0500
@@ -99,7 +99,7 @@
template(`authlogin_per_role_template',`
@@ -24343,7 +24398,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.3.1/policy/modules/system/authlogin.te
--- nsaserefpolicy/policy/modules/system/authlogin.te 2008-02-19 17:24:26.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/authlogin.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/authlogin.te 2008-02-26 08:29:22.000000000 -0500
@@ -59,6 +59,9 @@
type utempter_exec_t;
application_domain(utempter_t,utempter_exec_t)
@@ -24403,7 +24458,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.3.1/policy/modules/system/fstools.fc
--- nsaserefpolicy/policy/modules/system/fstools.fc 2007-09-26 12:15:01.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/fstools.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/fstools.fc 2008-02-26 08:29:22.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)
@@ -24419,7 +24474,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.3.1/policy/modules/system/fstools.if
--- nsaserefpolicy/policy/modules/system/fstools.if 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/fstools.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/fstools.if 2008-02-26 08:29:22.000000000 -0500
@@ -81,10 +81,10 @@
#
interface(`fstools_read_pipes',`
@@ -24435,7 +24490,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.3.1/policy/modules/system/fstools.te
--- nsaserefpolicy/policy/modules/system/fstools.te 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/fstools.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/fstools.te 2008-02-26 08:29:22.000000000 -0500
@@ -97,6 +97,10 @@
fs_getattr_tmpfs_dirs(fsadm_t)
fs_read_tmpfs_symlinks(fsadm_t)
@@ -24456,7 +24511,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstool
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.3.1/policy/modules/system/hostname.te
--- nsaserefpolicy/policy/modules/system/hostname.te 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/hostname.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/hostname.te 2008-02-26 08:29:22.000000000 -0500
@@ -8,7 +8,9 @@
type hostname_t;
@@ -24470,7 +24525,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.3.1/policy/modules/system/hotplug.te
--- nsaserefpolicy/policy/modules/system/hotplug.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/hotplug.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/hotplug.te 2008-02-26 08:29:22.000000000 -0500
@@ -179,6 +179,7 @@
sysnet_read_dhcpc_pid(hotplug_t)
sysnet_rw_dhcp_config(hotplug_t)
@@ -24481,7 +24536,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.fc serefpolicy-3.3.1/policy/modules/system/init.fc
--- nsaserefpolicy/policy/modules/system/init.fc 2007-10-12 08:56:08.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/init.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/init.fc 2008-02-26 08:29:22.000000000 -0500
@@ -4,8 +4,7 @@
/etc/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0)
@@ -24499,7 +24554,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.f
-
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.3.1/policy/modules/system/init.if
--- nsaserefpolicy/policy/modules/system/init.if 2007-10-29 18:02:31.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/init.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/init.if 2008-02-26 10:48:51.000000000 -0500
@@ -211,6 +211,13 @@
kernel_dontaudit_use_fds($1)
')
@@ -24817,7 +24872,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.3.1/policy/modules/system/init.te
--- nsaserefpolicy/policy/modules/system/init.te 2008-02-26 08:17:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/init.te 2008-02-26 10:49:22.000000000 -0500
@@ -10,6 +10,20 @@
# Declarations
#
@@ -24898,7 +24953,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
ifdef(`distro_gentoo',`
allow init_t self:process { getcap setcap };
')
-@@ -163,12 +193,6 @@
+@@ -163,22 +193,31 @@
fs_tmpfs_filetrans(init_t,initctl_t,fifo_file)
')
@@ -24906,12 +24961,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
- # Run the shell in the sysadm role for single-user mode.
- # causes problems with upstart
- userdom_shell_domtrans_sysadm(init_t)
--')
--
++optional_policy(`
++ auth_rw_login_records(init_t)
+ ')
+
optional_policy(`
- auth_rw_login_records(init_t)
+- auth_rw_login_records(init_t)
++ # /var/run/dovecot/login/ssl-parameters.dat is a hard link to
++ # /var/lib/dovecot/ssl-parameters.dat and init tries to clean up
++ # the directory. But we do not want to allow this.
++ # The master process of dovecot will manage this file.
++ dovecot_dontaudit_unlink_lib_files(initrc_t)
')
-@@ -177,8 +201,15 @@
+
+ optional_policy(`
nscd_socket_use(init_t)
')
@@ -24929,7 +24992,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
')
########################################
-@@ -187,7 +218,7 @@
+@@ -187,7 +226,7 @@
#
allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched };
@@ -24938,7 +25001,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
dontaudit initrc_t self:capability sys_module; # sysctl is triggering this
allow initrc_t self:passwd rootok;
-@@ -201,10 +232,9 @@
+@@ -201,10 +240,9 @@
allow initrc_t initrc_devpts_t:chr_file rw_term_perms;
term_create_pty(initrc_t,initrc_devpts_t)
@@ -24951,7 +25014,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t)
manage_files_pattern(initrc_t,initrc_state_t,initrc_state_t)
-@@ -283,7 +313,6 @@
+@@ -283,7 +321,6 @@
mls_process_read_up(initrc_t)
mls_process_write_down(initrc_t)
mls_rangetrans_source(initrc_t)
@@ -24959,7 +25022,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
selinux_get_enforce_mode(initrc_t)
-@@ -496,6 +525,31 @@
+@@ -496,6 +533,31 @@
')
')
@@ -24991,7 +25054,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
optional_policy(`
amavis_search_lib(initrc_t)
amavis_setattr_pid_files(initrc_t)
-@@ -559,14 +613,6 @@
+@@ -559,14 +621,6 @@
')
optional_policy(`
@@ -25006,7 +25069,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
ftp_read_config(initrc_t)
')
-@@ -639,12 +685,6 @@
+@@ -639,12 +693,6 @@
mta_read_config(initrc_t)
mta_dontaudit_read_spool_symlinks(initrc_t)
')
@@ -25019,7 +25082,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
optional_policy(`
ifdef(`distro_redhat',`
-@@ -705,6 +745,9 @@
+@@ -705,6 +753,9 @@
# why is this needed:
rpm_manage_db(initrc_t)
@@ -25029,7 +25092,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
')
optional_policy(`
-@@ -717,9 +760,11 @@
+@@ -717,9 +768,11 @@
squid_manage_logs(initrc_t)
')
@@ -25044,7 +25107,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
')
optional_policy(`
-@@ -738,6 +783,11 @@
+@@ -738,6 +791,11 @@
uml_setattr_util_sockets(initrc_t)
')
@@ -25056,7 +25119,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
optional_policy(`
unconfined_domain(initrc_t)
-@@ -752,6 +802,10 @@
+@@ -752,6 +810,10 @@
')
optional_policy(`
@@ -25067,14 +25130,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.t
vmware_read_system_config(initrc_t)
vmware_append_system_config(initrc_t)
')
-@@ -774,3 +828,4 @@
+@@ -774,3 +836,4 @@
optional_policy(`
zebra_read_config(initrc_t)
')
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.3.1/policy/modules/system/iscsi.te
--- nsaserefpolicy/policy/modules/system/iscsi.te 2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/iscsi.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/iscsi.te 2008-02-26 08:29:22.000000000 -0500
@@ -63,6 +63,7 @@
corenet_tcp_sendrecv_all_ports(iscsid_t)
corenet_tcp_connect_http_port(iscsid_t)
@@ -25085,7 +25148,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.3.1/policy/modules/system/libraries.fc
--- nsaserefpolicy/policy/modules/system/libraries.fc 2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/libraries.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/libraries.fc 2008-02-26 08:29:22.000000000 -0500
@@ -133,6 +133,7 @@
/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -25140,7 +25203,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/librar
+/usr/lib64/jvm/java(.*/)bin(/.*)?/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.3.1/policy/modules/system/libraries.te
--- nsaserefpolicy/policy/modules/system/libraries.te 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/libraries.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/libraries.te 2008-02-26 08:29:22.000000000 -0500
@@ -23,6 +23,9 @@
init_system_domain(ldconfig_t,ldconfig_exec_t)
role system_r types ldconfig_t;
@@ -25197,7 +25260,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.3.1/policy/modules/system/locallogin.te
--- nsaserefpolicy/policy/modules/system/locallogin.te 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/locallogin.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/locallogin.te 2008-02-26 08:29:22.000000000 -0500
@@ -131,6 +131,7 @@
miscfiles_read_localization(local_login_t)
@@ -25229,7 +25292,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.3.1/policy/modules/system/logging.fc
--- nsaserefpolicy/policy/modules/system/logging.fc 2008-02-26 08:17:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/logging.fc 2008-02-26 08:27:07.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/logging.fc 2008-02-26 08:29:22.000000000 -0500
@@ -4,6 +4,7 @@
/etc/syslog.conf gen_context(system_u:object_r:syslog_conf_t,s0)
/etc/audit(/.*)? gen_context(system_u:object_r:auditd_etc_t,mls_systemhigh)
@@ -25256,7 +25319,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.3.1/policy/modules/system/logging.if
--- nsaserefpolicy/policy/modules/system/logging.if 2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/logging.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/logging.if 2008-02-26 08:29:22.000000000 -0500
@@ -213,12 +213,7 @@
## </param>
#
@@ -25271,7 +25334,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
')
########################################
-@@ -596,6 +572,8 @@
+@@ -596,6 +591,8 @@
files_search_var($1)
manage_files_pattern($1,logfile,logfile)
read_lnk_files_pattern($1,logfile,logfile)
@@ -25280,7 +25343,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
')
########################################
-@@ -705,6 +683,7 @@
+@@ -705,6 +702,7 @@
interface(`logging_admin_audit',`
gen_require(`
type auditd_t, auditd_etc_t, auditd_log_t;
@@ -25288,7 +25351,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
type auditd_var_run_t;
')
-@@ -719,6 +698,15 @@
+@@ -719,6 +717,15 @@
manage_dirs_pattern($1, auditd_var_run_t, auditd_var_run_t)
manage_files_pattern($1, auditd_var_run_t, auditd_var_run_t)
@@ -25304,7 +25367,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
')
########################################
-@@ -749,6 +737,7 @@
+@@ -749,6 +756,7 @@
type syslogd_tmp_t, syslogd_var_lib_t;
type syslogd_var_run_t, klogd_var_run_t;
type klogd_tmp_t, var_log_t;
@@ -25312,7 +25375,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
')
allow $1 syslogd_t:process { ptrace signal_perms };
-@@ -776,6 +765,13 @@
+@@ -776,6 +784,13 @@
manage_files_pattern($1, syslogd_var_run_t, syslogd_var_run_t)
logging_manage_all_logs($1)
@@ -25326,7 +25389,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
')
########################################
-@@ -804,3 +800,127 @@
+@@ -804,3 +819,127 @@
logging_admin_audit($1, $2, $3)
logging_admin_syslog($1, $2, $3)
')
@@ -25456,7 +25519,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.3.1/policy/modules/system/logging.te
--- nsaserefpolicy/policy/modules/system/logging.te 2008-02-26 08:17:43.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/logging.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/logging.te 2008-02-26 08:29:22.000000000 -0500
@@ -61,10 +61,23 @@
logging_log_file(var_log_t)
files_mountpoint(var_log_t)
@@ -25594,7 +25657,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/loggin
+#logging_audisp_system_domain(zos_remote_t, zos_remote_exec_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.3.1/policy/modules/system/lvm.te
--- nsaserefpolicy/policy/modules/system/lvm.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/lvm.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/lvm.te 2008-02-26 08:29:22.000000000 -0500
@@ -44,9 +44,9 @@
# Cluster LVM daemon local policy
#
@@ -25742,7 +25805,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.3.1/policy/modules/system/miscfiles.fc
--- nsaserefpolicy/policy/modules/system/miscfiles.fc 2007-08-22 17:33:53.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/miscfiles.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/miscfiles.fc 2008-02-26 08:29:22.000000000 -0500
@@ -80,3 +80,4 @@
/var/empty/sshd/etc/localtime -- gen_context(system_u:object_r:locale_t,s0)
/var/spool/postfix/etc/localtime -- gen_context(system_u:object_r:locale_t,s0)
@@ -25750,7 +25813,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfi
+HOME_DIR/\.fontconfig(/.*)? gen_context(system_u:object_r:user_fonts_home_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-3.3.1/policy/modules/system/miscfiles.if
--- nsaserefpolicy/policy/modules/system/miscfiles.if 2007-11-16 13:45:14.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/miscfiles.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/miscfiles.if 2008-02-26 08:29:22.000000000 -0500
@@ -489,3 +489,44 @@
manage_lnk_files_pattern($1,locale_t,locale_t)
')
@@ -25798,7 +25861,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfi
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.te serefpolicy-3.3.1/policy/modules/system/miscfiles.te
--- nsaserefpolicy/policy/modules/system/miscfiles.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/miscfiles.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/miscfiles.te 2008-02-26 08:29:22.000000000 -0500
@@ -20,6 +20,14 @@
files_type(fonts_t)
@@ -25816,7 +25879,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfi
type hwdata_t;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-3.3.1/policy/modules/system/modutils.if
--- nsaserefpolicy/policy/modules/system/modutils.if 2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/modutils.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/modutils.if 2008-02-26 08:29:22.000000000 -0500
@@ -66,6 +66,25 @@
########################################
@@ -25845,7 +25908,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.3.1/policy/modules/system/modutils.te
--- nsaserefpolicy/policy/modules/system/modutils.te 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/modutils.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/modutils.te 2008-02-26 08:29:22.000000000 -0500
@@ -42,7 +42,7 @@
# insmod local policy
#
@@ -25961,7 +26024,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/moduti
#################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.3.1/policy/modules/system/mount.fc
--- nsaserefpolicy/policy/modules/system/mount.fc 2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/mount.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/mount.fc 2008-02-26 08:29:22.000000000 -0500
@@ -1,4 +1,5 @@
/bin/mount.* -- gen_context(system_u:object_r:mount_exec_t,s0)
/bin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0)
@@ -25972,7 +26035,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.3.1/policy/modules/system/mount.te
--- nsaserefpolicy/policy/modules/system/mount.te 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/mount.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/mount.te 2008-02-26 08:29:22.000000000 -0500
@@ -18,17 +18,18 @@
init_system_domain(mount_t,mount_exec_t)
role system_r types mount_t;
@@ -26108,13 +26171,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.fc serefpolicy-3.3.1/policy/modules/system/qemu.fc
--- nsaserefpolicy/policy/modules/system/qemu.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/qemu.fc 2008-02-26 08:24:18.000000000 -0500
-@@ -0,0 +1,2 @@
++++ serefpolicy-3.3.1/policy/modules/system/qemu.fc 2008-02-26 10:01:33.000000000 -0500
+@@ -0,0 +1,3 @@
+
-+/usr/bin/qemu.* -- gen_context(system_u:object_r:qemu_exec_t,s0)
++/usr/bin/qemu -- gen_context(system_u:object_r:qemu_exec_t,s0)
++/usr/bin/qemu-kvm -- gen_context(system_u:object_r:qemu_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.if serefpolicy-3.3.1/policy/modules/system/qemu.if
--- nsaserefpolicy/policy/modules/system/qemu.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/qemu.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,290 @@
+
+## <summary>policy for qemu</summary>
@@ -26408,7 +26472,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.i
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.te serefpolicy-3.3.1/policy/modules/system/qemu.te
--- nsaserefpolicy/policy/modules/system/qemu.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/qemu.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/qemu.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,47 @@
+policy_module(qemu,1.0.0)
+
@@ -26459,7 +26523,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/qemu.t
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.3.1/policy/modules/system/raid.te
--- nsaserefpolicy/policy/modules/system/raid.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/raid.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/raid.te 2008-02-26 08:29:22.000000000 -0500
@@ -19,7 +19,7 @@
# Local policy
#
@@ -26487,7 +26551,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.3.1/policy/modules/system/selinuxutil.fc
--- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2007-05-18 11:12:44.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.fc 2008-02-26 08:29:22.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)
@@ -26499,7 +26563,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.3.1/policy/modules/system/selinuxutil.if
--- nsaserefpolicy/policy/modules/system/selinuxutil.if 2007-11-29 13:29:35.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.if 2008-02-26 08:29:22.000000000 -0500
@@ -215,8 +215,6 @@
seutil_domtrans_newrole($1)
role $2 types newrole_t;
@@ -26783,7 +26847,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.3.1/policy/modules/system/selinuxutil.te
--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/selinuxutil.te 2008-02-26 08:29:22.000000000 -0500
@@ -75,7 +75,6 @@
type restorecond_exec_t;
init_daemon_domain(restorecond_t,restorecond_exec_t)
@@ -27041,7 +27105,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
optional_policy(`
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.3.1/policy/modules/system/setrans.te
--- nsaserefpolicy/policy/modules/system/setrans.te 2007-10-02 09:54:52.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/setrans.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/setrans.te 2008-02-26 08:29:22.000000000 -0500
@@ -28,7 +28,7 @@
#
@@ -27053,7 +27117,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setran
allow setrans_t self:netlink_selinux_socket create_socket_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.3.1/policy/modules/system/sysnetwork.if
--- nsaserefpolicy/policy/modules/system/sysnetwork.if 2007-07-16 14:09:49.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.if 2008-02-26 08:29:22.000000000 -0500
@@ -145,6 +145,25 @@
########################################
@@ -27152,7 +27216,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.3.1/policy/modules/system/sysnetwork.te
--- nsaserefpolicy/policy/modules/system/sysnetwork.te 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/sysnetwork.te 2008-02-26 08:29:22.000000000 -0500
@@ -45,7 +45,7 @@
dontaudit dhcpc_t self:capability sys_tty_config;
# for access("/etc/bashrc", X_OK) on Red Hat
@@ -27294,7 +27358,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.3.1/policy/modules/system/udev.te
--- nsaserefpolicy/policy/modules/system/udev.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/udev.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/udev.te 2008-02-26 08:29:22.000000000 -0500
@@ -83,6 +83,7 @@
kernel_rw_unix_dgram_sockets(udev_t)
kernel_dgram_send(udev_t)
@@ -27342,7 +27406,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.3.1/policy/modules/system/unconfined.fc
--- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-12-12 11:35:28.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/unconfined.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/unconfined.fc 2008-02-26 08:29:22.000000000 -0500
@@ -2,15 +2,18 @@
# e.g.:
# /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -27367,7 +27431,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.3.1/policy/modules/system/unconfined.if
--- nsaserefpolicy/policy/modules/system/unconfined.if 2007-11-16 15:30:49.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/unconfined.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/unconfined.if 2008-02-26 08:29:22.000000000 -0500
@@ -12,14 +12,13 @@
#
interface(`unconfined_domain_noaudit',`
@@ -27644,7 +27708,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.3.1/policy/modules/system/unconfined.te
--- nsaserefpolicy/policy/modules/system/unconfined.te 2008-02-13 16:26:06.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/unconfined.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/unconfined.te 2008-02-26 08:29:22.000000000 -0500
@@ -6,35 +6,67 @@
# Declarations
#
@@ -27953,7 +28017,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconf
+rpm_transition_script(unconfined_notrans_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.3.1/policy/modules/system/userdomain.fc
--- nsaserefpolicy/policy/modules/system/userdomain.fc 2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/userdomain.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/userdomain.fc 2008-02-26 08:29:22.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)
@@ -27966,7 +28030,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.3.1/policy/modules/system/userdomain.if
--- nsaserefpolicy/policy/modules/system/userdomain.if 2008-02-15 09:52:56.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/userdomain.if 2008-02-26 08:29:22.000000000 -0500
@@ -29,9 +29,14 @@
')
@@ -30679,7 +30743,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.3.1/policy/modules/system/userdomain.te
--- nsaserefpolicy/policy/modules/system/userdomain.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/userdomain.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/userdomain.te 2008-02-26 08:29:22.000000000 -0500
@@ -2,12 +2,7 @@
policy_module(userdomain,2.5.0)
@@ -30969,7 +31033,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
+dontaudit unpriv_userdomain unpriv_process:process ptrace;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.fc serefpolicy-3.3.1/policy/modules/system/virt.fc
--- nsaserefpolicy/policy/modules/system/virt.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/virt.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/virt.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,13 @@
+
+/usr/sbin/libvirtd -- gen_context(system_u:object_r:virtd_exec_t,s0)
@@ -30986,7 +31050,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.f
+/etc/libvirt/.*/.* gen_context(system_u:object_r:virt_etc_rw_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.if serefpolicy-3.3.1/policy/modules/system/virt.if
--- nsaserefpolicy/policy/modules/system/virt.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/virt.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/virt.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,324 @@
+
+## <summary>policy for virt</summary>
@@ -31314,7 +31378,7 @@ 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.3.1/policy/modules/system/virt.te
--- nsaserefpolicy/policy/modules/system/virt.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/virt.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,159 @@
+
+policy_module(virt,1.0.0)
@@ -31477,7 +31541,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/virt.t
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.3.1/policy/modules/system/xen.if
--- nsaserefpolicy/policy/modules/system/xen.if 2007-06-21 09:32:04.000000000 -0400
-+++ serefpolicy-3.3.1/policy/modules/system/xen.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/xen.if 2008-02-26 08:29:22.000000000 -0500
@@ -167,11 +167,14 @@
#
interface(`xen_stream_connect',`
@@ -31521,7 +31585,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.3.1/policy/modules/system/xen.te
--- nsaserefpolicy/policy/modules/system/xen.te 2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/system/xen.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/system/xen.te 2008-02-26 08:29:22.000000000 -0500
@@ -6,6 +6,13 @@
# Declarations
#
@@ -31707,17 +31771,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/auditadm.fc serefpolicy-3.3.1/policy/modules/users/auditadm.fc
--- nsaserefpolicy/policy/modules/users/auditadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No auditadm file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.if serefpolicy-3.3.1/policy/modules/users/auditadm.if
--- nsaserefpolicy/policy/modules/users/auditadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for auditadm user</summary>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditadm.te serefpolicy-3.3.1/policy/modules/users/auditadm.te
--- nsaserefpolicy/policy/modules/users/auditadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/auditadm.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/auditadm.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,25 @@
+policy_module(auditadm,1.0.1)
+gen_require(`
@@ -31746,17 +31810,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/auditad
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.3.1/policy/modules/users/guest.fc
--- nsaserefpolicy/policy/modules/users/guest.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/guest.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No guest file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.3.1/policy/modules/users/guest.if
--- nsaserefpolicy/policy/modules/users/guest.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/guest.if 2008-02-26 08:29:22.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.3.1/policy/modules/users/guest.te
--- nsaserefpolicy/policy/modules/users/guest.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/guest.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,21 @@
+policy_module(guest,1.0.1)
+userdom_restricted_user_template(guest)
@@ -31781,17 +31845,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.3.1/policy/modules/users/logadm.fc
--- nsaserefpolicy/policy/modules/users/logadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No logadm file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.3.1/policy/modules/users/logadm.if
--- nsaserefpolicy/policy/modules/users/logadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if 2008-02-26 08:29:22.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.3.1/policy/modules/users/logadm.te
--- nsaserefpolicy/policy/modules/users/logadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,11 @@
+policy_module(logadm,1.0.0)
+
@@ -31806,22 +31870,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.3.1/policy/modules/users/metadata.xml
--- nsaserefpolicy/policy/modules/users/metadata.xml 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+<summary>Policy modules for users</summary>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.1/policy/modules/users/secadm.fc
--- nsaserefpolicy/policy/modules/users/secadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No secadm file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.1/policy/modules/users/secadm.if
--- nsaserefpolicy/policy/modules/users/secadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for secadm user</summary>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.1/policy/modules/users/secadm.te
--- nsaserefpolicy/policy/modules/users/secadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,39 @@
+policy_module(secadm,1.0.1)
+gen_require(`
@@ -31864,17 +31928,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.1/policy/modules/users/staff.fc
--- nsaserefpolicy/policy/modules/users/staff.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No staff file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.1/policy/modules/users/staff.if
--- nsaserefpolicy/policy/modules/users/staff.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/staff.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for staff user</summary>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te
--- nsaserefpolicy/policy/modules/users/staff.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,11 @@
+policy_module(staff,1.0.1)
+userdom_admin_login_user_template(staff)
@@ -31889,17 +31953,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.t
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.1/policy/modules/users/user.fc
--- nsaserefpolicy/policy/modules/users/user.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/user.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No user file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.1/policy/modules/users/user.if
--- nsaserefpolicy/policy/modules/users/user.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/user.if 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for user user</summary>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te
--- nsaserefpolicy/policy/modules/users/user.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,4 @@
+policy_module(user,1.0.1)
+userdom_unpriv_user_template(user)
@@ -31907,17 +31971,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc
--- nsaserefpolicy/policy/modules/users/webadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No webadm file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.1/policy/modules/users/webadm.if
--- nsaserefpolicy/policy/modules/users/webadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if 2008-02-26 08:29:22.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.3.1/policy/modules/users/webadm.te
--- nsaserefpolicy/policy/modules/users/webadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,42 @@
+policy_module(webadm,1.0.0)
+
@@ -31963,17 +32027,17 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.
+allow webadm_t staff_t:dir getattr;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.1/policy/modules/users/xguest.fc
--- nsaserefpolicy/policy/modules/users/xguest.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1 @@
+# No xguest file contexts.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.1/policy/modules/users/xguest.if
--- nsaserefpolicy/policy/modules/users/xguest.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if 2008-02-26 08:29:22.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.3.1/policy/modules/users/xguest.te
--- nsaserefpolicy/policy/modules/users/xguest.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-02-26 08:29:22.000000000 -0500
@@ -0,0 +1,66 @@
+policy_module(xguest,1.0.1)
+
@@ -32043,7 +32107,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt
--- nsaserefpolicy/policy/support/file_patterns.spt 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-02-26 08:29:22.000000000 -0500
@@ -537,3 +537,23 @@
allow $1 $2:dir rw_dir_perms;
type_transition $1 $2:$4 $3;
@@ -32070,7 +32134,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt
--- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-02-26 08:29:22.000000000 -0500
@@ -315,3 +315,13 @@
#
define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -32087,7 +32151,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.3.1/policy/users
--- nsaserefpolicy/policy/users 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.1/policy/users 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/policy/users 2008-02-26 08:29:22.000000000 -0500
@@ -16,7 +16,7 @@
# and a user process should never be assigned the system user
# identity.
@@ -32124,7 +32188,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3
+gen_user(root, unconfined, unconfined_r 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.3.1/Rules.modular
--- nsaserefpolicy/Rules.modular 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.1/Rules.modular 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/Rules.modular 2008-02-26 08:29:22.000000000 -0500
@@ -73,8 +73,8 @@
$(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
@echo "Compliling $(NAME) $(@F) module"
@@ -32156,7 +32220,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.3.1/Rules.monolithic
--- nsaserefpolicy/Rules.monolithic 2007-11-20 06:55:20.000000000 -0500
-+++ serefpolicy-3.3.1/Rules.monolithic 2008-02-26 08:24:18.000000000 -0500
++++ serefpolicy-3.3.1/Rules.monolithic 2008-02-26 08:29:22.000000000 -0500
@@ -96,7 +96,7 @@
#
# Load the binary policy
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 3099f61..6780096 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
Summary: SELinux policy configuration
Name: selinux-policy
Version: 3.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: serefpolicy-%{version}.tgz
@@ -388,6 +388,9 @@ exit 0
%endif
%changelog
+* Tue Feb 26 2008 Dan Walsh <dwalsh@redhat.com> 3.3.1-2
+-
+
* Tue Feb 26 2008 Dan Walsh <dwalsh@redhat.com> 3.3.1-1
- Update to upstream fixes