diff --git a/policy-20081111.patch b/policy-20081111.patch
new file mode 100644
index 0000000..239570d
--- /dev/null
+++ b/policy-20081111.patch
@@ -0,0 +1,27053 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.1/Makefile
+--- nsaserefpolicy/Makefile 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/Makefile 2008-11-25 09:45:43.000000000 -0500
+@@ -315,20 +315,22 @@
+
+ # parse-rolemap modulename,outputfile
+ define parse-rolemap
+- $(verbose) $(M4) $(M4PARAM) $(rolemap) | \
+- $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
++ echo "" >> $2
++# $(verbose) $(M4) $(M4PARAM) $(rolemap) | \
++# $(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_role_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
+ endef
+
+ # perrole-expansion modulename,outputfile
+ define perrole-expansion
+- $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2
+- $(call parse-rolemap,$1,$2)
+- $(verbose) echo "')" >> $2
+-
+- $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2
+- $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2
+- $(call parse-rolemap-compat,$1,$2)
+- $(verbose) echo "')" >> $2
++ echo "No longer doing perrole-expansion"
++# $(verbose) echo "ifdef(\`""$1""_per_role_template',\`" > $2
++# $(call parse-rolemap,$1,$2)
++# $(verbose) echo "')" >> $2
++
++# $(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" >> $2
++# $(verbose) echo "errprint(\`Warning: per_userdomain_templates have been renamed to per_role_templates (""$1""_per_userdomain_template)'__endline__)" >> $2
++# $(call parse-rolemap-compat,$1,$2)
++# $(verbose) echo "')" >> $2
+ endef
+
+ # create-base-per-role-tmpl modulenames,outputfile
+@@ -527,6 +529,10 @@
+ @mkdir -p $(appdir)/users
+ $(verbose) $(INSTALL) -m 644 $^ $@
+
++$(appdir)/initrc_context: $(tmpdir)/initrc_context
++ @mkdir -p $(appdir)
++ $(verbose) $(INSTALL) -m 644 $< $@
++
+ $(appdir)/%: $(appconf)/%
+ @mkdir -p $(appdir)
+ $(verbose) $(INSTALL) -m 644 $< $@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.1/Rules.modular
+--- nsaserefpolicy/Rules.modular 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/Rules.modular 2008-11-25 09:45:43.000000000 -0500
+@@ -73,8 +73,8 @@
+ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
+ @echo "Compliling $(NAME) $(@F) module"
+ @test -d $(tmpdir) || mkdir -p $(tmpdir)
+- $(call perrole-expansion,$(basename $(@F)),$@.role)
+- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
++# $(call perrole-expansion,$(basename $(@F)),$@.role)
++ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp)
+ $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
+
+ $(tmpdir)/%.mod.fc: $(m4support) %.fc
+@@ -129,7 +129,7 @@
+ @test -d $(tmpdir) || mkdir -p $(tmpdir)
+ # define all available object classes
+ $(verbose) $(genperm) $(avs) $(secclass) > $@
+- $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@)
++# $(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@)
+ $(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true
+
+ $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy
+@@ -146,7 +146,7 @@
+ $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy
+ $(tmpdir)/rolemap.conf: $(rolemap)
+ $(verbose) echo "" > $@
+- $(call parse-rolemap,base,$@)
++# $(call parse-rolemap,base,$@)
+
+ $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
+ $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.1/config/appconfig-mcs/default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mcs/default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -1,15 +1,6 @@
+-system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
+-system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-system_r:remote_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0
+-system_r:sshd_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
++system_r:crond_t:s0 system_r:system_cronjob_t:s0
++system_r:local_login_t:s0 user_r:user_t:s0
++system_r:remote_login_t:s0 user_r:user_t:s0
++system_r:sshd_t:s0 user_r:user_t:s0
+ system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0
+-system_r:xdm_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-
+-staff_r:staff_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-staff_r:staff_sudo_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+-
+-sysadm_r:sysadm_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0
+-
+-user_r:user_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-user_r:user_sudo_t:s0 sysadm_r:sysadm_t:s0 user_r:user_t:s0
++system_r:xdm_t:s0 user_r:user_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.1/config/appconfig-mcs/failsafe_context
+--- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.6.1/config/appconfig-mcs/failsafe_context 2008-11-25 09:45:43.000000000 -0500
+@@ -1 +1 @@
+-sysadm_r:sysadm_t:s0
++system_r:unconfined_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.6.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.6.1/config/appconfig-mcs/guest_u_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,6 @@
++system_r:local_login_t:s0 guest_r:guest_t:s0
++system_r:remote_login_t:s0 guest_r:guest_t:s0
++system_r:sshd_t:s0 guest_r:guest_t:s0
++system_r:crond_t:s0 guest_r:guest_t:s0
++system_r:initrc_su_t:s0 guest_r:guest_t:s0
++guest_r:guest_t:s0 guest_r:guest_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.1/config/appconfig-mcs/root_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mcs/root_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -1,11 +1,7 @@
+-system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
++system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_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
+
+-staff_r:staff_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-sysadm_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-user_r:user_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-
+ #
+ # Uncomment if you want to automatically login as sysadm_r
+ #
+-#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
++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 -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.1/config/appconfig-mcs/seusers
+--- nsaserefpolicy/config/appconfig-mcs/seusers 2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.6.1/config/appconfig-mcs/seusers 2008-11-25 09:45:43.000000000 -0500
+@@ -1,3 +1,3 @@
+ system_u:system_u:s0-mcs_systemhigh
+-root:root:s0-mcs_systemhigh
+-__default__:user_u:s0
++root:unconfined_u:s0-mcs_systemhigh
++__default__:unconfined_u:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.1/config/appconfig-mcs/staff_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mcs/staff_u_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -1,10 +1,12 @@
+ system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+ system_r:remote_login_t:s0 staff_r:staff_t:s0
+ system_r:sshd_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-system_r:crond_t:s0 staff_r:cronjob_t:s0
++system_r:crond_t:s0 staff_r:staff_t:s0
+ system_r:xdm_t:s0 staff_r:staff_t:s0
+ staff_r:staff_su_t:s0 staff_r:staff_t:s0
+ staff_r:staff_sudo_t:s0 staff_r:staff_t:s0
++system_r:initrc_su_t:s0 staff_r:staff_t:s0
++staff_r:staff_t:s0 staff_r:staff_t:s0
+ sysadm_r:sysadm_su_t:s0 sysadm_r:sysadm_t:s0
+ sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.1/config/appconfig-mcs/unconfined_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -1,4 +1,4 @@
+-system_r:crond_t:s0 unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
++system_r:crond_t:s0 unconfined_r:unconfined_t:s0
+ system_r:initrc_t:s0 unconfined_r:unconfined_t:s0
+ system_r:local_login_t:s0 unconfined_r:unconfined_t:s0
+ system_r:remote_login_t:s0 unconfined_r:unconfined_t:s0
+@@ -6,4 +6,6 @@
+ system_r:sshd_t:s0 unconfined_r:unconfined_t:s0
+ system_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0
+ system_r:unconfined_t:s0 unconfined_r:unconfined_t:s0
++system_r:initrc_su_t:s0 unconfined_r:unconfined_t:s0
++unconfined_r:unconfined_t:s0 unconfined_r:unconfined_t:s0
+ system_r:xdm_t:s0 unconfined_r:unconfined_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.1/config/appconfig-mcs/user_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mcs/user_u_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -1,8 +1,9 @@
+ system_r:local_login_t:s0 user_r:user_t:s0
+ system_r:remote_login_t:s0 user_r:user_t:s0
+ system_r:sshd_t:s0 user_r:user_t:s0
+-system_r:crond_t:s0 user_r:cronjob_t:s0
++system_r:crond_t:s0 user_r:user_t:s0
+ system_r:xdm_t:s0 user_r:user_t:s0
+ user_r:user_su_t:s0 user_r:user_t:s0
+ user_r:user_sudo_t:s0 user_r:user_t:s0
+-
++system_r:initrc_su_t:s0 user_r:user_t:s0
++user_r:user_t:s0 user_r:user_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.1/config/appconfig-mcs/userhelper_context
+--- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.6.1/config/appconfig-mcs/userhelper_context 2008-11-25 09:45:43.000000000 -0500
+@@ -1 +1 @@
+-system_u:sysadm_r:sysadm_t:s0
++system_u:system_r:unconfined_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.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.6.1/config/appconfig-mcs/xguest_u_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,7 @@
++system_r:local_login_t xguest_r:xguest_t:s0
++system_r:remote_login_t xguest_r:xguest_t:s0
++system_r:sshd_t xguest_r:xguest_t:s0
++system_r:crond_t xguest_r:xguest_t:s0
++system_r:xdm_t xguest_r:xguest_t:s0
++system_r:initrc_su_t:s0 xguest_r:xguest_t:s0
++xguest_r:xguest_t:s0 xguest_r:xguest_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.1/config/appconfig-mls/default_contexts
+--- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mls/default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -1,15 +1,6 @@
+-system_r:crond_t:s0 user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
+-system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-system_r:remote_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0
+-system_r:sshd_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
++system_r:crond_t:s0 system_r:system_crond_t:s0
++system_r:local_login_t:s0 user_r:user_t:s0
++system_r:remote_login_t:s0 user_r:user_t:s0
++system_r:sshd_t:s0 user_r:user_t:s0
+ system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0
+-system_r:xdm_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-
+-staff_r:staff_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-staff_r:staff_sudo_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+-
+-sysadm_r:sysadm_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0
+-
+-user_r:user_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-user_r:user_sudo_t:s0 sysadm_r:sysadm_t:s0 user_r:user_t:s0
++system_r:xdm_t:s0 user_r:user_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.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.6.1/config/appconfig-mls/guest_u_default_contexts 2008-11-25 09:45:43.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
++system_r:sshd_t:s0 guest_r:guest_t:s0
++system_r:crond_t:s0 guest_r:guest_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.1/config/appconfig-mls/root_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mls/root_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -1,11 +1,11 @@
+-system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_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
++system_r:crond_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
++system_r:local_login_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+
+-staff_r:staff_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-sysadm_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-user_r:user_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
++staff_r:staff_su_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
++sysadm_r:sysadm_su_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
++user_r:user_su_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+
+ #
+ # Uncomment if you want to automatically login as sysadm_r
+ #
+-#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
++#system_r:sshd_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.1/config/appconfig-mls/xguest_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/config/appconfig-mls/xguest_u_default_contexts 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,7 @@
++system_r:local_login_t xguest_r:xguest_t:s0
++system_r:remote_login_t xguest_r:xguest_t:s0
++system_r:sshd_t xguest_r:xguest_t:s0
++system_r:crond_t xguest_r:xguest_t:s0
++system_r:xdm_t xguest_r:xguest_t:s0
++system_r:initrc_su_t:s0 xguest_r:xguest_t:s0
++xguest_r:xguest_t:s0 xguest_r:xguest_t:s0
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.1/man/man8/samba_selinux.8
+--- nsaserefpolicy/man/man8/samba_selinux.8 2008-08-07 11:15:14.000000000 -0400
++++ serefpolicy-3.6.1/man/man8/samba_selinux.8 2008-11-25 09:45:43.000000000 -0500
+@@ -14,11 +14,17 @@
+ .TP
+ chcon -t samba_share_t /var/eng
+ .TP
+-If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file.
++To make this change permanent (survive a relabel), use the semanage command to add the change to file context configuration:
++.TP
++semanage fcontext -a -t samba_share_t "/var/eng(/.*)?"
++.TP
++This command adds the following entry to /etc/selinux/POLICYTYPE/contexts/files/file_contexts.local:
+ .TP
+-/etc/selinux/POLICYTYPE/contexts/files/file_contexts.local
+-.br
+ /var/eng(/.*)? system_u:object_r:samba_share_t
++.TP
++Run the restorecon command to apply the changes:
++.TP
++restorecon -R -v /var/eng/
+
+ .SH SHARING FILES
+ If you want to share files with multiple domains (Apache, FTP, rsync, Samba), you can set a file context of public_content_t and public_content_rw_t. These context allow any of the above domains to read the content. If you want a particular domain to write to the public_content_rw_t domain, you must set the appropriate boolean. allow_DOMAIN_anon_write. So for samba you would execute:
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.1/policy/flask/access_vectors
+--- nsaserefpolicy/policy/flask/access_vectors 2008-08-07 11:15:00.000000000 -0400
++++ serefpolicy-3.6.1/policy/flask/access_vectors 2008-11-25 09:45:43.000000000 -0500
+@@ -616,6 +616,7 @@
+ nlmsg_write
+ nlmsg_relay
+ nlmsg_readpriv
++ nlmsg_tty_audit
+ }
+
+ class netlink_ip6fw_socket
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.1/policy/global_tunables
+--- nsaserefpolicy/policy/global_tunables 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/policy/global_tunables 2008-11-25 09:45:43.000000000 -0500
+@@ -61,15 +61,6 @@
+
+ ## <desc>
+ ## <p>
+-## Allow email client to various content.
+-## nfs, samba, removable devices, and user temp
+-## files
+-## </p>
+-## </desc>
+-gen_tunable(mail_read_content,false)
+-
+-## <desc>
+-## <p>
+ ## Allow any files/directories to be exported read/write via NFS.
+ ## </p>
+ ## </desc>
+@@ -111,3 +102,12 @@
+ ## </p>
+ ## </desc>
+ gen_tunable(user_tcp_server,false)
++
++## <desc>
++## <p>
++## Allow direct login to the console device. Required for System 390
++## </p>
++## </desc>
++gen_tunable(allow_console_login,false)
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.1/policy/modules/admin/anaconda.te
+--- nsaserefpolicy/policy/modules/admin/anaconda.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/anaconda.te 2008-11-25 09:45:43.000000000 -0500
+@@ -31,6 +31,7 @@
+ modutils_domtrans_insmod(anaconda_t)
+
+ seutil_domtrans_semanage(anaconda_t)
++seutil_domtrans_setsebool(anaconda_t)
+
+ userdom_user_home_dir_filetrans_user_home_content(anaconda_t, { dir file lnk_file fifo_file sock_file })
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.1/policy/modules/admin/certwatch.te
+--- nsaserefpolicy/policy/modules/admin/certwatch.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/certwatch.te 2008-11-25 09:45:43.000000000 -0500
+@@ -27,6 +27,9 @@
+
+ fs_list_inotifyfs(certwatch_t)
+
++auth_manage_cache(certwatch_t)
++auth_filetrans_cache(certwatch_t)
++
+ logging_send_syslog_msg(certwatch_t)
+
+ miscfiles_read_certs(certwatch_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.1/policy/modules/admin/kismet.te
+--- nsaserefpolicy/policy/modules/admin/kismet.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/kismet.te 2008-12-02 11:02:15.000000000 -0500
+@@ -25,11 +25,13 @@
+ # kismet local policy
+ #
+
+-allow kismet_t self:capability { net_admin net_raw setuid setgid };
++allow kismet_t self:capability { kill net_admin net_raw setuid setgid };
++allow kismet_t self:process signal;
+ allow kismet_t self:fifo_file rw_file_perms;
+ allow kismet_t self:packet_socket create_socket_perms;
+-allow kismet_t self:unix_dgram_socket create_socket_perms;
++allow kismet_t self:unix_dgram_socket { create_socket_perms sendto };
+ allow kismet_t self:unix_stream_socket create_stream_socket_perms;
++allow kismet_t self:tcp_socket create_stream_socket_perms;
+
+ manage_files_pattern(kismet_t, kismet_log_t, kismet_log_t)
+ allow kismet_t kismet_log_t:dir setattr;
+@@ -47,6 +49,14 @@
+
+ corecmd_exec_bin(kismet_t)
+
++corenet_all_recvfrom_unlabeled(kismet_t)
++corenet_all_recvfrom_netlabel(kismet_t)
++corenet_tcp_sendrecv_all_if(kismet_t)
++corenet_tcp_sendrecv_all_nodes(kismet_t)
++corenet_tcp_sendrecv_all_ports(kismet_t)
++corenet_tcp_bind_all_nodes(kismet_t)
++corenet_tcp_bind_kismet_port(kismet_t)
++
+ auth_use_nsswitch(kismet_t)
+
+ files_read_etc_files(kismet_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.1/policy/modules/admin/logrotate.te
+--- nsaserefpolicy/policy/modules/admin/logrotate.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/logrotate.te 2008-11-25 09:45:43.000000000 -0500
+@@ -116,7 +116,7 @@
+ seutil_dontaudit_read_config(logrotate_t)
+
+ userdom_use_user_terminals(logrotate_t)
+-userdom_dontaudit_search_user_home_dirs(logrotate_t)
++userdom_list_user_home_dirs(logrotate_t)
+ userdom_use_unpriv_users_fds(logrotate_t)
+
+ cron_system_entry(logrotate_t, logrotate_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.6.1/policy/modules/admin/logwatch.te
+--- nsaserefpolicy/policy/modules/admin/logwatch.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/logwatch.te 2008-11-25 09:45:43.000000000 -0500
+@@ -43,6 +43,8 @@
+ kernel_read_fs_sysctls(logwatch_t)
+ kernel_read_kernel_sysctls(logwatch_t)
+ kernel_read_system_state(logwatch_t)
++kernel_read_net_sysctls(logwatch_t)
++kernel_read_network_state(logwatch_t)
+
+ corecmd_exec_bin(logwatch_t)
+ corecmd_exec_shell(logwatch_t)
+@@ -54,18 +56,19 @@
+ domain_read_all_domains_state(logwatch_t)
+
+ files_list_var(logwatch_t)
++files_read_var_symlinks(logwatch_t)
+ files_read_etc_files(logwatch_t)
+ files_read_etc_runtime_files(logwatch_t)
+ files_read_usr_files(logwatch_t)
+ files_search_spool(logwatch_t)
+ files_search_mnt(logwatch_t)
+-files_dontaudit_search_home(logwatch_t)
+-files_dontaudit_search_boot(logwatch_t)
+ # Execs df and if file system mounted with a context avc raised
+-files_dontaudit_search_all_dirs(logwatch_t)
++files_search_all(logwatch_t)
++files_getattr_all_file_type_fs(logwatch_t)
+
+ fs_getattr_all_fs(logwatch_t)
+ fs_dontaudit_list_auto_mountpoints(logwatch_t)
++fs_list_inotifyfs(logwatch_t)
+
+ term_dontaudit_getattr_pty_dirs(logwatch_t)
+ term_dontaudit_list_ptys(logwatch_t)
+@@ -75,6 +78,8 @@
+ init_read_utmp(logwatch_t)
+ init_dontaudit_write_utmp(logwatch_t)
+
++auth_use_nsswitch(logwatch_t)
++
+ libs_read_lib_files(logwatch_t)
+
+ logging_read_all_logs(logwatch_t)
+@@ -85,6 +90,7 @@
+ selinux_dontaudit_getattr_dir(logwatch_t)
+
+ sysnet_dns_name_resolve(logwatch_t)
++sysnet_exec_ifconfig(logwatch_t)
+
+ userdom_dontaudit_search_user_home_dirs(logwatch_t)
+
+@@ -95,10 +101,6 @@
+ ')
+
+ optional_policy(`
+- auth_use_nsswitch(logwatch_t)
+-')
+-
+-optional_policy(`
+ avahi_dontaudit_search_pid(logwatch_t)
+ ')
+
+@@ -129,4 +131,5 @@
+
+ optional_policy(`
+ samba_read_log(logwatch_t)
++ samba_read_share_files(logwatch_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.1/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/netutils.te 2008-11-25 09:45:43.000000000 -0500
+@@ -128,6 +128,8 @@
+ files_read_etc_files(ping_t)
+ files_dontaudit_search_var(ping_t)
+
++kernel_read_system_state(ping_t)
++
+ auth_use_nsswitch(ping_t)
+
+ logging_send_syslog_msg(ping_t)
+@@ -146,6 +148,14 @@
+ ')
+
+ optional_policy(`
++ munin_append_log(ping_t)
++')
++
++optional_policy(`
++ nagios_dontaudit_rw_pipes(ping_t)
++')
++
++optional_policy(`
+ pcmcia_use_cardmgr_fds(ping_t)
+ ')
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.1/policy/modules/admin/prelink.te
+--- nsaserefpolicy/policy/modules/admin/prelink.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/prelink.te 2008-11-25 09:45:43.000000000 -0500
+@@ -26,7 +26,7 @@
+ # Local policy
+ #
+
+-allow prelink_t self:capability { chown dac_override fowner fsetid };
++allow prelink_t self:capability { chown dac_override fowner fsetid sys_resource };
+ allow prelink_t self:process { execheap execmem execstack signal };
+ allow prelink_t self:fifo_file rw_fifo_file_perms;
+
+@@ -40,7 +40,7 @@
+ read_lnk_files_pattern(prelink_t, prelink_log_t, prelink_log_t)
+ logging_log_filetrans(prelink_t, prelink_log_t, file)
+
+-allow prelink_t prelink_tmp_t:file { manage_file_perms execute relabelfrom };
++allow prelink_t prelink_tmp_t:file { manage_file_perms execute relabelfrom execmod };
+ files_tmp_filetrans(prelink_t, prelink_tmp_t, file)
+ fs_tmpfs_filetrans(prelink_t, prelink_tmp_t, file)
+
+@@ -49,8 +49,7 @@
+ allow prelink_t prelink_object:file { manage_file_perms execute relabelto relabelfrom };
+
+ kernel_read_system_state(prelink_t)
+-kernel_dontaudit_search_kernel_sysctl(prelink_t)
+-kernel_dontaudit_search_sysctl(prelink_t)
++kernel_read_kernel_sysctls(prelink_t)
+
+ corecmd_manage_all_executables(prelink_t)
+ corecmd_relabel_all_executables(prelink_t)
+@@ -65,6 +64,8 @@
+ files_read_etc_files(prelink_t)
+ files_read_etc_runtime_files(prelink_t)
+ files_dontaudit_read_all_symlinks(prelink_t)
++files_manage_usr_files(prelink_t)
++files_relabelfrom_usr_files(prelink_t)
+
+ fs_getattr_xattr_fs(prelink_t)
+
+@@ -81,6 +82,11 @@
+
+ userdom_use_user_terminals(prelink_t)
+
++# prelink executables in the user homedir
++userdom_manage_user_home_content_files(prelink_t)
++userdom_mmap_user_home_content_files(prelink_t)
++userdom_manage_user_home_content_symlinks(prelink_t)
++
+ optional_policy(`
+ amanda_manage_lib(prelink_t)
+ ')
+@@ -88,3 +94,7 @@
+ optional_policy(`
+ cron_system_entry(prelink_t, prelink_exec_t)
+ ')
++
++optional_policy(`
++ unconfined_domain(prelink_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.6.1/policy/modules/admin/rpm.fc
+--- nsaserefpolicy/policy/modules/admin/rpm.fc 2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/admin/rpm.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -11,7 +11,8 @@
+
+ /usr/sbin/system-install-packages -- gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/yum-updatesd -- gen_context(system_u:object_r:rpm_exec_t,s0)
+-
++/usr/sbin/packagekitd -- gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/libexec/yumDBUSBackend.py -- gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/share/yumex/yumex -- gen_context(system_u:object_r:rpm_exec_t,s0)
+
+ ifdef(`distro_redhat', `
+@@ -21,14 +22,17 @@
+ /usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/sbin/synaptic -- gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-get -- gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-shell -- gen_context(system_u:object_r:rpm_exec_t,s0)
+ ')
+
+ /var/lib/alternatives(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0)
+
+ /var/lib/rpm(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0)
+-
+-/var/log/rpmpkgs.* -- gen_context(system_u:object_r:rpm_log_t,s0)
+ /var/log/yum\.log.* -- gen_context(system_u:object_r:rpm_log_t,s0)
++/var/run/yum.* -- gen_context(system_u:object_r:rpm_var_run_t,s0)
++/var/run/PackageKit(/.*)? gen_context(system_u:object_r:rpm_var_run_t,s0)
+
+ # SuSE
+ ifdef(`distro_suse', `
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.1/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/rpm.if 2008-11-25 09:45:43.000000000 -0500
+@@ -146,6 +146,24 @@
+
+ ########################################
+ ## <summary>
++## dontaudit read and write an unnamed RPM pipe.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`rpm_dontaudit_rw_pipes',`
++ gen_require(`
++ type rpm_t;
++ ')
++
++ dontaudit $1 rpm_t:fifo_file rw_fifo_file_perms;
++')
++
++########################################
++## <summary>
+ ## Send and receive messages from
+ ## rpm over dbus.
+ ## </summary>
+@@ -167,6 +185,48 @@
+
+ ########################################
+ ## <summary>
++## dontaudit attempts to Send and receive messages from
++## rpm over dbus.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`rpm_dontaudit_dbus_chat',`
++ gen_require(`
++ type rpm_t;
++ class dbus send_msg;
++ ')
++
++ dontaudit $1 rpm_t:dbus send_msg;
++ dontaudit rpm_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
++## Send and receive messages from
++## rpm_script over dbus.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`rpm_script_dbus_chat',`
++ gen_require(`
++ type rpm_script_t;
++ class dbus send_msg;
++ ')
++
++ allow $1 rpm_script_t:dbus send_msg;
++ allow rpm_script_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
+ ## Create, read, write, and delete the RPM log.
+ ## </summary>
+ ## <param name="domain">
+@@ -186,6 +246,24 @@
+
+ ########################################
+ ## <summary>
++## Search RPM log directory.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`rpm_search_log',`
++ gen_require(`
++ type rpm_log_t;
++ ')
++
++ allow $1 rpm_log_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
+ ## Inherit and use file descriptors from RPM scripts.
+ ## </summary>
+ ## <param name="domain">
+@@ -204,6 +282,24 @@
+
+ ########################################
+ ## <summary>
++## dontaudit and use file descriptors from RPM scripts.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`rpm_dontaudit_use_script_fds',`
++ gen_require(`
++ type rpm_script_t;
++ ')
++
++ dontaudit $1 rpm_script_t:fd use;
++')
++
++########################################
++## <summary>
+ ## Create, read, write, and delete RPM
+ ## script temporary files.
+ ## </summary>
+@@ -219,7 +315,29 @@
+ ')
+
+ files_search_tmp($1)
++ manage_dirs_pattern($1, rpm_script_tmp_t, rpm_script_tmp_t)
+ manage_files_pattern($1, rpm_script_tmp_t, rpm_script_tmp_t)
++ manage_lnk_files_pattern($1, rpm_script_tmp_t, rpm_script_tmp_t)
++')
++
++########################################
++## <summary>
++## read, RPM
++## script temporary files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`rpm_read_script_tmp_files',`
++ gen_require(`
++ type rpm_script_tmp_t;
++ ')
++
++ read_files_pattern($1, rpm_script_tmp_t, rpm_script_tmp_t)
++ read_lnk_files_pattern($1, rpm_script_tmp_t, rpm_script_tmp_t)
+ ')
+
+ ########################################
+@@ -283,3 +401,175 @@
+ dontaudit $1 rpm_var_lib_t:file manage_file_perms;
+ dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
+ ')
++
++
++########################################
++## <summary>
++## Allow application to transition to rpm_script domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`rpm_transition_script',`
++ gen_require(`
++ type rpm_script_t;
++ ')
++
++ allow $1 rpm_script_t:process transition;
++
++ allow $1 rpm_script_t:fd use;
++ allow rpm_script_t $1:fd use;
++ allow rpm_script_t $1:fifo_file rw_fifo_file_perms;
++ allow rpm_script_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++## allow domain to read,
++## write RPM tmp files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`rpm_rw_tmp_files',`
++ gen_require(`
++ type rpm_tmp_t;
++ ')
++
++ allow $1 rpm_tmp_t:file rw_file_perms;
++')
++
++########################################
++## <summary>
++## Do not audit attempts to read,
++## write RPM tmp files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`rpm_dontaudit_rw_tmp_files',`
++ gen_require(`
++ type rpm_tmp_t;
++ ')
++
++ dontaudit $1 rpm_tmp_t:file rw_file_perms;
++')
++
++########################################
++## <summary>
++## Do not audit attempts to read,
++## write RPM shm
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`rpm_dontaudit_rw_shm',`
++ gen_require(`
++ type rpm_t;
++ ')
++
++ dontaudit $1 rpm_t:shm rw_shm_perms;
++')
++
++########################################
++## <summary>
++## Read/write rpm tmpfs files.
++## </summary>
++## <desc>
++## <p>
++## Read/write rpm tmpfs files.
++## </p>
++## </desc>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`rpm_rw_tmpfs_files',`
++ gen_require(`
++ type rpm_tmpfs_t;
++ ')
++
++ fs_search_tmpfs($1)
++ allow $1 rpm_tmpfs_t:dir list_dir_perms;
++ rw_files_pattern($1, rpm_tmpfs_t, rpm_tmpfs_t)
++ read_lnk_files_pattern($1, rpm_tmpfs_t, rpm_tmpfs_t)
++')
++
++########################################
++## <summary>
++## Transition to system_r when execute an rpm script
++## </summary>
++## <desc>
++## <p>
++## Execute rpm script in a specified role
++## </p>
++## <p>
++## No interprocess communication (signals, pipes,
++## etc.) is provided by this interface since
++## the domains are not owned by this module.
++## </p>
++## </desc>
++## <param name="source_role">
++## <summary>
++## Role to transition from.
++## </summary>
++## </param>
++interface(`rpm_role_transition',`
++ gen_require(`
++ type rpm_exec_t;
++ ')
++
++ role_transition $1 rpm_exec_t system_r;
++')
++
++########################################
++## <summary>
++## Do not audit attempts to write, and delete the
++## RPM var run files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`rpm_dontaudit_write_pid_files',`
++ gen_require(`
++ type rpm_var_run_t;
++ ')
++
++ dontaudit $1 rpm_var_run_t:file write_file_perms;
++')
++
++########################################
++## <summary>
++## Send a null signal to rpm.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`rpm_signull',`
++ gen_require(`
++ type rpm_t;
++ ')
++
++ allow $1 rpm_t:process signull;
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.1/policy/modules/admin/rpm.te
+--- nsaserefpolicy/policy/modules/admin/rpm.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/rpm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -31,6 +31,9 @@
+ files_type(rpm_var_lib_t)
+ typealias rpm_var_lib_t alias var_lib_rpm_t;
+
++type rpm_var_run_t;
++files_pid_file(rpm_var_run_t)
++
+ type rpm_script_t;
+ type rpm_script_exec_t;
+ domain_obj_id_change_exemption(rpm_script_t)
+@@ -52,7 +55,8 @@
+ # rpm Local policy
+ #
+
+-allow rpm_t self:capability { chown dac_override fowner fsetid setgid setuid sys_chroot sys_tty_config mknod };
++allow rpm_t self:capability { chown dac_override fowner fsetid ipc_lock setgid setuid sys_chroot sys_nice sys_tty_config mknod };
++
+ allow rpm_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow rpm_t self:process { getattr setexec setfscreate setrlimit };
+ allow rpm_t self:fd use;
+@@ -68,6 +72,8 @@
+ allow rpm_t self:sem create_sem_perms;
+ allow rpm_t self:msgq create_msgq_perms;
+ allow rpm_t self:msg { send receive };
++allow rpm_t self:dir search;
++allow rpm_t self:file rw_file_perms;;
+
+ allow rpm_t rpm_log_t:file manage_file_perms;
+ logging_log_filetrans(rpm_t, rpm_log_t, file)
+@@ -87,8 +93,12 @@
+ manage_files_pattern(rpm_t, rpm_var_lib_t, rpm_var_lib_t)
+ files_var_lib_filetrans(rpm_t, rpm_var_lib_t, dir)
+
++manage_files_pattern(rpm_t, rpm_var_run_t, rpm_var_run_t)
++files_pid_filetrans(rpm_t, rpm_var_run_t, file)
++
+ kernel_read_system_state(rpm_t)
+ kernel_read_kernel_sysctls(rpm_t)
++kernel_read_network_state_symlinks(rpm_t)
+
+ corecmd_exec_all_executables(rpm_t)
+
+@@ -115,6 +125,7 @@
+ fs_manage_nfs_symlinks(rpm_t)
+ fs_getattr_all_fs(rpm_t)
+ fs_search_auto_mountpoints(rpm_t)
++fs_list_inotifyfs(rpm_t)
+
+ mls_file_read_all_levels(rpm_t)
+ mls_file_write_all_levels(rpm_t)
+@@ -132,6 +143,8 @@
+ # for installing kernel packages
+ storage_raw_read_fixed_disk(rpm_t)
+
++term_list_ptys(rpm_t)
++
+ auth_relabel_all_files_except_shadow(rpm_t)
+ auth_manage_all_files_except_shadow(rpm_t)
+ auth_dontaudit_read_shadow(rpm_t)
+@@ -174,10 +187,20 @@
+ ')
+
+ optional_policy(`
++ optional_policy(`
+ hal_dbus_chat(rpm_t)
+ ')
+
+ optional_policy(`
++ networkmanager_dbus_chat(rpm_t)
++ ')
++
++ optional_policy(`
++ dbus_system_domain(rpm_t, rpm_exec_t)
++ ')
++')
++
++optional_policy(`
+ prelink_domtrans(rpm_t)
+ ')
+
+@@ -185,6 +208,7 @@
+ unconfined_domain(rpm_t)
+ # yum-updatesd requires this
+ unconfined_dbus_chat(rpm_t)
++ unconfined_dbus_chat(rpm_script_t)
+ ')
+
+ ifdef(`TODO',`
+@@ -210,8 +234,8 @@
+ # rpm-script Local policy
+ #
+
+-allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_chroot sys_nice mknod kill };
+-allow rpm_script_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
++allow rpm_script_t self:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_admin sys_chroot sys_ptrace sys_nice mknod kill };
++allow rpm_script_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execheap };
+ allow rpm_script_t self:fd use;
+ allow rpm_script_t self:fifo_file rw_fifo_file_perms;
+ allow rpm_script_t self:unix_dgram_socket create_socket_perms;
+@@ -222,12 +246,15 @@
+ allow rpm_script_t self:sem create_sem_perms;
+ allow rpm_script_t self:msgq create_msgq_perms;
+ allow rpm_script_t self:msg { send receive };
++allow rpm_script_t self:netlink_kobject_uevent_socket create_socket_perms;
+
+ allow rpm_script_t rpm_tmp_t:file read_file_perms;
+
+ allow rpm_script_t rpm_script_tmp_t:dir mounton;
+ manage_dirs_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
+ manage_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
++manage_blk_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
++manage_chr_files_pattern(rpm_script_t, rpm_script_tmp_t, rpm_script_tmp_t)
+ files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
+
+ manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
+@@ -272,12 +299,15 @@
+ storage_raw_read_fixed_disk(rpm_script_t)
+ storage_raw_write_fixed_disk(rpm_script_t)
+
++term_getattr_unallocated_ttys(rpm_script_t)
++term_list_ptys(rpm_script_t)
+ term_use_all_terms(rpm_script_t)
+
+ auth_dontaudit_getattr_shadow(rpm_script_t)
+ auth_use_nsswitch(rpm_script_t)
+ # ideally we would not need this
+ auth_manage_all_files_except_shadow(rpm_script_t)
++auth_relabel_shadow(rpm_script_t)
+
+ corecmd_exec_all_executables(rpm_script_t)
+
+@@ -291,6 +321,7 @@
+ files_exec_etc_files(rpm_script_t)
+ files_read_etc_runtime_files(rpm_script_t)
+ files_exec_usr_files(rpm_script_t)
++files_relabel_all_files(rpm_script_t)
+
+ init_domtrans_script(rpm_script_t)
+
+@@ -308,6 +339,7 @@
+ seutil_domtrans_loadpolicy(rpm_script_t)
+ seutil_domtrans_setfiles(rpm_script_t)
+ seutil_domtrans_semanage(rpm_script_t)
++seutil_domtrans_setsebool(rpm_script_t)
+
+ userdom_use_all_users_fds(rpm_script_t)
+
+@@ -326,6 +358,10 @@
+ ')
+
+ optional_policy(`
++ lvm_domtrans(rpm_script_t)
++')
++
++optional_policy(`
+ tzdata_domtrans(rpm_t)
+ tzdata_domtrans(rpm_script_t)
+ ')
+@@ -333,6 +369,7 @@
+ optional_policy(`
+ unconfined_domain(rpm_script_t)
+ unconfined_domtrans(rpm_script_t)
++ unconfined_execmem_domtrans(rpm_script_t)
+
+ optional_policy(`
+ java_domtrans_unconfined(rpm_script_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.6.1/policy/modules/admin/sudo.if
+--- nsaserefpolicy/policy/modules/admin/sudo.if 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/sudo.if 2008-11-25 09:45:43.000000000 -0500
+@@ -51,7 +51,7 @@
+ #
+
+ # Use capabilities.
+- allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_resource };
++ allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_nice sys_resource };
+ allow $1_sudo_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow $1_sudo_t self:process { setexec setrlimit };
+ allow $1_sudo_t self:fd use;
+@@ -64,33 +64,36 @@
+ allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms;
+ allow $1_sudo_t self:unix_dgram_socket sendto;
+ allow $1_sudo_t self:unix_stream_socket connectto;
+- allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read };
++ allow $1_sudo_t self:key manage_key_perms;
++ allow $1_sudo_t $1_t:key search;
+
+ # Enter this derived domain from the user domain
+ domtrans_pattern($3, sudo_exec_t, $1_sudo_t)
+
+ # By default, revert to the calling domain when a shell is executed.
+ corecmd_shell_domtrans($1_sudo_t, $3)
++ corecmd_bin_domtrans($1_sudo_t, $3)
+ allow $3 $1_sudo_t:fd use;
+ allow $3 $1_sudo_t:fifo_file rw_file_perms;
+ allow $3 $1_sudo_t:process sigchld;
+
+ kernel_read_kernel_sysctls($1_sudo_t)
+ kernel_read_system_state($1_sudo_t)
+- kernel_search_key($1_sudo_t)
++ kernel_link_key($1_sudo_t)
+
+ dev_read_urand($1_sudo_t)
++ dev_rw_generic_usb_dev($1_sudo_t)
+
+ fs_search_auto_mountpoints($1_sudo_t)
+ fs_getattr_xattr_fs($1_sudo_t)
+
+- auth_domtrans_chk_passwd($1_sudo_t)
++ auth_run_chk_passwd($1_sudo_t, $3)
+ # sudo stores a token in the pam_pid directory
+ auth_manage_pam_pid($1_sudo_t)
+ auth_use_nsswitch($1_sudo_t)
+
+ corecmd_read_bin_symlinks($1_sudo_t)
+- corecmd_getattr_all_executables($1_sudo_t)
++ corecmd_exec_all_executables($1_sudo_t)
+
+ domain_use_interactive_fds($1_sudo_t)
+ domain_sigchld_interactive_fds($1_sudo_t)
+@@ -102,9 +105,11 @@
+ files_getattr_usr_files($1_sudo_t)
+ # for some PAM modules and for cwd
+ files_dontaudit_search_home($1_sudo_t)
++ files_list_tmp($1_sudo_t)
+
+ init_rw_utmp($1_sudo_t)
+
++ logging_send_audit_msgs($1_sudo_t)
+ logging_send_syslog_msg($1_sudo_t)
+
+ miscfiles_read_localization($1_sudo_t)
+@@ -114,6 +119,30 @@
+ userdom_manage_user_tmp_files($1_sudo_t)
+ userdom_manage_user_tmp_symlinks($1_sudo_t)
+ userdom_use_user_terminals($1_sudo_t)
++
++ mta_role($2, $1_sudo_t)
++
++ tunable_policy(`use_nfs_home_dirs',`
++ fs_manage_nfs_files($1_sudo_t)
++ ')
++
++ tunable_policy(`use_samba_home_dirs',`
++ fs_manage_cifs_files($1_sudo_t)
++ ')
++
+ # for some PAM modules and for cwd
+ userdom_dontaudit_search_user_home_content($1_sudo_t)
++
++ domain_role_change_exemption($1_sudo_t)
++ userdom_spec_domtrans_all_users($1_sudo_t)
++
++ selinux_validate_context($1_sudo_t)
++ selinux_compute_relabel_context($1_sudo_t)
++ selinux_getattr_fs($1_sudo_t)
++ seutil_read_config($1_sudo_t)
++ seutil_search_default_contexts($1_sudo_t)
++
++ userdom_use_user_terminals($1_sudo_t)
++ term_relabel_all_user_ttys($1_sudo_t)
++ term_relabel_all_user_ptys($1_sudo_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.6.1/policy/modules/admin/tmpreaper.te
+--- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/tmpreaper.te 2008-11-25 09:45:43.000000000 -0500
+@@ -22,12 +22,16 @@
+ dev_read_urand(tmpreaper_t)
+
+ fs_getattr_xattr_fs(tmpreaper_t)
++fs_list_inotifyfs(tmpreaper_t)
+
+ files_read_etc_files(tmpreaper_t)
+ files_read_var_lib_files(tmpreaper_t)
+ files_purge_tmp(tmpreaper_t)
+ # why does it need setattr?
+ files_setattr_all_tmp_dirs(tmpreaper_t)
++files_getattr_lost_found_dirs(tmpreaper_t)
++files_getattr_all_dirs(tmpreaper_t)
++files_getattr_all_files(tmpreaper_t)
+
+ mls_file_read_all_levels(tmpreaper_t)
+ mls_file_write_all_levels(tmpreaper_t)
+@@ -39,6 +43,26 @@
+
+ cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
+
++userdom_delete_user_home_content_dirs(tmpreaper_t)
++userdom_delete_user_home_content_files(tmpreaper_t)
++userdom_delete_user_home_content_symlinks(tmpreaper_t)
++
++optional_policy(`
++ amavis_manage_spool_files(tmpreaper_t)
++')
++
++optional_policy(`
++ apache_delete_sys_content_rw(tmpreaper_t)
++')
++
++optional_policy(`
++ kismet_manage_log(tmpreaper_t)
++')
++
+ optional_policy(`
+ lpd_manage_spool(tmpreaper_t)
+ ')
++
++optional_policy(`
++ unconfined_domain(tmpreaper_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.6.1/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/usermanage.te 2008-11-25 09:45:43.000000000 -0500
+@@ -288,6 +288,7 @@
+ term_use_all_user_ttys(passwd_t)
+ term_use_all_user_ptys(passwd_t)
+
++auth_domtrans_chk_passwd(passwd_t)
+ auth_manage_shadow(passwd_t)
+ auth_relabel_shadow(passwd_t)
+ auth_etc_filetrans_shadow(passwd_t)
+@@ -307,6 +308,7 @@
+ # /usr/bin/passwd asks for w access to utmp, but it will operate
+ # correctly without it. Do not audit write denials to utmp.
+ init_dontaudit_rw_utmp(passwd_t)
++init_use_fds(passwd_t)
+
+ logging_send_audit_msgs(passwd_t)
+ logging_send_syslog_msg(passwd_t)
+@@ -320,9 +322,11 @@
+ # make sure that getcon succeeds
+ userdom_getattr_all_users(passwd_t)
+ userdom_read_all_users_state(passwd_t)
++userdom_read_user_tmp_files(passwd_t)
+ # user generally runs this from their home directory, so do not audit a search
+ # on user home dir
+ userdom_dontaudit_search_user_home_content(passwd_t)
++userdom_stream_connect(passwd_t)
+
+ optional_policy(`
+ nscd_domtrans(passwd_t)
+@@ -506,6 +510,16 @@
+ ')
+
+ optional_policy(`
++ tunable_policy(`samba_domain_controller',`
++ samba_append_log(useradd_t)
++ ')
++')
++
++optional_policy(`
+ rpm_use_fds(useradd_t)
+ rpm_rw_pipes(useradd_t)
+ ')
++
++optional_policy(`
++ unconfined_domain(useradd_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.if serefpolicy-3.6.1/policy/modules/admin/vbetool.if
+--- nsaserefpolicy/policy/modules/admin/vbetool.if 2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/admin/vbetool.if 2008-11-25 09:45:43.000000000 -0500
+@@ -18,3 +18,28 @@
+ corecmd_search_bin($1)
+ domtrans_pattern($1, vbetool_exec_t, vbetool_t)
+ ')
++
++########################################
++## <summary>
++## Execute vbetool in the vbetool domain, and
++## allow the specified role the vbetool domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the vbetool domain.
++## </summary>
++## </param>
++#
++interface(`vbetool_run',`
++ gen_require(`
++ type vbetool_t;
++ ')
++
++ vbetool_domtrans($1)
++ role $2 types vbetool_t;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.6.1/policy/modules/admin/vbetool.te
+--- nsaserefpolicy/policy/modules/admin/vbetool.te 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/vbetool.te 2008-11-25 09:45:43.000000000 -0500
+@@ -23,6 +23,9 @@
+ dev_rwx_zero(vbetool_t)
+ dev_read_sysfs(vbetool_t)
+
++domain_mmap_low_type(vbetool_t)
++domain_mmap_low(vbetool_t)
++
+ term_use_unallocated_ttys(vbetool_t)
+
+ miscfiles_read_localization(vbetool_t)
+@@ -32,3 +35,9 @@
+ hal_write_log(vbetool_t)
+ hal_dontaudit_append_lib_files(vbetool_t)
+ ')
++
++optional_policy(`
++ xserver_exec_pid(vbetool_t)
++ xserver_write_pid(vbetool_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.if serefpolicy-3.6.1/policy/modules/admin/vpn.if
+--- nsaserefpolicy/policy/modules/admin/vpn.if 2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/admin/vpn.if 2008-11-25 09:45:43.000000000 -0500
+@@ -47,6 +47,24 @@
+
+ ########################################
+ ## <summary>
++## Send VPN clients the kill signal.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`vpn_kill',`
++ gen_require(`
++ type vpnc_t;
++ ')
++
++ allow $1 vpnc_t:process sigkill;
++')
++
++########################################
++## <summary>
+ ## Send generic signals to VPN clients.
+ ## </summary>
+ ## <param name="domain">
+@@ -65,6 +83,24 @@
+
+ ########################################
+ ## <summary>
++## Send signull to VPN clients.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`vpn_signull',`
++ gen_require(`
++ type vpnc_t;
++ ')
++
++ allow $1 vpnc_t:process signull;
++')
++
++########################################
++## <summary>
+ ## Send and receive messages from
+ ## Vpnc over dbus.
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/awstats.te serefpolicy-3.6.1/policy/modules/apps/awstats.te
+--- nsaserefpolicy/policy/modules/apps/awstats.te 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/awstats.te 2008-11-27 06:12:28.000000000 -0500
+@@ -47,6 +47,8 @@
+ # e.g. /usr/share/awstats/lang/awstats-en.txt
+ files_read_usr_files(awstats_t)
+
++fs_list_inotifyfs(awstats_t)
++
+ libs_read_lib_files(awstats_t)
+
+ miscfiles_read_localization(awstats_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.6.1/policy/modules/apps/games.if
+--- nsaserefpolicy/policy/modules/apps/games.if 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/games.if 2008-11-25 09:45:43.000000000 -0500
+@@ -30,3 +30,22 @@
+ ps_process_pattern($2, games_t)
+ allow $2 games_t:process signal_perms;
+ ')
++
++########################################
++## <summary>
++## Allow the specified domain to read/write
++## games data.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`games_rw_data',`
++ gen_require(`
++ type games_data_t;
++ ')
++
++ rw_files_pattern($1, games_data_t, games_data_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.6.1/policy/modules/apps/gnome.fc
+--- nsaserefpolicy/policy/modules/apps/gnome.fc 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/gnome.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,8 +1,12 @@
+ HOME_DIR/\.config/gtk-.* gen_context(system_u:object_r:gnome_home_t,s0)
+ HOME_DIR/\.gconf(d)?(/.*)? gen_context(system_u:object_r:gconf_home_t,s0)
++HOME_DIR/\.gnome2(/.*)? gen_context(system_u:object_r:gnome_home_t,s0)
++HOME_DIR/\.local.* gen_context(system_u:object_r:gconf_home_t,s0)
++HOME_DIR/\.pulse(/.*)? gen_context(system_u:object_r:gnome_home_t,s0)
+
+ /etc/gconf(/.*)? gen_context(system_u:object_r:gconf_etc_t,s0)
+
+ /tmp/gconfd-USER/.* -- gen_context(system_u:object_r:gconf_tmp_t,s0)
+
+-/usr/libexec/gconfd-2 -- gen_context(system_u:object_r:gconfd_exec_t,s0)
++# Don't use because toolchain is broken
++#/usr/libexec/gconfd-2 -- gen_context(system_u:object_r:gconfd_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.6.1/policy/modules/apps/gnome.if
+--- nsaserefpolicy/policy/modules/apps/gnome.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/gnome.if 2008-11-25 09:45:43.000000000 -0500
+@@ -91,3 +91,106 @@
+ allow $1 gnome_home_t:file manage_file_perms;
+ userdom_search_user_home_dirs($1)
+ ')
++
++########################################
++## <summary>
++## Send general signals to all gconf domains.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`gnome_signal_all',`
++ gen_require(`
++ attribute gnomedomain;
++ ')
++
++ allow $1 gnomedomain:process signal;
++')
++
++########################################
++## <summary>
++## read gnome homedir content (.config)
++## </summary>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++template(`gnome_read_config',`
++ gen_require(`
++ type gnome_home_t;
++ ')
++
++ read_files_pattern($2, gnome_home_t, gnome_home_t)
++')
++
++########################################
++## <summary>
++## Execute gconf programs in
++## in the caller domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`gnome_exec_gconf',`
++ gen_require(`
++ type gconfd_exec_t;
++ ')
++
++ can_exec($1, gconfd_exec_t)
++')
++
++########################################
++## <summary>
++## Read gconf home files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`gnome_read_gconf_home_files',`
++ gen_require(`
++ type gconf_home_t;
++ ')
++
++ read_files_pattern($1, gconf_home_t, gconf_home_t)
++')
++
++########################################
++## <summary>
++## Connect to gnome over an unix stream socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++interface(`gnome_stream_connect',`
++ gen_require(`
++ type gnome_home_t;
++ ')
++
++ # Connect to pulseaudit server
++ stream_connect_pattern($1, gnome_home_t, gnome_home_t, $2)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.6.1/policy/modules/apps/gnome.te
+--- nsaserefpolicy/policy/modules/apps/gnome.te 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/gnome.te 2008-11-25 09:45:43.000000000 -0500
+@@ -9,16 +9,18 @@
+ attribute gnomedomain;
+
+ type gconf_etc_t;
+-files_type(gconf_etc_t)
++files_config_file(gconf_etc_t)
+
+ type gconf_home_t;
+ typealias gconf_home_t alias { user_gconf_home_t staff_gconf_home_t sysadm_gconf_home_t };
+ typealias gconf_home_t alias { auditadm_gconf_home_t secadm_gconf_home_t };
++typealias gconf_home_t alias unconfined_gconf_home_t;
+ userdom_user_home_content(gconf_home_t)
+
+ type gconf_tmp_t;
+ typealias gconf_tmp_t alias { user_gconf_tmp_t staff_gconf_tmp_t sysadm_gconf_tmp_t };
+ typealias gconf_tmp_t alias { auditadm_gconf_tmp_t secadm_gconf_tmp_t };
++typealias gconf_tmp_t alias unconfined_gconf_tmp_t;
+ files_tmp_file(gconf_tmp_t)
+ ubac_constrained(gconf_tmp_t)
+
+@@ -32,6 +34,7 @@
+ type gnome_home_t;
+ typealias gnome_home_t alias { user_gnome_home_t staff_gnome_home_t sysadm_gnome_home_t };
+ typealias gnome_home_t alias { auditadm_gnome_home_t secadm_gnome_home_t };
++typealias gnome_home_t alias unconfined_gnome_home_t;
+ userdom_user_home_content(gnome_home_t)
+
+ ##############################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.6.1/policy/modules/apps/gpg.fc
+--- nsaserefpolicy/policy/modules/apps/gpg.fc 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/gpg.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -5,5 +5,5 @@
+ /usr/bin/kgpg -- gen_context(system_u:object_r:gpg_exec_t,s0)
+ /usr/bin/pinentry.* -- gen_context(system_u:object_r:pinentry_exec_t,s0)
+
+-/usr/lib/gnupg/.* -- gen_context(system_u:object_r:gpg_exec_t,s0)
+-/usr/lib/gnupg/gpgkeys.* -- gen_context(system_u:object_r:gpg_helper_exec_t,s0)
++/usr/lib(64)?/gnupg/.* -- gen_context(system_u:object_r:gpg_exec_t,s0)
++/usr/lib(64)?/gnupg/gpgkeys.* -- gen_context(system_u:object_r:gpg_helper_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.6.1/policy/modules/apps/gpg.te
+--- nsaserefpolicy/policy/modules/apps/gpg.te 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/gpg.te 2008-11-25 09:45:43.000000000 -0500
+@@ -60,7 +60,7 @@
+
+ allow gpg_t self:capability { ipc_lock setuid };
+ # setrlimit is for ulimit -c 0
+-allow gpg_t self:process { signal setrlimit setcap setpgid };
++allow gpg_t self:process { signal setrlimit getcap setcap setpgid };
+
+ allow gpg_t self:fifo_file rw_fifo_file_perms;
+ allow gpg_t self:tcp_socket create_stream_socket_perms;
+@@ -73,6 +73,12 @@
+ manage_lnk_files_pattern(gpg_t, gpg_secret_t, gpg_secret_t)
+ userdom_user_home_dir_filetrans(gpg_t, gpg_secret_t, dir)
+
++manage_dirs_pattern(gpg_t, gpg_agent_tmp_t, gpg_agent_tmp_t)
++manage_files_pattern(gpg_t, gpg_agent_tmp_t, gpg_agent_tmp_t)
++files_tmp_filetrans(gpg_t, gpg_agent_tmp_t, { dir file })
++
++kernel_read_sysctl(gpg_t)
++
+ corenet_all_recvfrom_unlabeled(gpg_t)
+ corenet_all_recvfrom_netlabel(gpg_t)
+ corenet_tcp_sendrecv_all_if(gpg_t)
+@@ -88,6 +94,7 @@
+ dev_read_urand(gpg_t)
+
+ fs_getattr_xattr_fs(gpg_t)
++fs_list_inotifyfs(gpg_t)
+
+ domain_use_interactive_fds(gpg_t)
+
+@@ -95,23 +102,21 @@
+ files_read_usr_files(gpg_t)
+ files_dontaudit_search_var(gpg_t)
+
++auth_use_nsswitch(gpg_t)
++
+ miscfiles_read_localization(gpg_t)
+
+ logging_send_syslog_msg(gpg_t)
+
+-sysnet_read_config(gpg_t)
+-
+ userdom_use_user_terminals(gpg_t)
+
+-optional_policy(`
+- nis_use_ypbind(gpg_t)
+-')
+-
+ ########################################
+ #
+ # GPG helper local policy
+ #
+
++allow gpg_helper_t self:process { getsched setsched };
++
+ # for helper programs (which automatically fetch keys)
+ # Note: this is only tested with the hkp interface. If you use eg the
+ # mail interface you will likely need additional permissions.
+@@ -136,13 +141,11 @@
+ corenet_udp_bind_all_nodes(gpg_helper_t)
+ corenet_tcp_connect_all_ports(gpg_helper_t)
+
+-dev_read_urand(gpg_helper_t)
+-
+ files_read_etc_files(gpg_helper_t)
+-# for nscd
+-files_dontaudit_search_var(gpg_helper_t)
+
+-sysnet_read_config(gpg_helper_t)
++fs_list_inotifyfs(gpg_helper_t)
++
++auth_use_nsswitch(gpg_helper_t)
+
+ tunable_policy(`use_nfs_home_dirs',`
+ fs_dontaudit_rw_nfs_files(gpg_helper_t)
+@@ -157,6 +160,17 @@
+ xserver_rw_xdm_pipes(gpg_t)
+ ')
+
++
++tunable_policy(`use_nfs_home_dirs',`
++ fs_manage_nfs_dirs(gpg_t)
++ fs_manage_nfs_files(gpg_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++ fs_manage_cifs_dirs(gpg_t)
++ fs_manage_cifs_files(gpg_t)
++')
++
+ ########################################
+ #
+ # GPG agent local policy
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.6.1/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc 2008-08-07 11:15:03.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/apps/java.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -3,14 +3,15 @@
+ #
+ /opt/(.*/)?bin/java[^/]* -- gen_context(system_u:object_r:java_exec_t,s0)
+ /opt/ibm/java2-ppc64-50/jre/(bin|javaws)(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
+-/opt/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
+-/opt/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
++/opt/local/matlab.*/bin.*/MATLAB.* -- gen_context(system_u:object_r:java_exec_t,s0)
++/opt/matlab.*/bin.*/MATLAB.* -- gen_context(system_u:object_r:java_exec_t,s0)
+
+ #
+ # /usr
+ #
+ /usr/(.*/)?bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/lib(.*/)?bin/java[^/]* -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib/eclipse/eclipse -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/frysk -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/gappletviewer -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/gcj-dbtool -- gen_context(system_u:object_r:java_exec_t,s0)
+@@ -20,5 +21,11 @@
+ /usr/bin/grmic -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/grmiregistry -- gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/jv-convert -- gen_context(system_u:object_r:java_exec_t,s0)
+-/usr/local/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
+-/usr/matlab/bin/(.*/)?MATLAB. -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/fastjar -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/local/matlab.*/bin.*/MATLAB.* -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/matlab.*/bin.*/MATLAB.* -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib64/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
++
++/usr/bin/octave-[^/]* -- gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib/opera(/.*)?/opera -- gen_context(system_u:object_r:java_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.1/policy/modules/apps/java.if
+--- nsaserefpolicy/policy/modules/apps/java.if 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/java.if 2008-11-25 09:45:43.000000000 -0500
+@@ -68,3 +68,96 @@
+ domtrans_pattern($1, java_exec_t, unconfined_java_t)
+ corecmd_search_bin($1)
+ ')
++
++########################################
++## <summary>
++## Execute java in the java domain, and
++## allow the specified role the java domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the java domain.
++## </summary>
++## </param>
++#
++interface(`java_run',`
++ gen_require(`
++ type java_t;
++ ')
++
++ java_domtrans($1)
++ role $2 types java_t;
++')
++
++########################################
++## <summary>
++## Execute the java program in the java domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`java_exec',`
++ gen_require(`
++ type java_exec_t;
++ ')
++
++ ca_exec($1, java_exec_t)
++')
++
++#######################################
++## <summary>
++## The role template for the java module.
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for java applications.
++## </p>
++## </desc>
++## <param name="role_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++template(`java_role_template',`
++ gen_require(`
++ type java_exec_t;
++ ')
++
++ type $1_java_t;
++ domain_type($1_java_t)
++ domain_entry_file($1_java_t, java_exec_t)
++ role $2 types $1_java_t;
++
++ domain_interactive_fd($1_java_t)
++
++ userdom_unpriv_usertype($1, $1_java_t)
++
++ allow $1_java_t self:process { ptrace signal getsched execmem execstack };
++ allow $3 $1_java_t:process { getattr ptrace noatsecure signal_perms };
++
++ domtrans_pattern($3, java_exec_t, $1_java_t)
++
++ fs_dontaudit_rw_tmpfs_files($1_java_t)
++ corecmd_bin_domtrans($1_java_t, $1_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.1/policy/modules/apps/java.te
+--- nsaserefpolicy/policy/modules/apps/java.te 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/java.te 2008-11-25 09:45:43.000000000 -0500
+@@ -40,7 +40,7 @@
+ # Local policy
+ #
+
+-allow java_t self:process { signal_perms getsched setsched execmem };
++allow java_t self:process { signal_perms getsched execmem };
+ allow java_t self:fifo_file rw_fifo_file_perms;
+ allow java_t self:tcp_socket create_socket_perms;
+ allow java_t self:udp_socket create_socket_perms;
+@@ -147,4 +147,11 @@
+
+ unconfined_domain_noaudit(unconfined_java_t)
+ unconfined_dbus_chat(unconfined_java_t)
++ optional_policy(`
++ hal_dbus_chat(unconfined_java_t)
++ ')
++
++ optional_policy(`
++ rpm_domtrans(unconfined_java_t)
++ ')
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.6.1/policy/modules/apps/livecd.fc
+--- nsaserefpolicy/policy/modules/apps/livecd.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/livecd.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,2 @@
++
++/usr/bin/livecd-creator -- gen_context(system_u:object_r:livecd_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.if serefpolicy-3.6.1/policy/modules/apps/livecd.if
+--- nsaserefpolicy/policy/modules/apps/livecd.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/livecd.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,50 @@
++
++## <summary>policy for livecd</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run livecd.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`livecd_domtrans',`
++ gen_require(`
++ type livecd_t;
++ type livecd_exec_t;
++ ')
++
++ domtrans_pattern($1, livecd_exec_t, livecd_t)
++')
++
++
++########################################
++## <summary>
++## Execute livecd in the livecd domain, and
++## allow the specified role the livecd domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the livecd domain.
++## </summary>
++## </param>
++#
++interface(`livecd_run',`
++ gen_require(`
++ type livecd_t;
++ ')
++
++ livecd_domtrans($1)
++ role $2 types livecd_t;
++
++ seutil_run_setfiles_mac(livecd_t, $2)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.6.1/policy/modules/apps/livecd.te
+--- nsaserefpolicy/policy/modules/apps/livecd.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/livecd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,26 @@
++policy_module(livecd, 1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type livecd_t;
++type livecd_exec_t;
++application_domain(livecd_t, livecd_exec_t)
++role system_r types livecd_t;
++
++########################################
++#
++# livecd local policy
++#
++dontaudit livecd_t self:capability2 mac_admin;
++
++unconfined_domain_noaudit(livecd_t)
++domain_ptrace_all_domains(livecd_t)
++
++optional_policy(`
++ hal_dbus_chat(livecd_t)
++')
++
++seutil_domtrans_setfiles_mac(livecd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.6.1/policy/modules/apps/mono.if
+--- nsaserefpolicy/policy/modules/apps/mono.if 2008-08-07 11:15:02.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/apps/mono.if 2008-11-25 09:45:43.000000000 -0500
+@@ -21,6 +21,99 @@
+
+ ########################################
+ ## <summary>
++## Read and write to mono shared memory.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`mono_rw_shm',`
++ gen_require(`
++ type mono_t;
++ ')
++
++ allow $1 mono_t:shm rw_shm_perms;
++')
++
++########################################
++## <summary>
++## Execute mono in the mono domain, and
++## allow the specified role the mono domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the mono domain.
++## </summary>
++## </param>
++#
++interface(`mono_run',`
++ gen_require(`
++ type mono_t;
++ ')
++
++ mono_domtrans($1)
++ role $2 types mono_t;
++')
++
++#######################################
++## <summary>
++## The role template for the mono module.
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for mono applications.
++## </p>
++## </desc>
++## <param name="role_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++template(`mono_role_template',`
++ gen_require(`
++ type mono_exec_t;
++ ')
++
++ type $1_mono_t;
++ domain_type($1_mono_t)
++ domain_entry_file($1_mono_t, mono_exec_t)
++ role $2 types $1_mono_t;
++
++ domain_interactive_fd($1_mono_t)
++
++ userdom_unpriv_usertype($1, $1_mono_t)
++
++ allow $1_mono_t self:process { ptrace signal getsched execheap execmem execstack };
++ allow $3 $1_mono_t:process { getattr ptrace noatsecure signal_perms };
++
++ domtrans_pattern($3, mono_exec_t, $1_mono_t)
++
++ fs_dontaudit_rw_tmpfs_files($1_mono_t)
++ corecmd_bin_domtrans($1_mono_t, $1_t)
++')
++
++########################################
++## <summary>
+ ## Execute the mono program in the caller domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -31,7 +124,7 @@
+ #
+ interface(`mono_exec',`
+ gen_require(`
+- type mono_t, mono_exec_t;
++ type mono_exec_t;
+ ')
+
+ corecmd_search_bin($1)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.6.1/policy/modules/apps/mono.te
+--- nsaserefpolicy/policy/modules/apps/mono.te 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/mono.te 2008-11-25 09:45:43.000000000 -0500
+@@ -15,7 +15,7 @@
+ # Local policy
+ #
+
+-allow mono_t self:process { execheap execmem };
++allow mono_t self:process { ptrace signal getsched execheap execmem execstack };
+
+ init_dbus_chat_script(mono_t)
+
+@@ -46,3 +46,7 @@
+ unconfined_dbus_chat(mono_t)
+ unconfined_dbus_connect(mono_t)
+ ')
++
++optional_policy(`
++ xserver_rw_shm(mono_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.6.1/policy/modules/apps/mozilla.fc
+--- nsaserefpolicy/policy/modules/apps/mozilla.fc 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/mozilla.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -17,7 +17,6 @@
+ #
+ # /etc
+ #
+-/etc/mozpluggerrc -- gen_context(system_u:object_r:mozilla_conf_t,s0)
+
+ #
+ # /lib
+@@ -29,3 +28,5 @@
+ /usr/lib(64)?/mozilla[^/]*/mozilla-.* -- gen_context(system_u:object_r:mozilla_exec_t,s0)
+ /usr/lib(64)?/firefox[^/]*/mozilla-.* -- gen_context(system_u:object_r:mozilla_exec_t,s0)
+ /usr/lib(64)?/[^/]*firefox[^/]*/firefox-bin -- gen_context(system_u:object_r:mozilla_exec_t,s0)
++/usr/lib/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
++/usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.6.1/policy/modules/apps/mozilla.if
+--- nsaserefpolicy/policy/modules/apps/mozilla.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/mozilla.if 2008-11-25 09:45:43.000000000 -0500
+@@ -82,8 +82,7 @@
+ type mozilla_home_t;
+ ')
+
+- allow $1 mozilla_home_t:dir list_dir_perms;
+- allow $1 mozilla_home_t:file write;
++ write_files_pattern($1, mozilla_home_t, mozilla_home_t)
+ userdom_search_user_home_dirs($1)
+ ')
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.6.1/policy/modules/apps/mplayer.fc
+--- nsaserefpolicy/policy/modules/apps/mplayer.fc 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/mplayer.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,11 +1,7 @@
+ #
+-# /etc
+-#
+-/etc/mplayer(/.*)? gen_context(system_u:object_r:mplayer_etc_t,s0)
+-
+-#
+ # /usr
+ #
++/usr/bin/vlc -- gen_context(system_u:object_r:mplayer_exec_t,s0)
+ /usr/bin/mplayer -- gen_context(system_u:object_r:mplayer_exec_t,s0)
+ /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)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.6.1/policy/modules/apps/mplayer.if
+--- nsaserefpolicy/policy/modules/apps/mplayer.if 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/mplayer.if 2008-11-25 09:45:43.000000000 -0500
+@@ -83,3 +83,23 @@
+ read_files_pattern($1, mplayer_home_t, mplayer_home_t)
+ userdom_search_user_home_dirs($1)
+ ')
++
++########################################
++## <summary>
++## Execute mplayer in the caller domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++#
++interface(`mplayer_exec',`
++ gen_require(`
++ type mplayer_exec_t;
++ ')
++
++ can_exec($1, mplayer_exec_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.6.1/policy/modules/apps/nsplugin.fc
+--- nsaserefpolicy/policy/modules/apps/nsplugin.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/nsplugin.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,11 @@
++HOME_DIR/\.adobe(/.*)? gen_context(system_u:object_r:nsplugin_home_t,s0)
++HOME_DIR/\.macromedia(/.*)? gen_context(system_u:object_r:nsplugin_home_t,s0)
++HOME_DIR/\.gstreamer-.* gen_context(system_u:object_r:nsplugin_home_t,s0)
++HOME_DIR/\.config/totem(/.*)? gen_context(system_u:object_r:nsplugin_home_t,s0)
++HOME_DIR/\.gcjwebplugin(/.*)? gen_context(system_u:object_r:nsplugin_home_t,s0)
++HOME_DIR/\.icedteaplugin(/.*)? gen_context(system_u:object_r:nsplugin_home_t,s0)
++
++/usr/bin/nspluginscan -- gen_context(system_u:object_r:nsplugin_exec_t,s0)
++/usr/lib(64)?/nspluginwrapper/npviewer.bin -- gen_context(system_u:object_r:nsplugin_exec_t,s0)
++/usr/lib(64)?/nspluginwrapper/plugin-config -- gen_context(system_u:object_r:nsplugin_config_exec_t,s0)
++/usr/lib(64)?/mozilla/plugins-wrapped(/.*)? gen_context(system_u:object_r:nsplugin_rw_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.1/policy/modules/apps/nsplugin.if
+--- nsaserefpolicy/policy/modules/apps/nsplugin.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/nsplugin.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,248 @@
++
++## <summary>policy for nsplugin</summary>
++
++########################################
++## <summary>
++## Create, read, write, and delete
++## nsplugin rw files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nsplugin_manage_rw_files',`
++ gen_require(`
++ type nsplugin_rw_t;
++ ')
++
++ allow $1 nsplugin_rw_t:file manage_file_perms;
++ allow $1 nsplugin_rw_t:dir rw_dir_perms;
++')
++
++########################################
++## <summary>
++## Manage nsplugin rw files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nsplugin_manage_rw',`
++ gen_require(`
++ type nsplugin_rw_t;
++ ')
++
++ manage_dirs_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
++ manage_files_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
++ manage_lnk_files_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
++')
++
++#######################################
++## <summary>
++## The per role template for the nsplugin module.
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for nsplugin web browser.
++## </p>
++## <p>
++## This template is invoked automatically for each user, and
++## generally does not need to be invoked directly
++## by policy writers.
++## </p>
++## </desc>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++#
++interface(`nsplugin_role_notrans',`
++ gen_require(`
++ type nsplugin_rw_t;
++ type nsplugin_home_t;
++ type nsplugin_exec_t;
++ type nsplugin_config_exec_t;
++ type nsplugin_t;
++ type nsplugin_config_t;
++ ')
++
++ role $1 types nsplugin_t;
++ role $1 types nsplugin_config_t;
++
++ allow nsplugin_t $2:process signull;
++
++ list_dirs_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
++ read_files_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
++ read_lnk_files_pattern($2, nsplugin_rw_t, nsplugin_rw_t)
++ can_exec($2, nsplugin_rw_t)
++
++ #Leaked File Descriptors
++ dontaudit nsplugin_t $2:tcp_socket rw_socket_perms;
++ dontaudit nsplugin_t $2:udp_socket rw_socket_perms;
++ dontaudit nsplugin_t $2:unix_stream_socket rw_socket_perms;
++ dontaudit nsplugin_t $2:unix_dgram_socket rw_socket_perms;
++ dontaudit nsplugin_t $2:fifo_file rw_fifo_file_perms;
++ dontaudit nsplugin_config_t $2:tcp_socket rw_socket_perms;
++ dontaudit nsplugin_config_t $2:udp_socket rw_socket_perms;
++ dontaudit nsplugin_config_t $2:unix_stream_socket rw_socket_perms;
++ dontaudit nsplugin_config_t $2:unix_dgram_socket rw_socket_perms;
++ dontaudit nsplugin_config_t $2:fifo_file rw_fifo_file_perms;
++ allow nsplugin_t $2:unix_stream_socket connectto;
++ dontaudit nsplugin_t $2:process ptrace;
++
++ allow $2 nsplugin_t:process { getattr ptrace signal_perms };
++ allow $2 nsplugin_t:unix_stream_socket connectto;
++
++ # Connect to pulseaudit server
++ stream_connect_pattern(nsplugin_t, user_home_t, user_home_t, $2)
++ gnome_stream_connect(nsplugin_t, $2)
++
++ userdom_use_user_terminals(nsplugin_t)
++ userdom_use_user_terminals(nsplugin_config_t)
++ userdom_dontaudit_setattr_user_home_content_files(nsplugin_t)
++ userdom_manage_tmpfs_role($1, nsplugin_t)
++
++')
++
++#######################################
++## <summary>
++## Role access for nsplugin
++## </summary>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++interface(`nsplugin_role',`
++ gen_require(`
++ type nsplugin_exec_t;
++ type nsplugin_config_exec_t;
++ type nsplugin_t;
++ type nsplugin_config_t;
++ ')
++
++ nsplugin_role_notrans($1, $2)
++
++ domtrans_pattern($2, nsplugin_exec_t, nsplugin_t)
++ domtrans_pattern($2, nsplugin_config_exec_t, nsplugin_config_t)
++')
++
++#######################################
++## <summary>
++## The per role template for the nsplugin module.
++## </summary>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++interface(`nsplugin_domtrans',`
++ gen_require(`
++ type nsplugin_exec_t;
++ type nsplugin_t;
++ ')
++
++ domtrans_pattern($1, nsplugin_exec_t, nsplugin_t)
++')
++#######################################
++## <summary>
++## The per role template for the nsplugin module.
++## </summary>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++interface(`nsplugin_domtrans_config',`
++ gen_require(`
++ type nsplugin_config_exec_t;
++ type nsplugin_config_t;
++ ')
++
++ domtrans_pattern($1, nsplugin_config_exec_t, nsplugin_config_t)
++')
++
++########################################
++## <summary>
++## Search nsplugin rw directories.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nsplugin_search_rw_dir',`
++ gen_require(`
++ type nsplugin_rw_t;
++ ')
++
++ allow $1 nsplugin_rw_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++## Read nsplugin rw files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nsplugin_read_rw_files',`
++ gen_require(`
++ type nsplugin_rw_t;
++ ')
++
++ read_files_pattern($1, nsplugin_rw_t, nsplugin_rw_t)
++')
++
++########################################
++## <summary>
++## Exec nsplugin rw files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nsplugin_rw_exec',`
++ gen_require(`
++ type nsplugin_rw_t;
++ ')
++
++ can_exec($1, nsplugin_rw_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.1/policy/modules/apps/nsplugin.te
+--- nsaserefpolicy/policy/modules/apps/nsplugin.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/nsplugin.te 2008-12-01 16:31:07.000000000 -0500
+@@ -0,0 +1,272 @@
++
++policy_module(nsplugin, 1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++## <desc>
++## <p>
++## Allow nsplugin code to execmem/execstack
++## </p>
++## </desc>
++gen_tunable(allow_nsplugin_execmem, false)
++
++type nsplugin_exec_t;
++application_executable_file(nsplugin_exec_t)
++
++type nsplugin_config_exec_t;
++application_executable_file(nsplugin_config_exec_t)
++
++type nsplugin_rw_t;
++files_type(nsplugin_rw_t)
++
++type nsplugin_tmp_t;
++files_tmp_file(nsplugin_tmp_t)
++
++type nsplugin_home_t;
++files_poly_member(nsplugin_home_t)
++userdom_user_home_content(nsplugin_home_t)
++typealias nsplugin_home_t alias user_nsplugin_home_t;
++
++type nsplugin_t;
++domain_type(nsplugin_t)
++domain_entry_file(nsplugin_t, nsplugin_exec_t)
++
++type nsplugin_config_t;
++domain_type(nsplugin_config_t)
++domain_entry_file(nsplugin_config_t, nsplugin_config_exec_t)
++
++application_executable_file(nsplugin_exec_t)
++application_executable_file(nsplugin_config_exec_t)
++
++
++########################################
++#
++# nsplugin local policy
++#
++dontaudit nsplugin_t self:capability sys_tty_config;
++allow nsplugin_t self:fifo_file rw_file_perms;
++allow nsplugin_t self:process { ptrace setpgid getsched setsched signal_perms };
++
++allow nsplugin_t self:sem create_sem_perms;
++allow nsplugin_t self:shm create_shm_perms;
++allow nsplugin_t self:msgq create_msgq_perms;
++allow nsplugin_t self:unix_stream_socket { connectto create_stream_socket_perms };
++allow nsplugin_t self:unix_dgram_socket create_socket_perms;
++
++tunable_policy(`allow_nsplugin_execmem',`
++ allow nsplugin_t self:process { execstack execmem };
++ allow nsplugin_config_t self:process { execstack execmem };
++')
++
++manage_dirs_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++exec_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++manage_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++manage_lnk_files_pattern(nsplugin_t, nsplugin_home_t, nsplugin_home_t)
++userdom_user_home_dir_filetrans(nsplugin_t, nsplugin_home_t, {file dir})
++userdom_user_home_content_filetrans(nsplugin_t, nsplugin_home_t, {file dir})
++userdom_dontaudit_write_user_home_content_files(nsplugin_t)
++
++corecmd_exec_bin(nsplugin_t)
++corecmd_exec_shell(nsplugin_t)
++
++corenet_all_recvfrom_unlabeled(nsplugin_t)
++corenet_all_recvfrom_netlabel(nsplugin_t)
++corenet_tcp_connect_flash_port(nsplugin_t)
++corenet_tcp_connect_streaming_port(nsplugin_t)
++corenet_tcp_connect_pulseaudio_port(nsplugin_t)
++corenet_tcp_connect_http_port(nsplugin_t)
++corenet_tcp_connect_http_cache_port(nsplugin_t)
++corenet_tcp_sendrecv_generic_if(nsplugin_t)
++corenet_tcp_sendrecv_all_nodes(nsplugin_t)
++corenet_tcp_connect_ipp_port(nsplugin_t)
++
++domain_dontaudit_read_all_domains_state(nsplugin_t)
++
++dev_read_rand(nsplugin_t)
++dev_read_sound(nsplugin_t)
++dev_write_sound(nsplugin_t)
++dev_read_video_dev(nsplugin_t)
++dev_write_video_dev(nsplugin_t)
++dev_getattr_dri_dev(nsplugin_t)
++dev_rwx_zero(nsplugin_t)
++
++kernel_read_kernel_sysctls(nsplugin_t)
++kernel_read_system_state(nsplugin_t)
++
++files_dontaudit_getattr_lost_found_dirs(nsplugin_t)
++files_dontaudit_list_home(nsplugin_t)
++files_read_usr_files(nsplugin_t)
++files_read_etc_files(nsplugin_t)
++files_read_config_files(nsplugin_t)
++
++fs_list_inotifyfs(nsplugin_t)
++fs_getattr_tmpfs(nsplugin_t)
++fs_getattr_xattr_fs(nsplugin_t)
++fs_search_auto_mountpoints(nsplugin_t)
++fs_rw_anon_inodefs_files(nsplugin_t)
++
++storage_dontaudit_getattr_fixed_disk_dev(nsplugin_t)
++
++term_dontaudit_getattr_all_user_ptys(nsplugin_t)
++term_dontaudit_getattr_all_user_ttys(nsplugin_t)
++
++auth_use_nsswitch(nsplugin_t)
++
++libs_exec_ld_so(nsplugin_t)
++
++miscfiles_read_localization(nsplugin_t)
++miscfiles_read_fonts(nsplugin_t)
++
++userdom_manage_user_tmp_dirs(nsplugin_t)
++userdom_manage_user_tmp_files(nsplugin_t)
++userdom_manage_user_tmp_sockets(nsplugin_t)
++userdom_tmp_filetrans_user_tmp(nsplugin_t, { file dir sock_file })
++userdom_rw_semaphores(nsplugin_t)
++
++userdom_read_user_home_content_symlinks(nsplugin_t)
++userdom_read_user_home_content_files(nsplugin_t)
++userdom_read_user_tmp_files(nsplugin_t)
++userdom_write_user_tmp_sockets(nsplugin_t)
++userdom_dontaudit_append_user_home_content_files(nsplugin_t)
++userdom_dontaudit_delete_user_home_content_files(nsplugin_t)
++
++optional_policy(`
++ alsa_read_rw_config(nsplugin_t)
++')
++
++optional_policy(`
++ cups_stream_connect(nsplugin_t)
++')
++
++optional_policy(`
++ dbus_session_bus_client(nsplugin_t)
++ dbus_system_bus_client(nsplugin_t)
++')
++
++optional_policy(`
++ gnome_exec_gconf(nsplugin_t)
++ gnome_manage_config(nsplugin_t)
++ gnome_read_gconf_home_files(nsplugin_t)
++')
++
++optional_policy(`
++ mozilla_read_user_home_files(nsplugin_t)
++ mozilla_write_user_home_files(nsplugin_t)
++')
++
++optional_policy(`
++ mplayer_exec(nsplugin_t)
++ mplayer_read_user_home_files(nsplugin_t)
++')
++
++optional_policy(`
++ unconfined_execmem_signull(nsplugin_t)
++')
++
++optional_policy(`
++ gen_require(`
++ type user_tmpfs_t;
++ ')
++ xserver_user_x_domain_template(nsplugin, nsplugin_t, user_tmpfs_t)
++ xserver_stream_connect_xdm(nsplugin_t)
++ xserver_stream_connect(nsplugin_t)
++ xserver_rw_shm(nsplugin_t)
++ xserver_read_xdm_tmp_files(nsplugin_t)
++ xserver_read_xdm_pid(nsplugin_t)
++ xserver_read_user_xauth(nsplugin_t)
++ xserver_read_user_iceauth(nsplugin_t)
++ xserver_use_user_fonts(nsplugin_t)
++ xserver_manage_home_fonts(nsplugin_t)
++ xserver_dontaudit_rw_xdm_home_files(nsplugin_t)
++')
++
++########################################
++#
++# nsplugin_config local policy
++#
++
++allow nsplugin_config_t self:capability { dac_override dac_read_search sys_nice setuid setgid };
++allow nsplugin_config_t self:process { setsched sigkill getsched execmem };
++#execing pulseaudio
++dontaudit nsplugin_t self:process { getcap setcap };
++
++allow nsplugin_config_t self:fifo_file rw_file_perms;
++allow nsplugin_config_t self:unix_stream_socket create_stream_socket_perms;
++
++fs_list_inotifyfs(nsplugin_config_t)
++fs_search_auto_mountpoints(nsplugin_config_t)
++
++can_exec(nsplugin_config_t, nsplugin_rw_t)
++manage_dirs_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++manage_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++manage_lnk_files_pattern(nsplugin_config_t, nsplugin_rw_t, nsplugin_rw_t)
++
++manage_dirs_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++manage_files_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++manage_lnk_files_pattern(nsplugin_config_t, nsplugin_home_t, nsplugin_home_t)
++
++corecmd_exec_bin(nsplugin_config_t)
++corecmd_exec_shell(nsplugin_config_t)
++
++kernel_read_system_state(nsplugin_config_t)
++
++files_read_etc_files(nsplugin_config_t)
++files_read_usr_files(nsplugin_config_t)
++files_dontaudit_search_home(nsplugin_config_t)
++files_list_tmp(nsplugin_config_t)
++
++auth_use_nsswitch(nsplugin_config_t)
++
++miscfiles_read_localization(nsplugin_config_t)
++miscfiles_read_fonts(nsplugin_config_t)
++
++userdom_search_user_home_content(nsplugin_config_t)
++userdom_read_user_home_content_files(nsplugin_config_t)
++
++tunable_policy(`use_nfs_home_dirs',`
++ fs_getattr_nfs(nsplugin_t)
++ fs_manage_nfs_dirs(nsplugin_t)
++ fs_manage_nfs_files(nsplugin_t)
++ fs_read_nfs_symlinks(nsplugin_t)
++ fs_manage_nfs_named_pipes(nsplugin_t)
++ fs_manage_nfs_dirs(nsplugin_config_t)
++ fs_manage_nfs_files(nsplugin_config_t)
++ fs_manage_nfs_named_pipes(nsplugin_config_t)
++ fs_read_nfs_symlinks(nsplugin_config_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++ fs_getattr_cifs(nsplugin_t)
++ fs_manage_cifs_dirs(nsplugin_t)
++ fs_manage_cifs_files(nsplugin_t)
++ fs_read_cifs_symlinks(nsplugin_t)
++ fs_manage_cifs_named_pipes(nsplugin_t)
++ fs_manage_cifs_dirs(nsplugin_config_t)
++ fs_manage_cifs_files(nsplugin_config_t)
++ fs_manage_cifs_named_pipes(nsplugin_config_t)
++ fs_read_cifs_symlinks(nsplugin_config_t)
++')
++
++domtrans_pattern(nsplugin_config_t, nsplugin_exec_t, nsplugin_t)
++
++optional_policy(`
++ xserver_read_home_fonts(nsplugin_config_t)
++')
++
++optional_policy(`
++ mozilla_read_user_home_files(nsplugin_config_t)
++')
++
++optional_policy(`
++ gen_require(`
++ type unconfined_mono_t;
++ ')
++ allow nsplugin_t unconfined_mono_t:process signull;
++')
++
++unconfined_execmem_exec(nsplugin_t)
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.6.1/policy/modules/apps/openoffice.fc
+--- nsaserefpolicy/policy/modules/apps/openoffice.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/openoffice.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,3 @@
++/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:openoffice_exec_t,s0)
++/usr/lib64/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:openoffice_exec_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.6.1/policy/modules/apps/openoffice.if
+--- nsaserefpolicy/policy/modules/apps/openoffice.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/openoffice.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,89 @@
++## <summary>Openoffice</summary>
++
++#######################################
++## <summary>
++## The per role template for the openoffice module.
++## </summary>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++interface(`openoffice_plugin_role',`
++ gen_require(`
++ type openoffice_exec_t;
++ type openoffice_t;
++ ')
++
++ ########################################
++ #
++ # Local policy
++ #
++
++ domtrans_pattern($1, openoffice_exec_t, openoffice_t)
++ allow $1 openoffice_t:process { signal sigkill };
++')
++
++#######################################
++## <summary>
++## role for openoffice
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for java applications.
++## </p>
++## </desc>
++## <param name="role_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++interface(`openoffice_role_template',`
++ gen_require(`
++ type openoffice_exec_t;
++ ')
++
++ role $2 types $1_openoffice_t;
++
++ type $1_openoffice_t;
++ domain_type($1_openoffice_t)
++ domain_entry_file($1_openoffice_t, openoffice_exec_t)
++ domain_interactive_fd($1_openoffice_t)
++
++ userdom_unpriv_usertype($1, $1_openoffice_t)
++ userdom_exec_user_home_content_files($1_openoffice_t)
++
++ allow $1_openoffice_t self:process { getsched sigkill execheap execmem execstack };
++
++ allow $3 $1_openoffice_t:process { getattr ptrace signal_perms noatsecure siginh rlimitinh };
++ allow $1_openoffice_t $3:tcp_socket { read write };
++
++ domtrans_pattern($3, openoffice_exec_t, $1_openoffice_t)
++
++ dev_read_urand($1_openoffice_t)
++ dev_read_rand($1_openoffice_t)
++
++ fs_dontaudit_rw_tmpfs_files($1_openoffice_t)
++
++ allow $3 $1_openoffice_t:process { signal sigkill };
++ allow $1_openoffice_t $3:unix_stream_socket connectto;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.6.1/policy/modules/apps/openoffice.te
+--- nsaserefpolicy/policy/modules/apps/openoffice.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/openoffice.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,14 @@
++
++policy_module(openoffice, 1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type openoffice_t;
++type openoffice_exec_t;
++application_domain(openoffice_t, openoffice_exec_t)
++
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.fc serefpolicy-3.6.1/policy/modules/apps/podsleuth.fc
+--- nsaserefpolicy/policy/modules/apps/podsleuth.fc 2008-08-07 11:15:02.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/apps/podsleuth.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,2 +1,4 @@
+
+ /usr/bin/podsleuth -- gen_context(system_u:object_r:podsleuth_exec_t,s0)
++/usr/libexec/hal-podsleuth -- gen_context(system_u:object_r:podsleuth_exec_t,s0)
++/var/cache/podsleuth(/.*)? gen_context(system_u:object_r:podsleuth_cache_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.if serefpolicy-3.6.1/policy/modules/apps/podsleuth.if
+--- nsaserefpolicy/policy/modules/apps/podsleuth.if 2008-08-07 11:15:02.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/apps/podsleuth.if 2008-11-25 09:45:43.000000000 -0500
+@@ -16,4 +16,32 @@
+ ')
+
+ domtrans_pattern($1, podsleuth_exec_t, podsleuth_t)
++ allow $1 podsleuth_t:process signal;
+ ')
++
++
++########################################
++## <summary>
++## Execute podsleuth in the podsleuth domain, and
++## allow the specified role the podsleuth domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the podsleuth domain.
++## </summary>
++## </param>
++#
++interface(`podsleuth_run',`
++ gen_require(`
++ type podsleuth_t;
++ ')
++
++ podsleuth_domtrans($1)
++ role $2 types podsleuth_t;
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.6.1/policy/modules/apps/podsleuth.te
+--- nsaserefpolicy/policy/modules/apps/podsleuth.te 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/podsleuth.te 2008-11-25 09:45:43.000000000 -0500
+@@ -11,21 +11,52 @@
+ application_domain(podsleuth_t, podsleuth_exec_t)
+ role system_r types podsleuth_t;
+
++type podsleuth_tmp_t;
++files_tmp_file(podsleuth_tmp_t)
++
++type podsleuth_cache_t;
++files_type(podsleuth_cache_t)
++
+ ########################################
+ #
+ # podsleuth local policy
+ #
+-
+-allow podsleuth_t self:process { signal getsched execheap execmem };
++allow podsleuth_t self:capability { sys_admin sys_rawio };
++allow podsleuth_t self:process { ptrace signal getsched execheap execmem };
+ allow podsleuth_t self:fifo_file rw_file_perms;
+ allow podsleuth_t self:unix_stream_socket create_stream_socket_perms;
++allow podsleuth_t self:sem create_sem_perms;
++allow podsleuth_t self:tcp_socket create_stream_socket_perms;
++allow podsleuth_t self:udp_socket create_socket_perms;
+
+ kernel_read_system_state(podsleuth_t)
+
++corecmd_exec_bin(podsleuth_t)
++corenet_tcp_connect_http_port(podsleuth_t)
++
+ dev_read_urand(podsleuth_t)
+
+ files_read_etc_files(podsleuth_t)
+
++fs_mount_dos_fs(podsleuth_t)
++fs_unmount_dos_fs(podsleuth_t)
++fs_getattr_dos_fs(podsleuth_t)
++fs_read_dos_files(podsleuth_t)
++fs_search_dos(podsleuth_t)
++
++allow podsleuth_t podsleuth_tmp_t:dir mounton;
++manage_files_pattern(podsleuth_t, podsleuth_tmp_t, podsleuth_tmp_t)
++files_tmp_filetrans(podsleuth_t, podsleuth_tmp_t, { file dir })
++manage_dirs_pattern(podsleuth_t, podsleuth_tmp_t, podsleuth_tmp_t)
++
++manage_dirs_pattern(podsleuth_t, podsleuth_cache_t, podsleuth_cache_t)
++manage_files_pattern(podsleuth_t, podsleuth_cache_t, podsleuth_cache_t)
++files_var_filetrans(podsleuth_t, podsleuth_cache_t, { file dir })
++
++storage_raw_rw_fixed_disk(podsleuth_t)
++
++sysnet_dns_name_resolve(podsleuth_t)
++
+ miscfiles_read_localization(podsleuth_t)
+
+ dbus_system_bus_client(podsleuth_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.6.1/policy/modules/apps/qemu.fc
+--- nsaserefpolicy/policy/modules/apps/qemu.fc 2008-08-07 11:15:02.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/apps/qemu.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,2 +1,4 @@
+ /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)
++
++/var/cache/libvirt(/.*)? -- gen_context(system_u:object_r:qemu_cache_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.6.1/policy/modules/apps/qemu.if
+--- nsaserefpolicy/policy/modules/apps/qemu.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/qemu.if 2008-11-25 09:45:43.000000000 -0500
+@@ -40,6 +40,93 @@
+
+ qemu_domtrans($1)
+ role $2 types qemu_t;
++
++ optional_policy(`
++ samba_run_smb(qemu_t, $2, $3)
++ ')
++')
++
++#######################################
++## <summary>
++## The per role template for the qemu module.
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for qemu web browser.
++## </p>
++## <p>
++## This template is invoked automatically for each user, and
++## generally does not need to be invoked directly
++## by policy writers.
++## </p>
++## </desc>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++interface(`qemu_role_notrans',`
++ gen_require(`
++ type qemu_t;
++ ')
++
++ role $1 types qemu_t;
++')
++
++#######################################
++## <summary>
++## The per role template for the qemu module.
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for qemu web browser.
++## </p>
++## <p>
++## This template is invoked automatically for each user, and
++## generally does not need to be invoked directly
++## by policy writers.
++## </p>
++## </desc>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++#
++template(`qemu_role',`
++ gen_require(`
++ type qemu_exec_t;
++ ')
++
++ qemu_role_notrans($1, $2, $3)
++
++ domtrans_pattern($3, qemu_exec_t, qemu_t)
++ domtrans_pattern($3, qemu_config_exec_t, qemu_config_t)
+ ')
+
+ ########################################
+@@ -62,6 +149,64 @@
+
+ ########################################
+ ## <summary>
++## Set the schedule on qemu.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`qemu_setsched',`
++ gen_require(`
++ type qemu_t;
++ ')
++
++ allow $1 qemu_t:process setsched;
++')
++
++########################################
++## <summary>
++## Execute qemu_exec_t
++## in the specified domain but do not
++## do it automatically. This is an explicit
++## transition, requiring the caller to use setexeccon().
++## </summary>
++## <desc>
++## <p>
++## Execute qemu_exec_t
++## in the specified domain. This allows
++## the specified domain to qemu programs
++## on these filesystems in the specified
++## domain.
++## </p>
++## </desc>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="target_domain">
++## <summary>
++## The type of the new process.
++## </summary>
++## </param>
++#
++interface(`qemu_spec_domtrans',`
++ gen_require(`
++ type qemu_exec_t;
++ ')
++
++ read_lnk_files_pattern($1, qemu_exec_t, qemu_exec_t)
++ domain_transition_pattern($1, qemu_exec_t, $2)
++
++ allow $3 $1:fd use;
++ allow $3 $1:fifo_file rw_fifo_file_perms;
++ allow $3 $1:process sigchld;
++')
++
++########################################
++## <summary>
+ ## Send a signal to qemu.
+ ## </summary>
+ ## <param name="domain">
+@@ -98,7 +243,25 @@
+
+ ########################################
+ ## <summary>
+-## Execute a domain transition to run qemu unconfined.
++## Execute qemu unconfined programs in the role.
++## </summary>
++## <param name="role">
++## <summary>
++## The role to allow the PAM domain.
++## </summary>
++## </param>
++#
++interface(`qemu_unconfined_role',`
++ gen_require(`
++ type qemu_unconfined_t;
++ ')
++ role $1 types qemu_unconfined_t;
++')
++
++
++########################################
++## <summary>
++## Execute a domain transition to run qemu.
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+@@ -127,84 +290,69 @@
+ #
+ template(`qemu_domain_template',`
+
+- ##############################
+- #
+- # Local Policy
+- #
++ gen_require(`
++ attribute qemutype;
++ ')
+
+- type $1_t;
+- domain_type($1_t)
++ type $1_t, qemutype;
+
+ type $1_tmp_t;
+ files_tmp_file($1_tmp_t)
+
+- ##############################
+- #
+- # Local Policy
+- #
++ type $1_tmpfs_t;
++ files_tmpfs_file($1_tmpfs_t)
++
++ type $1_image_t;
++ virt_image($1_image_t)
+
+- allow $1_t self:capability { dac_read_search dac_override };
+- allow $1_t self:process { execstack execmem signal getsched };
+- allow $1_t self:fifo_file rw_file_perms;
+- allow $1_t self:shm create_shm_perms;
+- allow $1_t self:unix_stream_socket create_stream_socket_perms;
+- allow $1_t self:tcp_socket create_stream_socket_perms;
++ manage_dirs_pattern($1_t, $1_image_t, $1_image_t)
++ manage_files_pattern($1_t, $1_image_t, $1_image_t)
++ read_lnk_files_pattern($1_t, $1_image_t, $1_image_t)
++ rw_blk_files_pattern($1_t, $1_image_t, $1_image_t)
+
+ manage_dirs_pattern($1_t, $1_tmp_t, $1_tmp_t)
+ manage_files_pattern($1_t, $1_tmp_t, $1_tmp_t)
+ files_tmp_filetrans($1_t, $1_tmp_t, { file dir })
+
+- kernel_read_system_state($1_t)
+-
+- corenet_all_recvfrom_unlabeled($1_t)
+- corenet_all_recvfrom_netlabel($1_t)
+- corenet_tcp_sendrecv_all_if($1_t)
+- corenet_tcp_sendrecv_all_nodes($1_t)
+- corenet_tcp_sendrecv_all_ports($1_t)
+- corenet_tcp_bind_all_nodes($1_t)
+- corenet_tcp_bind_vnc_port($1_t)
+- corenet_rw_tun_tap_dev($1_t)
+-
+-# dev_rw_kvm($1_t)
+-
+- domain_use_interactive_fds($1_t)
+-
+- files_read_etc_files($1_t)
+- files_read_usr_files($1_t)
+- files_read_var_files($1_t)
+- files_search_all($1_t)
+-
+- fs_list_inotifyfs($1_t)
+- fs_rw_anon_inodefs_files($1_t)
+- fs_rw_tmpfs_files($1_t)
+-
+- storage_raw_write_removable_device($1_t)
+- storage_raw_read_removable_device($1_t)
+-
+- term_use_ptmx($1_t)
+- term_getattr_pty_fs($1_t)
+- term_use_generic_ptys($1_t)
+-
+- miscfiles_read_localization($1_t)
+-
+- sysnet_read_config($1_t)
+-
+- userdom_use_user_terminals($1_t)
++ manage_dirs_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)
++ manage_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)
++ manage_lnk_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)
++ fs_tmpfs_filetrans($1_t, $1_tmpfs_t, { dir file lnk_file })
++ fs_getattr_tmpfs($1_t)
++')
+
+-# optional_policy(`
+-# samba_domtrans_smb($1_t)
+-# ')
++########################################
++## <summary>
++## Manage qemu temporary dirs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`qemu_manage_tmp_dirs',`
++ gen_require(`
++ type qemu_tmp_t;
++ ')
+
+- optional_policy(`
+- virt_manage_images($1_t)
+- virt_read_config($1_t)
+- virt_read_lib_files($1_t)
++ manage_dirs_pattern($1, qemu_tmp_t, qemu_tmp_t)
+ ')
+
+- optional_policy(`
+- xserver_stream_connect($1_t)
+- xserver_read_xdm_tmp_files($1_t)
+- xserver_read_xdm_pid($1_t)
+-# xserver_xdm_rw_shm($1_t)
++########################################
++## <summary>
++## Manage qemu temporary files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`qemu_manage_tmp_files',`
++ gen_require(`
++ type qemu_tmp_t;
+ ')
++
++ manage_files_pattern($1, qemu_tmp_t, qemu_tmp_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.6.1/policy/modules/apps/qemu.te
+--- nsaserefpolicy/policy/modules/apps/qemu.te 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/qemu.te 2008-11-25 09:45:43.000000000 -0500
+@@ -6,6 +6,8 @@
+ # Declarations
+ #
+
++attribute qemutype;
++
+ ## <desc>
+ ## <p>
+ ## Allow qemu to connect fully to the network
+@@ -13,16 +15,99 @@
+ ## </desc>
+ gen_tunable(qemu_full_network, false)
+
++## <desc>
++## <p>
++## Allow qemu to use nfs file systems
++## </p>
++## </desc>
++gen_tunable(qemu_use_nfs, true)
++
++## <desc>
++## <p>
++## Allow qemu to use cifs/Samba file systems
++## </p>
++## </desc>
++gen_tunable(qemu_use_cifs, true)
++
+ type qemu_exec_t;
+ qemu_domain_template(qemu)
+ application_domain(qemu_t, qemu_exec_t)
+ role system_r types qemu_t;
+
++type qemu_cache_t;
++files_type(qemu_cache_t)
++
++########################################
++#
++# qemu common policy
++#
++allow qemutype self:capability { dac_read_search dac_override };
++allow qemutype self:process { execstack execmem signal getsched signull };
++
++allow qemutype self:fifo_file rw_file_perms;
++allow qemutype self:shm create_shm_perms;
++allow qemutype self:unix_stream_socket create_stream_socket_perms;
++allow qemutype self:tcp_socket create_stream_socket_perms;
++
++manage_dirs_pattern(qemu_t, qemu_cache_t, qemu_cache_t)
++manage_files_pattern(qemu_t, qemu_cache_t, qemu_cache_t)
++files_var_filetrans(qemu_t, qemu_cache_t, { file dir })
++
++kernel_read_system_state(qemutype)
++
++corenet_all_recvfrom_unlabeled(qemutype)
++corenet_all_recvfrom_netlabel(qemutype)
++corenet_tcp_sendrecv_all_if(qemutype)
++corenet_tcp_sendrecv_all_nodes(qemutype)
++corenet_tcp_sendrecv_all_ports(qemutype)
++corenet_tcp_bind_all_nodes(qemutype)
++corenet_tcp_bind_vnc_port(qemutype)
++corenet_rw_tun_tap_dev(qemutype)
++
++dev_read_sound(qemutype)
++dev_write_sound(qemutype)
++dev_rw_kvm(qemutype)
++dev_rw_qemu(qemutype)
++
++domain_use_interactive_fds(qemutype)
++
++files_read_etc_files(qemutype)
++files_read_usr_files(qemutype)
++files_read_var_files(qemutype)
++files_search_all(qemutype)
++
++fs_list_inotifyfs(qemutype)
++fs_rw_anon_inodefs_files(qemutype)
++fs_rw_tmpfs_files(qemutype)
++
++term_use_ptmx(qemutype)
++term_getattr_pty_fs(qemutype)
++term_use_generic_ptys(qemutype)
++
++auth_use_nsswitch(qemutype)
++
++miscfiles_read_localization(qemutype)
++
++optional_policy(`
++ virt_read_config(qemutype)
++ virt_read_lib_files(qemutype)
++')
++
++optional_policy(`
++ xserver_stream_connect(qemutype)
++ xserver_read_xdm_tmp_files(qemutype)
++ xserver_read_xdm_pid(qemutype)
++ xserver_rw_shm(qemutype)
++')
++
+ ########################################
+ #
+ # qemu local policy
+ #
+
++storage_raw_write_removable_device(qemu_t)
++storage_raw_read_removable_device(qemu_t)
++
+ tunable_policy(`qemu_full_network',`
+ allow qemu_t self:udp_socket create_socket_perms;
+
+@@ -35,6 +120,30 @@
+ corenet_tcp_connect_all_ports(qemu_t)
+ ')
+
++tunable_policy(`qemu_use_nfs',`
++ fs_manage_nfs_files(qemu_t)
++')
++
++tunable_policy(`qemu_use_cifs',`
++ fs_manage_cifs_dirs(qemu_t)
++')
++
++optional_policy(`
++ samba_domtrans_smb(qemu_t)
++')
++
++optional_policy(`
++ virt_manage_images(qemu_t)
++')
++
++optional_policy(`
++ xen_rw_image_files(qemu_t)
++')
++
++optional_policy(`
++ xen_rw_image_files(qemu_t)
++')
++
+ ########################################
+ #
+ # qemu_unconfined local policy
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.fc serefpolicy-3.6.1/policy/modules/apps/sambagui.fc
+--- nsaserefpolicy/policy/modules/apps/sambagui.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/sambagui.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,4 @@
++/usr/share/system-config-samba/system-config-samba-mechanism.py -- gen_context(system_u:object_r:sambagui_exec_t,s0)
++
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.if serefpolicy-3.6.1/policy/modules/apps/sambagui.if
+--- nsaserefpolicy/policy/modules/apps/sambagui.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/sambagui.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,2 @@
++## <summary>system-config-samba policy</summary>
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.te serefpolicy-3.6.1/policy/modules/apps/sambagui.te
+--- nsaserefpolicy/policy/modules/apps/sambagui.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/sambagui.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,59 @@
++policy_module(sambagui,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type sambagui_t;
++type sambagui_exec_t;
++
++dbus_system_domain(sambagui_t, sambagui_exec_t)
++
++########################################
++#
++# system-config-samba local policy
++#
++
++allow sambagui_t self:fifo_file rw_fifo_file_perms;
++
++# handling with samba conf files
++samba_append_log(sambagui_t)
++samba_manage_config(sambagui_t)
++samba_manage_var_files(sambagui_t)
++samba_initrc_domtrans(sambagui_t)
++samba_domtrans_smb(sambagui_t)
++samba_domtrans_nmb(sambagui_t)
++
++# execut apps of system-config-samba
++corecmd_exec_shell(sambagui_t)
++corecmd_exec_bin(sambagui_t)
++
++files_read_etc_files(sambagui_t)
++files_search_var_lib(sambagui_t)
++files_search_usr(sambagui_t)
++
++fs_list_inotifyfs(sambagui_t)
++
++# reading shadow by pdbedit
++#auth_read_shadow(sambagui_t)
++
++auth_use_nsswitch(sambagui_t)
++
++miscfiles_read_localization(sambagui_t)
++
++# read meminfo
++kernel_read_system_state(sambagui_t)
++
++dev_dontaudit_read_urand(sambagui_t)
++nscd_dontaudit_search_pid(sambagui_t)
++
++optional_policy(`
++ consoletype_exec(sambagui_t)
++')
++
++optional_policy(`
++ polkit_dbus_chat(sambagui_t)
++')
++
++permissive sambagui_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-3.6.1/policy/modules/apps/slocate.te
+--- nsaserefpolicy/policy/modules/apps/slocate.te 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/slocate.te 2008-11-25 09:45:43.000000000 -0500
+@@ -22,7 +22,7 @@
+ #
+
+ allow locate_t self:capability { chown dac_read_search dac_override fowner fsetid };
+-allow locate_t self:process { execmem execheap execstack };
++allow locate_t self:process { execmem execheap execstack signal };
+ allow locate_t self:fifo_file rw_fifo_file_perms;
+ allow locate_t self:unix_stream_socket create_socket_perms;
+
+@@ -46,6 +46,8 @@
+
+ fs_getattr_all_fs(locate_t)
+ fs_getattr_all_files(locate_t)
++fs_getattr_all_pipes(locate_t)
++fs_getattr_all_symlinks(locate_t)
+ fs_list_all(locate_t)
+ fs_list_inotifyfs(locate_t)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-3.6.1/policy/modules/apps/webalizer.te
+--- nsaserefpolicy/policy/modules/apps/webalizer.te 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/webalizer.te 2008-11-25 09:45:43.000000000 -0500
+@@ -68,6 +68,8 @@
+
+ fs_search_auto_mountpoints(webalizer_t)
+ fs_getattr_xattr_fs(webalizer_t)
++fs_rw_anon_inodefs_files(webalizer_t)
++fs_list_inotifyfs(webalizer_t)
+
+ files_read_etc_files(webalizer_t)
+ files_read_etc_runtime_files(webalizer_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.6.1/policy/modules/apps/wine.fc
+--- nsaserefpolicy/policy/modules/apps/wine.fc 2008-08-07 11:15:02.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/apps/wine.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,3 +2,4 @@
+
+ /opt/cxoffice/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0)
+ /opt/picasa/wine/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0)
++/opt/google/picasa(/.*)?/bin/wine.* -- gen_context(system_u:object_r:wine_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.6.1/policy/modules/apps/wine.if
+--- nsaserefpolicy/policy/modules/apps/wine.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/wine.if 2008-11-25 09:45:43.000000000 -0500
+@@ -43,3 +43,62 @@
+ wine_domtrans($1)
+ role $2 types wine_t;
+ ')
++
++#######################################
++## <summary>
++## The per role template for the wine module.
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for wine applications.
++## </p>
++## </desc>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++#
++template(`wine_role',`
++ gen_require(`
++ type wine_exec_t;
++ ')
++
++ role $1 types wine_t;
++
++ domain_auto_trans($2, wine_exec_t, wine_t)
++ # Unrestricted inheritance from the caller.
++ allow $2 wine_t:process { noatsecure siginh rlimitinh };
++ allow wine_t $2:fd use;
++ allow wine_t $2:process { sigchld signull };
++ allow wine_t $2:unix_stream_socket connectto;
++
++ # Allow the user domain to signal/ps.
++ ps_process_pattern($2, wine_t)
++ allow $2 wine_t:process signal_perms;
++
++ allow $2 wine_t:fd use;
++ allow $2 wine_t:shm { associate getattr };
++ allow $2 wine_t:shm { unix_read unix_write };
++ allow $2 wine_t:unix_stream_socket connectto;
++
++ # X access, Home files
++ manage_dirs_pattern($2, wine_home_t, wine_home_t)
++ manage_files_pattern($2, wine_home_t, wine_home_t)
++ manage_lnk_files_pattern($2, wine_home_t, wine_home_t)
++ relabel_dirs_pattern($2, wine_home_t, wine_home_t)
++ relabel_files_pattern($2, wine_home_t, wine_home_t)
++ relabel_lnk_files_pattern($2, wine_home_t, wine_home_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.6.1/policy/modules/apps/wine.te
+--- nsaserefpolicy/policy/modules/apps/wine.te 2008-11-11 16:13:42.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/wine.te 2008-11-25 09:45:43.000000000 -0500
+@@ -9,6 +9,7 @@
+ type wine_t;
+ type wine_exec_t;
+ application_domain(wine_t, wine_exec_t)
++role system_r types wine_t;
+
+ ########################################
+ #
+@@ -19,10 +20,17 @@
+
+ optional_policy(`
+ allow wine_t self:process { execstack execmem execheap };
++ domain_mmap_low_type(wine_t)
++ domain_mmap_low(wine_t)
+ unconfined_domain_noaudit(wine_t)
+ files_execmod_all_files(wine_t)
+
++')
++
+ optional_policy(`
+ hal_dbus_chat(wine_t)
+ ')
++
++optional_policy(`
++ xserver_rw_shm(wine_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.fc serefpolicy-3.6.1/policy/modules/apps/wm.fc
+--- nsaserefpolicy/policy/modules/apps/wm.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/wm.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,3 @@
++/usr/bin/twm -- gen_context(system_u:object_r:wm_exec_t,s0)
++/usr/bin/openbox -- gen_context(system_u:object_r:wm_exec_t,s0)
++/usr/bin/metacity -- gen_context(system_u:object_r:wm_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.if serefpolicy-3.6.1/policy/modules/apps/wm.if
+--- nsaserefpolicy/policy/modules/apps/wm.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/wm.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,19 @@
++## <summary>Window Manager.</summary>
++
++########################################
++## <summary>
++## Execute the wm program in the wm domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`wm_exec',`
++ gen_require(`
++ type wm_exec_t;
++ ')
++
++ can_exec($1, wm_exec_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.6.1/policy/modules/apps/wm.te
+--- nsaserefpolicy/policy/modules/apps/wm.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/wm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,104 @@
++policy_module(wm,0.0.4)
++
++########################################
++#
++# Declarations
++#
++
++type wm_t;
++type wm_exec_t;
++domain_type(wm_t)
++domain_entry_file(wm_t,wm_exec_t)
++role user_r types wm_t;
++
++type wm_tmpfs_t;
++
++files_read_etc_files(wm_t)
++
++nscd_dontaudit_search_pid(wm_t)
++
++miscfiles_read_localization(wm_t)
++
++dev_read_urand(wm_t)
++
++files_list_tmp(wm_t)
++
++allow wm_t proc_t:file { read getattr };
++
++allow wm_t info_xproperty_t:x_property { write create };
++
++allow wm_t self:process getsched;
++allow wm_t self:x_drawable blend;
++
++allow wm_t tmpfs_t:file { read write };
++
++allow wm_t usr_t:file { read getattr };
++allow wm_t usr_t:lnk_file read;
++
++allow wm_t user_tmp_t:dir { write search setattr remove_name getattr add_name };
++allow wm_t user_tmp_t:sock_file { write create unlink };
++
++allow wm_t user_t:unix_stream_socket connectto;
++allow wm_t self:fifo_file { write read };
++
++
++allow wm_t $2_client_xevent_t:x_synthetic_event send;
++allow wm_t $2_focus_xevent_t:x_event receive;
++allow wm_t $2_input_xevent_t:x_event receive;
++allow wm_t $2_manage_xevent_t:x_event receive;
++allow wm_t $2_manage_xevent_t:x_synthetic_event { receive send };
++allow wm_t $2_property_xevent_t:x_event receive;
++allow wm_t $2_xproperty_t:x_property { read write destroy };
++allow wm_t $2_rootwindow_t:x_colormap { install uninstall use add_color remove_color read };
++allow wm_t $2_rootwindow_t:x_drawable { read write manage setattr get_property hide show receive set_property create send add_child remove_child getattr list_property blend list_child destroy override };
++allow wm_t $2_xproperty_t:x_property { write read };
++allow wm_t xserver_t:x_device { force_cursor setfocus use setattr grab manage getattr freeze write };
++allow wm_t xserver_t:x_resource { read write };
++allow wm_t xserver_t:x_screen setattr;
++allow wm_t xselection_t:x_selection setattr;
++
++allow wm_t $2_t:x_drawable { get_property setattr show receive manage send read getattr list_child set_property };
++allow wm_t $2_t:x_resource { read write };
++
++ifdef(`enable_mls',`
++ mls_file_read_all_levels(wm_t)
++ mls_file_write_all_levels(wm_t)
++ mls_xwin_read_all_levels(wm_t)
++ mls_xwin_write_all_levels(wm_t)
++ mls_fd_use_all_levels(wm_t)
++')
++
++corecmd_exec_bin(wm_t)
++can_exec(wm_t, { shell_exec_t })
++domtrans_pattern(wm_t,bin_t,user_t)
++
++allow user_t wm_t:unix_stream_socket connectto;
++allow user_t wm_t:x_drawable { receive get_property getattr list_child };
++
++allow user_t wm_t:process signal;
++
++optional_policy(`
++ dbus_system_bus_client(wm_t)
++ dbus_user_bus_client(user,wm_t)
++')
++
++allow wm_t user_home_t:dir { search getattr };
++allow wm_t user_xproperty_t:x_property { read write destroy };
++allow wm_t default_t:dir search;
++allow wm_t home_root_t:dir search;
++allow wm_t user_home_dir_t:dir search;
++allow wm_t xserver_tmp_t:dir search;
++allow wm_t xserver_tmp_t:lnk_file read;
++allow wm_t user_home_dir_t:dir search_dir_perms;
++manage_files_pattern(wm_t,user_tmp_t,user_tmp_t)
++allow wm_t user_home_t:file { write read getattr };
++allow wm_t xserver_t:unix_stream_socket connectto;
++allow wm_t xserver_tmp_t:sock_file write;
++manage_lnk_files_pattern(wm_t, xserver_tmp_t, xserver_tmp_t)
++
++allow wm_t security_xext_t:x_extension { query use };
++
++userdom_use_user_terminals(wm_t)
++
++
++xserver_user_x_domain_template(user, wm_t, wm_tmpfs_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.1/policy/modules/kernel/corecommands.fc
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/corecommands.fc 2008-11-25 16:31:05.000000000 -0500
+@@ -128,6 +128,8 @@
+ /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
+ ')
+
++/opt/gutenprint/cups/lib/filter(/.*)? gen_context(system_u:object_r:bin_t,s0)
++
+ #
+ # /usr
+ #
+@@ -183,10 +185,8 @@
+ /usr/libexec/openssh/sftp-server -- gen_context(system_u:object_r:bin_t,s0)
+
+ /usr/local/lib(64)?/ipsec/.* -- gen_context(system_u:object_r:bin_t,s0)
+-/usr/local/Brother(/.*)?/cupswrapper(/.*)? gen_context(system_u:object_r:bin_t,s0)
+-/usr/local/Brother(/.*)?/lpd(/.*)? gen_context(system_u:object_r:bin_t,s0)
+-/usr/local/Printer/[^/]*/cupswrapper(/.*)? gen_context(system_u:object_r:bin_t,s0)
+-/usr/local/Printer/[^/]*/lpd(/.*)? gen_context(system_u:object_r:bin_t,s0)
++/usr/local/Brother(/.*)? gen_context(system_u:object_r:bin_t,s0)
++/usr/local/Printer(/.*)? gen_context(system_u:object_r:bin_t,s0)
+ /usr/local/linuxprinter/filters(/.*)? gen_context(system_u:object_r:bin_t,s0)
+
+ /usr/sbin/scponlyc -- gen_context(system_u:object_r:shell_exec_t,s0)
+@@ -291,3 +291,12 @@
+ ifdef(`distro_suse',`
+ /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0)
+ ')
++
++/usr/lib(64)?/ConsoleKit/scripts(/.*)? gen_context(system_u:object_r:bin_t,s0)
++/usr/lib(64)?/ConsoleKit/run-session.d(/.*)? gen_context(system_u:object_r:bin_t,s0)
++/etc/ConsoleKit/run-session.d(/.*)? gen_context(system_u:object_r:bin_t,s0)
++
++/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:bin_t,s0)
++/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:bin_t,s0)
++
++/usr/lib/oracle/xe/apps(/.*)? gen_context(system_u:object_r:bin_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.1/policy/modules/kernel/corecommands.if
+--- nsaserefpolicy/policy/modules/kernel/corecommands.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/corecommands.if 2008-11-25 09:45:43.000000000 -0500
+@@ -893,6 +893,7 @@
+
+ read_lnk_files_pattern($1, bin_t, bin_t)
+ can_exec($1, chroot_exec_t)
++ allow $1 self:capability sys_chroot;
+ ')
+
+ ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-3.6.1/policy/modules/kernel/corenetwork.if.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/corenetwork.if.in 2008-11-27 17:36:22.000000000 -0500
+@@ -1441,10 +1441,11 @@
+ #
+ interface(`corenet_tcp_bind_all_unreserved_ports',`
+ gen_require(`
+- attribute port_type, reserved_port_type;
++ attribute port_type;
++ type hi_reserved_port_t, reserved_port_t;
+ ')
+
+- allow $1 { port_type -reserved_port_type }:tcp_socket name_bind;
++ allow $1 { port_type -hi_reserved_port_t -reserved_port_t }:tcp_socket name_bind;
+ ')
+
+ ########################################
+@@ -1459,10 +1460,11 @@
+ #
+ interface(`corenet_udp_bind_all_unreserved_ports',`
+ gen_require(`
+- attribute port_type, reserved_port_type;
++ attribute port_type;
++ type hi_reserved_port_t, reserved_port_t;
+ ')
+
+- allow $1 { port_type -reserved_port_type }:udp_socket name_bind;
++ allow $1 { port_type -hi_reserved_port_t -reserved_port_t }:udp_socket name_bind;
+ ')
+
+ ########################################
+@@ -1560,6 +1562,24 @@
+
+ ########################################
+ ## <summary>
++## Getattr the point-to-point device.
++## </summary>
++## <param name="domain">
++## <summary>
++## The domain allowed access.
++## </summary>
++## </param>
++#
++interface(`corenet_getattr_ppp_dev',`
++ gen_require(`
++ type ppp_device_t;
++ ')
++
++ allow $1 ppp_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
+ ## Read and write the point-to-point device.
+ ## </summary>
+ ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.6.1/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-11-12 09:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/corenetwork.te.in 2008-12-01 15:41:36.000000000 -0500
+@@ -65,10 +65,12 @@
+ type server_packet_t, packet_type, server_packet_type;
+
+ network_port(afs_bos, udp,7007,s0)
++network_port(afs_client, udp,7001,s0)
+ network_port(afs_fs, tcp,2040,s0, udp,7000,s0, udp,7005,s0)
+ network_port(afs_ka, udp,7004,s0)
+ network_port(afs_pt, udp,7002,s0)
+ network_port(afs_vl, udp,7003,s0)
++network_port(agentx, udp,705,s0, tcp,705,s0)
+ network_port(amanda, udp,10080,s0, tcp,10080,s0, udp,10081,s0, tcp,10081,s0, tcp,10082,s0, tcp,10083,s0)
+ network_port(amavisd_recv, tcp,10024,s0)
+ network_port(amavisd_send, tcp,10025,s0)
+@@ -79,11 +81,13 @@
+ network_port(auth, tcp,113,s0)
+ network_port(bgp, tcp,179,s0, udp,179,s0, tcp,2605,s0, udp,2605,s0)
+ type biff_port_t, port_type, reserved_port_type; dnl network_port(biff) # no defined portcon in current strict
++network_port(certmaster, tcp,51235,s0)
+ network_port(clamd, tcp,3310,s0)
+ 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)
+ network_port(comsat, udp,512,s0)
+ network_port(cyphesis, tcp,6767,s0, tcp,6769,s0, udp,32771,s0)
++portcon tcp 6780-6799 gen_context(system_u:object_r:cyphesis_port_t, s0)
+ network_port(cvs, tcp,2401,s0, udp,2401,s0)
+ network_port(dcc, udp,6276,s0, udp,6277,s0)
+ network_port(dbskkd, tcp,1178,s0)
+@@ -92,13 +96,16 @@
+ network_port(dict, tcp,2628,s0)
+ network_port(distccd, tcp,3632,s0)
+ network_port(dns, udp,53,s0, tcp,53,s0)
++network_port(festival, tcp,1314,s0)
+ network_port(fingerd, tcp,79,s0)
++network_port(flash, tcp,843,s0, tcp,1935,s0, udp,1935,s0)
+ network_port(ftp_data, tcp,20,s0)
+ network_port(ftp, tcp,21,s0)
+ network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0)
+ network_port(giftd, tcp,1213,s0)
+ network_port(gopher, tcp,70,s0, udp,70,s0)
+ network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
++portcon tcp 10001-10010 gen_context(system_u:object_r:http_cache_port_t, s0)
+ network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0, tcp,8443,s0) #8443 is mod_nss default port
+ network_port(howl, tcp,5335,s0, udp,5353,s0)
+ network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
+@@ -118,6 +125,8 @@
+ network_port(kerberos_admin, tcp,464,s0, udp,464,s0, tcp,749,s0)
+ network_port(kerberos_master, tcp,4444,s0, udp,4444,s0)
+ network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0)
++network_port(kismet, tcp,2501,s0)
++network_port(kprop, tcp,754,s0)
+ network_port(ktalkd, udp,517,s0, udp,518,s0)
+ network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0)
+ type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
+@@ -127,6 +136,7 @@
+ network_port(mmcc, tcp,5050,s0, udp,5050,s0)
+ network_port(monopd, tcp,1234,s0)
+ network_port(msnp, tcp,1863,s0, udp,1863,s0)
++network_port(munin, tcp,4949,s0, udp,4949,s0)
+ network_port(mysqld, tcp,1186,s0, tcp,3306,s0)
+ portcon tcp 63132-63163 gen_context(system_u:object_r:mysqld_port_t, s0)
+ network_port(nessus, tcp,1241,s0)
+@@ -137,12 +147,21 @@
+ network_port(openvpn, tcp,1194,s0, udp,1194,s0)
+ network_port(pegasus_http, tcp,5988,s0)
+ network_port(pegasus_https, tcp,5989,s0)
++network_port(pingd, tcp,9125,s0)
++network_port(pki_ca, tcp, 9180, s0, tcp, 9701, s0, tcp, 9443, s0, tcp, 9444, s0, tcp, 9445, s0)
++network_port(pki_kra, tcp, 10180, s0, tcp, 10701, s0, tcp, 10443, s0, tcp, 10444, s0, tcp, 10445, s0)
++network_port(pki_ocsp, tcp, 11180, s0, tcp, 11701, s0, tcp, 11443, s0, tcp, 11444, s0, tcp, 11445, s0)
++network_port(pki_tks, tcp, 13180, s0, tcp, 13701, s0, tcp, 13443, s0, tcp, 13444, s0, tcp, 13445, s0)
++network_port(pki_ra, tcp, 12888, s0, tcp, 12889, s0)
++network_port(pki_tps, tcp, 7888, s0, tcp, 7889, s0)
+ network_port(postfix_policyd, tcp,10031,s0)
++network_port(pulseaudio, tcp,4713,s0)
+ network_port(pgpkeyserver, udp, 11371,s0, tcp,11371,s0)
+ network_port(pop, tcp,106,s0, tcp,109,s0, tcp,110,s0, tcp,143,s0, tcp,220,s0, tcp,993,s0, tcp,995,s0, tcp,1109,s0)
+ network_port(portmap, udp,111,s0, tcp,111,s0)
+ network_port(postgresql, tcp,5432,s0)
+ network_port(postgrey, tcp,60000,s0)
++network_port(prelude, tcp,4690,s0, udp,4690,s0)
+ network_port(printer, tcp,515,s0)
+ network_port(ptal, tcp,5703,s0)
+ network_port(pxe, udp,4011,s0)
+@@ -160,9 +179,10 @@
+ network_port(rwho, udp,513,s0)
+ network_port(smbd, tcp,137-139,s0, tcp,445,s0)
+ network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
+-network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0)
++network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0, tcp, 1161, s0)
+ network_port(spamd, tcp,783,s0)
+ network_port(ssh, tcp,22,s0)
++network_port(streaming, tcp, 1755, s0, udp, 1755, s0)
+ network_port(soundd, tcp,8000,s0, tcp,9433,s0, tcp, 16001, s0)
+ type socks_port_t, port_type; dnl network_port(socks) # no defined portcon
+ type stunnel_port_t, port_type; dnl network_port(stunnel) # no defined portcon in current strict
+@@ -171,13 +191,16 @@
+ network_port(syslogd, udp,514,s0)
+ network_port(telnetd, tcp,23,s0)
+ network_port(tftp, udp,69,s0)
+-network_port(tor, tcp,9001,s0, tcp,9030,s0, tcp,9050,s0)
++network_port(tor, tcp,9001,s0, tcp,9030,s0, tcp,9050,s0, tcp,9051,s0)
+ network_port(traceroute, udp,64000,s0, udp,64001,s0, udp,64002,s0, udp,64003,s0, udp,64004,s0, udp,64005,s0, udp,64006,s0, udp,64007,s0, udp,64008,s0, udp,64009,s0, udp,64010,s0)
+ network_port(transproxy, tcp,8081,s0)
+ type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
+ network_port(uucpd, tcp,540,s0)
++network_port(virt, tcp,16509,s0, udp,16509,s0, tcp,16514,s0, udp,16514,s0)
+ network_port(vnc, tcp,5900,s0)
+ network_port(wccp, udp,2048,s0)
++# Reserve 100 ports for vnc/virt machines
++portcon tcp 5901-5999 gen_context(system_u:object_r:vnc_port_t,s0)
+ network_port(whois, tcp,43,s0, udp,43,s0)
+ network_port(xdmcp, udp,177,s0, tcp,177,s0)
+ network_port(xen, tcp,8002,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.1/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc 2008-10-08 21:42:58.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/devices.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,7 +1,7 @@
+
+ /dev -d gen_context(system_u:object_r:device_t,s0)
+ /dev/.* gen_context(system_u:object_r:device_t,s0)
+-
++/dev/3dfx -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
+ /dev/.*mouse.* -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/admmidi.* -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/adsp.* -c gen_context(system_u:object_r:sound_device_t,s0)
+@@ -12,42 +12,59 @@
+ /dev/apm_bios -c gen_context(system_u:object_r:apm_bios_t,s0)
+ /dev/atibm -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/audio.* -c gen_context(system_u:object_r:sound_device_t,s0)
++/dev/autofs.* -c gen_context(system_u:object_r:autofs_device_t,s0)
+ /dev/beep -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/dmfm -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/dmmidi.* -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/dsp.* -c gen_context(system_u:object_r:sound_device_t,s0)
++/dev/gfx -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
++/dev/graphics -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
++/dev/gtrsc.* -c gen_context(system_u:object_r:clock_device_t,s0)
++/dev/pcfclock.* -c gen_context(system_u:object_r:clock_device_t,s0)
+ /dev/efirtc -c gen_context(system_u:object_r:clock_device_t,s0)
+ /dev/em8300.* -c gen_context(system_u:object_r:v4l_device_t,s0)
+ /dev/event.* -c gen_context(system_u:object_r:event_device_t,s0)
+ /dev/evtchn -c gen_context(system_u:object_r:xen_device_t,s0)
+ /dev/fb[0-9]* -c gen_context(system_u:object_r:framebuf_device_t,s0)
+ /dev/full -c gen_context(system_u:object_r:null_device_t,s0)
++/dev/[0-9].* -c gen_context(system_u:object_r:usb_device_t,s0)
+ /dev/fw.* -c gen_context(system_u:object_r:usb_device_t,s0)
++/dev/hfmodem -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/hiddev.* -c gen_context(system_u:object_r:usb_device_t,s0)
+ /dev/hidraw.* -c gen_context(system_u:object_r:usb_device_t,s0)
+ /dev/hpet -c gen_context(system_u:object_r:clock_device_t,s0)
+ /dev/hw_random -c gen_context(system_u:object_r:random_device_t,s0)
+ /dev/hwrng -c gen_context(system_u:object_r:random_device_t,s0)
+ /dev/i915 -c gen_context(system_u:object_r:dri_device_t,s0)
++/dev/ipmi[0-9]+ -c gen_context(system_u:object_r:ipmi_device_t,s0)
++/dev/ipmi/[0-9]+ -c gen_context(system_u:object_r:ipmi_device_t,s0)
+ /dev/irlpt[0-9]+ -c gen_context(system_u:object_r:printer_device_t,s0)
++/dev/elographics/e2201 -c gen_context(system_u:object_r:mouse_device_t,s0)
++/dev/jbm -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/js.* -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/kmem -c gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
+ /dev/kmsg -c gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh)
++/dev/kqemu -c gen_context(system_u:object_r:qemu_device_t,s0)
++/dev/kvm -c gen_context(system_u:object_r:kvm_device_t,s0)
+ /dev/lircm -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/logibm -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/lp.* -c gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/mcelog -c gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh)
+ /dev/mem -c gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
++/dev/mergemem -c gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
+ /dev/mice -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/microcode -c gen_context(system_u:object_r:cpu_device_t,s0)
+ /dev/midi.* -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/mixer.* -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/mmetfgrab -c gen_context(system_u:object_r:scanner_device_t,s0)
+ /dev/mpu401.* -c gen_context(system_u:object_r:sound_device_t,s0)
++/dev/network_latency -c gen_context(system_u:object_r:netcontrol_device_t,s0)
++/dev/network_throughput -c gen_context(system_u:object_r:netcontrol_device_t,s0)
+ /dev/null -c gen_context(system_u:object_r:null_device_t,s0)
+ /dev/nvidia.* -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
+ /dev/nvram -c gen_context(system_u:object_r:nvram_device_t,mls_systemhigh)
+ /dev/oldmem -c gen_context(system_u:object_r:memory_device_t,mls_systemhigh)
++/dev/opengl -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
+ /dev/par.* -c gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/patmgr[01] -c gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/pmu -c gen_context(system_u:object_r:power_device_t,s0)
+@@ -69,14 +86,14 @@
+ /dev/sonypi -c gen_context(system_u:object_r:v4l_device_t,s0)
+ /dev/tlk[0-3] -c gen_context(system_u:object_r:v4l_device_t,s0)
+ /dev/urandom -c gen_context(system_u:object_r:urandom_device_t,s0)
+-/dev/usbmon[0-9]+ -c gen_context(system_u:object_r:usb_device_t,s0)
+-/dev/usbdev.* -c gen_context(system_u:object_r:usb_device_t,s0)
+-/dev/usb[0-9]+ -c gen_context(system_u:object_r:usb_device_t,s0)
++/dev/ub[a-c] -c gen_context(system_u:object_r:usb_device_t,s0)
++/dev/usb.+ -c gen_context(system_u:object_r:usb_device_t,s0)
+ /dev/usblp.* -c gen_context(system_u:object_r:printer_device_t,s0)
+ ifdef(`distro_suse', `
+ /dev/usbscanner -c gen_context(system_u:object_r:scanner_device_t,s0)
+ ')
+ /dev/vbi.* -c gen_context(system_u:object_r:v4l_device_t,s0)
++/dev/vboxadd.* -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
+ /dev/vmmon -c gen_context(system_u:object_r:vmware_device_t,s0)
+ /dev/vmnet.* -c gen_context(system_u:object_r:vmware_device_t,s0)
+ /dev/video.* -c gen_context(system_u:object_r:v4l_device_t,s0)
+@@ -91,6 +108,7 @@
+
+ /dev/cmx.* -c gen_context(system_u:object_r:smartcard_device_t,s0)
+
++/dev/cpu_dma_latency -c gen_context(system_u:object_r:netcontrol_device_t,s0)
+ /dev/cpu/.* -c gen_context(system_u:object_r:cpu_device_t,s0)
+ /dev/cpu/mtrr -c gen_context(system_u:object_r:mtrr_device_t,s0)
+
+@@ -98,13 +116,23 @@
+
+ /dev/dvb/.* -c gen_context(system_u:object_r:v4l_device_t,s0)
+
++/dev/inportbm -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/input/.*mouse.* -c gen_context(system_u:object_r:mouse_device_t,s0)
++/dev/input/keyboard.* -c gen_context(system_u:object_r:event_device_t,s0)
+ /dev/input/event.* -c gen_context(system_u:object_r:event_device_t,s0)
+ /dev/input/mice -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/input/js.* -c gen_context(system_u:object_r:mouse_device_t,s0)
+ /dev/input/uinput -c gen_context(system_u:object_r:event_device_t,s0)
++/dev/pc110pad -c gen_context(system_u:object_r:mouse_device_t,s0)
++/dev/vrtpanel -c gen_context(system_u:object_r:mouse_device_t,s0)
++/dev/touchscreen/ucb1x00 -c gen_context(system_u:object_r:mouse_device_t,s0)
++/dev/touchscreen/mk712 -c gen_context(system_u:object_r:mouse_device_t,s0)
++/dev/lik.* -c gen_context(system_u:object_r:event_device_t,s0)
++/dev/bometric/sensor.* -c gen_context(system_u:object_r:event_device_t,s0)
+
+ /dev/mapper/control -c gen_context(system_u:object_r:lvm_control_t,s0)
++/dev/mga_vid.* -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
++/dev/mvideo/.* -c gen_context(system_u:object_r:xserver_misc_device_t,s0)
+
+ /dev/pts(/.*)? <<none>>
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.1/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if 2008-11-11 16:13:40.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/devices.if 2008-11-25 09:45:43.000000000 -0500
+@@ -65,7 +65,7 @@
+
+ relabelfrom_dirs_pattern($1, device_t, device_node)
+ relabelfrom_files_pattern($1, device_t, device_node)
+- relabelfrom_lnk_files_pattern($1, device_t, device_node)
++ relabelfrom_lnk_files_pattern($1, device_t, { device_t device_node })
+ relabelfrom_fifo_files_pattern($1, device_t, device_node)
+ relabelfrom_sock_files_pattern($1, device_t, device_node)
+ relabel_blk_files_pattern($1,device_t,{ device_t device_node })
+@@ -166,6 +166,25 @@
+
+ ########################################
+ ## <summary>
++## Manage of directories in /dev.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to relabel.
++## </summary>
++## </param>
++#
++interface(`dev_manage_generic_dirs',`
++ gen_require(`
++ type device_t;
++ ')
++
++ manage_dirs_pattern($1, device_t, device_t)
++')
++
++
++########################################
++## <summary>
+ ## Delete a directory in the device directory.
+ ## </summary>
+ ## <param name="domain">
+@@ -666,6 +685,7 @@
+ ')
+
+ dontaudit $1 device_node:blk_file getattr;
++ dev_dontaudit_getattr_generic_blk_files($1)
+ ')
+
+ ########################################
+@@ -703,6 +723,7 @@
+ ')
+
+ dontaudit $1 device_node:chr_file getattr;
++ dev_dontaudit_getattr_generic_chr_files($1)
+ ')
+
+ ########################################
+@@ -1159,6 +1180,25 @@
+
+ ########################################
+ ## <summary>
++## Set the attributes of the CPU
++## microcode and id interfaces.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_setattr_cpu_dev',`
++ gen_require(`
++ type device_t, cpu_device_t;
++ ')
++
++ setattr_chr_files_pattern($1, device_t, cpu_device_t)
++')
++
++########################################
++## <summary>
+ ## Read the CPU identity.
+ ## </summary>
+ ## <param name="domain">
+@@ -1957,6 +1997,42 @@
+
+ ########################################
+ ## <summary>
++## Get the attributes of the null device nodes.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_getattr_null_dev',`
++ gen_require(`
++ type device_t, null_device_t;
++ ')
++
++ getattr_chr_files_pattern($1, device_t, null_device_t)
++')
++
++########################################
++## <summary>
++## Set the attributes of the null device nodes.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_setattr_null_dev',`
++ gen_require(`
++ type device_t, null_device_t;
++ ')
++
++ setattr_chr_files_pattern($1, device_t, null_device_t)
++')
++
++########################################
++## <summary>
+ ## Read and write to the null device (/dev/null).
+ ## </summary>
+ ## <param name="domain">
+@@ -2767,6 +2843,24 @@
+
+ ########################################
+ ## <summary>
++## Read generic the USB devices.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_read_generic_usb_dev',`
++ gen_require(`
++ type usb_device_t;
++ ')
++
++ read_chr_files_pattern($1, device_t, usb_device_t)
++')
++
++########################################
++## <summary>
+ ## Read and write generic the USB devices.
+ ## </summary>
+ ## <param name="domain">
+@@ -2785,6 +2879,97 @@
+
+ ########################################
+ ## <summary>
++## Read and write generic the USB fifo files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_rw_generic_usb_pipes',`
++ gen_require(`
++ type usb_device_t;
++ ')
++
++ allow $1 device_t:dir search_dir_perms;
++ allow $1 usb_device_t:fifo_file rw_fifo_file_perms;
++')
++
++########################################
++## <summary>
++## Get the attributes of the kvm devices.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_getattr_kvm_dev',`
++ gen_require(`
++ type device_t, kvm_device_t;
++ ')
++
++ getattr_chr_files_pattern($1, device_t, kvm_device_t)
++')
++
++########################################
++## <summary>
++## Set the attributes of the kvm devices.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_setattr_kvm_dev',`
++ gen_require(`
++ type device_t, kvm_device_t;
++ ')
++
++ setattr_chr_files_pattern($1, device_t, kvm_device_t)
++')
++
++########################################
++## <summary>
++## Read the kvm devices.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_read_kvm',`
++ gen_require(`
++ type device_t, kvm_device_t;
++ ')
++
++ read_chr_files_pattern($1, device_t, kvm_device_t)
++')
++
++########################################
++## <summary>
++## Read and write to kvm devices.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_rw_kvm',`
++ gen_require(`
++ type device_t, kvm_device_t;
++ ')
++
++ rw_chr_files_pattern($1, device_t, kvm_device_t)
++')
++
++########################################
++## <summary>
+ ## Mount a usbfs filesystem.
+ ## </summary>
+ ## <param name="domain">
+@@ -3320,3 +3505,223 @@
+
+ typeattribute $1 devices_unconfined_type;
+ ')
++
++########################################
++## <summary>
++## Get the attributes of the autofs device node.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_getattr_autofs_dev',`
++ gen_require(`
++ type device_t, autofs_device_t;
++ ')
++
++ getattr_chr_files_pattern($1, device_t, autofs_device_t)
++')
++
++########################################
++## <summary>
++## Do not audit attempts to get the attributes of
++## the autofs device node.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`dev_dontaudit_getattr_autofs_dev',`
++ gen_require(`
++ type autofs_device_t;
++ ')
++
++ dontaudit $1 autofs_device_t:chr_file getattr;
++')
++
++########################################
++## <summary>
++## Set the attributes of the autofs device node.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_setattr_autofs_dev',`
++ gen_require(`
++ type device_t, autofs_device_t;
++ ')
++
++ setattr_chr_files_pattern($1, device_t, autofs_device_t)
++')
++
++########################################
++## <summary>
++## Do not audit attempts to set the attributes of
++## the autofs device node.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`dev_dontaudit_setattr_autofs_dev',`
++ gen_require(`
++ type autofs_device_t;
++ ')
++
++ dontaudit $1 autofs_device_t:chr_file setattr;
++')
++
++########################################
++## <summary>
++## Read and write the autofs device.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_rw_autofs',`
++ gen_require(`
++ type device_t, autofs_device_t;
++ ')
++
++ rw_chr_files_pattern($1, device_t, autofs_device_t)
++')
++
++########################################
++## <summary>
++## Get the attributes of the network control device
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_getattr_netcontrol',`
++ gen_require(`
++ type device_t, netcontrol_device_t;
++ ')
++
++ getattr_chr_files_pattern($1, device_t, netcontrol_device_t)
++')
++
++########################################
++## <summary>
++## Read the network control identity.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_read_netcontrol',`
++ gen_require(`
++ type device_t, netcontrol_device_t;
++ ')
++
++ read_chr_files_pattern($1, device_t, netcontrol_device_t)
++')
++
++########################################
++## <summary>
++## Read and write the the network control device.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_rw_netcontrol',`
++ gen_require(`
++ type device_t, netcontrol_device_t;
++ ')
++
++ rw_chr_files_pattern($1, device_t, netcontrol_device_t)
++')
++
++########################################
++## <summary>
++## Get the attributes of the QEMU
++## microcode and id interfaces.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_getattr_qemu',`
++ gen_require(`
++ type device_t, qemu_device_t;
++ ')
++
++ getattr_chr_files_pattern($1, device_t, qemu_device_t)
++')
++
++########################################
++## <summary>
++## Set the attributes of the QEMU
++## microcode and id interfaces.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_setattr_qemu',`
++ gen_require(`
++ type device_t, qemu_device_t;
++ ')
++
++ setattr_chr_files_pattern($1, device_t, qemu_device_t)
++')
++
++########################################
++## <summary>
++## Read the QEMU device
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_read_qemu',`
++ gen_require(`
++ type device_t, qemu_device_t;
++ ')
++
++ read_chr_files_pattern($1, device_t, qemu_device_t)
++')
++
++########################################
++## <summary>
++## Read and write the the QEMU device.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dev_rw_qemu',`
++ gen_require(`
++ type device_t, qemu_device_t;
++ ')
++
++ rw_chr_files_pattern($1, device_t, qemu_device_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.1/policy/modules/kernel/devices.te
+--- nsaserefpolicy/policy/modules/kernel/devices.te 2008-10-08 21:42:58.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/devices.te 2008-11-25 09:45:43.000000000 -0500
+@@ -32,6 +32,12 @@
+ type apm_bios_t;
+ dev_node(apm_bios_t)
+
++#
++# Type for /dev/autofs
++#
++type autofs_device_t;
++dev_node(autofs_device_t)
++
+ type cardmgr_dev_t;
+ dev_node(cardmgr_dev_t)
+ files_tmp_file(cardmgr_dev_t)
+@@ -49,6 +55,12 @@
+ type cpu_device_t;
+ dev_node(cpu_device_t)
+
++#
++# network control devices
++#
++type netcontrol_device_t;
++dev_node(netcontrol_device_t)
++
+ # for the IBM zSeries z90crypt hardware ssl accelorator
+ type crypt_device_t;
+ dev_node(crypt_device_t)
+@@ -66,12 +78,25 @@
+ dev_node(framebuf_device_t)
+
+ #
++# Type for /dev/ipmi/0
++#
++type ipmi_device_t;
++dev_node(ipmi_device_t)
++
++#
+ # Type for /dev/kmsg
+ #
+ type kmsg_device_t;
+ dev_node(kmsg_device_t)
+
+ #
++# kvm_device_t is the type of
++# /dev/kvm
++#
++type kvm_device_t;
++dev_node(kvm_device_t)
++
++#
+ # Type for /dev/mapper/control
+ #
+ type lvm_control_t;
+@@ -118,6 +143,12 @@
+ dev_node(nvram_device_t)
+
+ #
++# qemu control devices
++#
++type qemu_device_t;
++dev_node(qemu_device_t)
++
++#
+ # Type for /dev/pmu
+ #
+ type power_device_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.1/policy/modules/kernel/domain.if
+--- nsaserefpolicy/policy/modules/kernel/domain.if 2008-10-16 17:21:13.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/domain.if 2008-11-25 09:45:43.000000000 -0500
+@@ -1247,18 +1247,34 @@
+ ## </summary>
+ ## </param>
+ #
+-interface(`domain_mmap_low',`
++interface(`domain_mmap_low_type',`
+ gen_require(`
+ attribute mmap_low_domain_type;
+ ')
+
+- allow $1 self:memprotect mmap_zero;
+-
+ typeattribute $1 mmap_low_domain_type;
+ ')
+
+ ########################################
+ ## <summary>
++## Ability to mmap a low area of the address space,
++## as configured by /proc/sys/kernel/mmap_min_addr.
++## Preventing such mappings helps protect against
++## exploiting null deref bugs in the kernel.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to mmap low memory.
++## </summary>
++## </param>
++#
++interface(`domain_mmap_low',`
++
++ allow $1 self:memprotect mmap_zero;
++')
++
++########################################
++## <summary>
+ ## Allow specified type to receive labeled
+ ## networking packets from all domains, over
+ ## all protocols (TCP, UDP, etc)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.6.1/policy/modules/kernel/domain.te
+--- nsaserefpolicy/policy/modules/kernel/domain.te 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/domain.te 2008-12-01 16:50:59.000000000 -0500
+@@ -5,6 +5,13 @@
+ #
+ # Declarations
+ #
++## <desc>
++## <p>
++## Allow all domains to use other domains file descriptors
++## </p>
++## </desc>
++#
++gen_tunable(allow_domain_fd_use, true)
+
+ # Mark process types as domains
+ attribute domain;
+@@ -80,6 +87,8 @@
+ allow domain self:lnk_file { read_lnk_file_perms lock ioctl };
+ allow domain self:file rw_file_perms;
+ kernel_read_proc_symlinks(domain)
++kernel_read_crypto_sysctls(domain)
++
+ # Every domain gets the key ring, so we should default
+ # to no one allowed to look at it; afs kernel support creates
+ # a keyring
+@@ -118,6 +127,7 @@
+ optional_policy(`
+ xserver_dontaudit_use_xdm_fds(domain)
+ xserver_dontaudit_rw_xdm_pipes(domain)
++ xserver_dontaudit_rw_xdm_home_files(domain)
+ ')
+
+ ########################################
+@@ -136,6 +146,9 @@
+ allow unconfined_domain_type domain:fd use;
+ allow unconfined_domain_type domain:fifo_file rw_file_perms;
+
++allow unconfined_domain_type domain:dbus send_msg;
++allow domain unconfined_domain_type:dbus send_msg;
++
+ # Act upon any other process.
+ allow unconfined_domain_type domain:process ~{ transition dyntransition execmem execstack execheap };
+
+@@ -145,7 +158,7 @@
+
+ # For /proc/pid
+ allow unconfined_domain_type domain:dir list_dir_perms;
+-allow unconfined_domain_type domain:file read_file_perms;
++allow unconfined_domain_type domain:file rw_file_perms;
+ allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
+
+ # act on all domains keys
+@@ -153,3 +166,39 @@
+
+ # receive from all domains over labeled networking
+ domain_all_recvfrom_all_domains(unconfined_domain_type)
++
++tunable_policy(`allow_domain_fd_use',`
++ # Allow all domains to use fds past to them
++ allow domain domain:fd use;
++')
++
++optional_policy(`
++ cron_dontaudit_write_system_job_tmp_files(domain)
++ cron_rw_pipes(domain)
++ifdef(`hide_broken_symptoms',`
++ cron_dontaudit_rw_tcp_sockets(domain)
++ allow domain domain:key { link search };
++')
++')
++
++ifdef(`hide_broken_symptoms',`
++ dbus_dontaudit_system_bus_rw_tcp_sockets(domain)
++')
++
++optional_policy(`
++ rpm_rw_pipes(domain)
++ rpm_dontaudit_use_script_fds(domain)
++ rpm_dontaudit_write_pid_files(domain)
++')
++
++optional_policy(`
++ rhgb_dontaudit_use_ptys(domain)
++')
++
++optional_policy(`
++ unconfined_dontaudit_rw_pipes(domain)
++ unconfined_sigchld(domain)
++')
++
++# broken kernel
++dontaudit can_change_object_identity can_change_object_identity:key link;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.6.1/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/files.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -32,6 +32,7 @@
+ /boot/lost\+found -d gen_context(system_u:object_r:lost_found_t,mls_systemhigh)
+ /boot/lost\+found/.* <<none>>
+ /boot/System\.map(-.*)? -- gen_context(system_u:object_r:system_map_t,s0)
++/boot/efi(/.*)?/System\.map(-.*)? -- gen_context(system_u:object_r:system_map_t,s0)
+
+ #
+ # /emul
+@@ -49,6 +50,7 @@
+ /etc/fstab\.REVOKE -- gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/HOSTNAME -- gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/ioctl\.save -- gen_context(system_u:object_r:etc_runtime_t,s0)
++/etc/hosts.deny -- gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/issue -- gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/issue\.net -- gen_context(system_u:object_r:etc_runtime_t,s0)
+ /etc/localtime -l gen_context(system_u:object_r:etc_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.1/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/files.if 2008-12-02 11:14:23.000000000 -0500
+@@ -110,6 +110,11 @@
+ ## </param>
+ #
+ interface(`files_config_file',`
++ gen_require(`
++ attribute etcfile;
++ ')
++
++ typeattribute $1 etcfile;
+ files_type($1)
+ ')
+
+@@ -928,8 +933,8 @@
+ relabel_lnk_files_pattern($1, { file_type $2 }, { file_type $2 })
+ relabel_fifo_files_pattern($1, { file_type $2 }, { file_type $2 })
+ relabel_sock_files_pattern($1, { file_type $2 }, { file_type $2 })
+- relabelfrom_blk_files_pattern($1, { file_type $2 }, { file_type $2 })
+- relabelfrom_chr_files_pattern($1, { file_type $2 }, { file_type $2 })
++ relabel_blk_files_pattern($1, { file_type $2 }, { file_type $2 })
++ relabel_chr_files_pattern($1, { file_type $2 }, { file_type $2 })
+
+ # satisfy the assertions:
+ seutil_relabelto_bin_policy($1)
+@@ -937,6 +942,32 @@
+
+ ########################################
+ ## <summary>
++## rw all files on the filesystem, except
++## the listed exceptions.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the domain perfoming this action.
++## </summary>
++## </param>
++## <param name="exception_types" optional="true">
++## <summary>
++## The types to be excluded. Each type or attribute
++## must be negated by the caller.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`files_rw_all_files',`
++ gen_require(`
++ attribute file_type;
++ ')
++
++ rw_files_pattern($1, { file_type $2 }, { file_type $2 })
++')
++
++########################################
++## <summary>
+ ## Manage all files on the filesystem, except
+ ## the listed exceptions.
+ ## </summary>
+@@ -1060,6 +1091,24 @@
+ ## </summary>
+ ## </param>
+ #
++interface(`files_relabel_all_file_type_fs',`
++ gen_require(`
++ attribute file_type;
++ ')
++
++ allow $1 file_type:filesystem { relabelfrom relabelto };
++')
++
++########################################
++## <summary>
++## Relabel a filesystem to the type of a file.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
+ interface(`files_relabelto_all_file_type_fs',`
+ gen_require(`
+ attribute file_type;
+@@ -1303,6 +1352,24 @@
+
+ ########################################
+ ## <summary>
++## Remove entries from the tmp directory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_delete_tmp_dir_entry',`
++ gen_require(`
++ type root_t;
++ ')
++
++ allow $1 tmp_t:dir del_entry_dir_perms;
++')
++
++########################################
++## <summary>
+ ## Unmount a rootfs filesystem.
+ ## </summary>
+ ## <param name="domain">
+@@ -1669,6 +1736,25 @@
+
+ ########################################
+ ## <summary>
++## Manage a filesystem on a directory with the default file type.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_manage_default',`
++ gen_require(`
++ type default_t;
++ ')
++
++ manage_dirs_pattern($1, default_t, default_t)
++ manage_files_pattern($1, default_t, default_t)
++')
++
++########################################
++## <summary>
+ ## Mount a filesystem on a directory with the default file type.
+ ## </summary>
+ ## <param name="domain">
+@@ -1889,6 +1975,26 @@
+
+ ########################################
+ ## <summary>
++## Read config files in /etc.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_read_config_files',`
++ gen_require(`
++ attribute etcfile;
++ ')
++
++ allow $1 etcfile:dir list_dir_perms;
++ read_files_pattern($1, etcfile, etcfile)
++ read_lnk_files_pattern($1, etcfile, etcfile)
++')
++
++########################################
++## <summary>
+ ## Do not audit attempts to write generic files in /etc.
+ ## </summary>
+ ## <param name="domain">
+@@ -2224,6 +2330,49 @@
+
+ ########################################
+ ## <summary>
++## Delete directories on new filesystems
++## that have not yet been labeled.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_delete_isid_type_dirs',`
++ gen_require(`
++ type file_t;
++ ')
++
++ delete_dirs_pattern($1, file_t, file_t)
++')
++
++########################################
++## <summary>
++## Delete files on new filesystems
++## that have not yet been labeled.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_delete_isid_type_files',`
++ gen_require(`
++ type file_t;
++ ')
++
++ delete_files_pattern($1, file_t, file_t)
++ delete_lnk_files_pattern($1, file_t, file_t)
++ delete_fifo_files_pattern($1, file_t, file_t)
++ delete_sock_files_pattern($1, file_t, file_t)
++ delete_blk_files_pattern($1, file_t, file_t)
++ delete_chr_files_pattern($1, file_t, file_t)
++')
++
++########################################
++## <summary>
+ ## Do not audit attempts to search directories on new filesystems
+ ## that have not yet been labeled.
+ ## </summary>
+@@ -2744,6 +2893,24 @@
+
+ ########################################
+ ## <summary>
++## read files in /mnt.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_read_mnt_files',`
++ gen_require(`
++ type mnt_t;
++ ')
++
++ read_files_pattern($1, mnt_t, mnt_t)
++')
++
++########################################
++## <summary>
+ ## Create, read, write, and delete symbolic links in /mnt.
+ ## </summary>
+ ## <param name="domain">
+@@ -3394,6 +3561,8 @@
+ delete_lnk_files_pattern($1, tmpfile, tmpfile)
+ delete_fifo_files_pattern($1, tmpfile, tmpfile)
+ delete_sock_files_pattern($1, tmpfile, tmpfile)
++ files_delete_isid_type_dirs($1)
++ files_delete_isid_type_files($1)
+ ')
+
+ ########################################
+@@ -3471,6 +3640,47 @@
+
+ ########################################
+ ## <summary>
++## Delete generic directories in /usr in the caller domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_delete_usr_dirs',`
++ gen_require(`
++ type usr_t;
++ ')
++
++ delete_dirs_pattern($1, usr_t, usr_t)
++')
++
++########################################
++## <summary>
++## Delete generic files in /usr in the caller domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_delete_usr_files',`
++ gen_require(`
++ type usr_t;
++ ')
++
++ delete_files_pattern($1, usr_t, usr_t)
++ delete_lnk_files_pattern($1, usr_t, usr_t)
++ delete_fifo_files_pattern($1, usr_t, usr_t)
++ delete_sock_files_pattern($1, usr_t, usr_t)
++ delete_blk_files_pattern($1, usr_t, usr_t)
++ delete_chr_files_pattern($1, usr_t, usr_t)
++')
++
++########################################
++## <summary>
+ ## Get the attributes of files in /usr.
+ ## </summary>
+ ## <param name="domain">
+@@ -3547,6 +3757,24 @@
+
+ ########################################
+ ## <summary>
++## dontaudit write of /usr files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_dontaudit_write_usr_files',`
++ gen_require(`
++ type usr_t;
++ ')
++
++ dontaudit $1 usr_t:file write;
++')
++
++########################################
++## <summary>
+ ## Relabel a file to the type used in /usr.
+ ## </summary>
+ ## <param name="domain">
+@@ -4433,6 +4661,25 @@
+
+ ########################################
+ ## <summary>
++## Read generic process ID files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_read_generic_pids',`
++ gen_require(`
++ type var_t, var_run_t;
++ ')
++
++ list_dirs_pattern($1,var_t,var_run_t)
++ read_files_pattern($1, var_run_t, var_run_t)
++')
++
++########################################
++## <summary>
+ ## Read and write generic process ID files.
+ ## </summary>
+ ## <param name="domain">
+@@ -4761,12 +5008,14 @@
+ allow $1 poly_t:dir { create mounton };
+ fs_unmount_xattr_fs($1)
+
++ fs_mount_tmpfs($1)
++ fs_unmount_tmpfs($1)
++
+ ifdef(`distro_redhat',`
+ # namespace.init
+ files_search_home($1)
+ corecmd_exec_bin($1)
+ seutil_domtrans_setfiles($1)
+- mount_domtrans($1)
+ ')
+ ')
+
+@@ -4787,3 +5036,71 @@
+
+ typeattribute $1 files_unconfined_type;
+ ')
++
++########################################
++## <summary>
++## Create a core files in /
++## </summary>
++## <desc>
++## <p>
++## Create a core file in /,
++## </p>
++## </desc>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`files_dump_core',`
++ gen_require(`
++ type root_t;
++ ')
++
++ manage_files_pattern($1, root_t, root_t)
++')
++
++########################################
++## <summary>
++## Create a default directory in /
++## </summary>
++## <desc>
++## <p>
++## Create a default_t direcrory in /
++## </p>
++## </desc>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`files_create_default_dir',`
++ gen_require(`
++ type root_t, default_t;
++ ')
++
++ allow $1 default_t:dir create;
++ filetrans_pattern($1, root_t, default_t, dir)
++')
++
++########################################
++## <summary>
++## manage generic symbolic links
++## in the /var/run directory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`files_manage_generic_pids_symlinks',`
++ gen_require(`
++ type var_run_t;
++ ')
++
++ manage_lnk_files_pattern($1,var_run_t,var_run_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.6.1/policy/modules/kernel/files.te
+--- nsaserefpolicy/policy/modules/kernel/files.te 2008-10-14 11:58:07.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/files.te 2008-11-25 09:45:43.000000000 -0500
+@@ -52,7 +52,9 @@
+ #
+ # etc_t is the type of the system etc directories.
+ #
+-type etc_t;
++attribute etcfile;
++
++type etc_t, etcfile;
+ files_type(etc_t)
+ # compatibility aliases for removed types:
+ typealias etc_t alias automount_etc_t;
+@@ -174,6 +176,7 @@
+ #
+ type var_run_t;
+ files_pid_file(var_run_t)
++files_mountpoint(var_run_t)
+
+ #
+ # var_spool_t is the type of /var/spool
+@@ -197,10 +200,7 @@
+ #
+ # Rules for all tmp file types
+ #
+-
+-allow tmpfile tmp_t:filesystem associate;
+-
+-fs_associate_tmpfs(tmpfile)
++allow file_type tmp_t:filesystem associate;
+
+ ########################################
+ #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.1/policy/modules/kernel/filesystem.if
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/filesystem.if 2008-12-01 16:27:54.000000000 -0500
+@@ -534,6 +534,24 @@
+
+ ########################################
+ ## <summary>
++## Mounton a CIFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`fs_mounton_cifs',`
++ gen_require(`
++ type cifs_t;
++ ')
++
++ allow $1 cifs_t:dir mounton;
++')
++
++########################################
++## <summary>
+ ## Remount a CIFS or SMB network filesystem.
+ ## This allows some mount options to be changed.
+ ## </summary>
+@@ -736,6 +754,7 @@
+ attribute noxattrfs;
+ ')
+
++ list_dirs_pattern($1, noxattrfs, noxattrfs)
+ read_files_pattern($1, noxattrfs, noxattrfs)
+ ')
+
+@@ -778,6 +797,25 @@
+ ########################################
+ ## <summary>
+ ## Do not audit attempts to read
++## dirs on a CIFS or SMB filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`fs_dontaudit_list_cifs_dirs',`
++ gen_require(`
++ type cifs_t;
++ ')
++
++ dontaudit $1 cifs_t:dir list_dir_perms;
++')
++
++########################################
++## <summary>
++## Do not audit attempts to read
+ ## files on a CIFS or SMB filesystem.
+ ## </summary>
+ ## <param name="domain">
+@@ -954,6 +992,46 @@
+
+ ########################################
+ ## <summary>
++## Append files
++## on a CIFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_append_cifs_files',`
++ gen_require(`
++ type cifs_t;
++ ')
++
++ append_files_pattern($1, cifs_t, cifs_t)
++')
++
++########################################
++## <summary>
++## dontaudit Append files
++## on a CIFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_dontaudit_append_cifs_files',`
++ gen_require(`
++ type cifs_t;
++ ')
++
++ dontaudit $1 cifs_t:file append;
++')
++
++########################################
++## <summary>
+ ## Do not audit attempts to create, read,
+ ## write, and delete files
+ ## on a CIFS or SMB network filesystem.
+@@ -1208,6 +1286,25 @@
+
+ ########################################
+ ## <summary>
++## Create, read, write, and delete dirs
++## on a DOS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`fs_manage_dos_dirs',`
++ gen_require(`
++ type dosfs_t;
++ ')
++
++ manage_dirs_pattern($1, dosfs_t, dosfs_t)
++')
++
++########################################
++## <summary>
+ ## Create, read, write, and delete files
+ ## on a DOS filesystem.
+ ## </summary>
+@@ -1477,6 +1574,24 @@
+
+ ########################################
+ ## <summary>
++## Mounton a NFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`fs_mounton_nfs',`
++ gen_require(`
++ type nfs_t;
++ ')
++
++ allow $1 nfs_t:dir mounton;
++')
++
++########################################
++## <summary>
+ ## Remount a NFS filesystem. This allows
+ ## some mount options to be changed.
+ ## </summary>
+@@ -1680,7 +1795,7 @@
+ type nfs_t;
+ ')
+
+- dontaudit $1 nfs_t:file { read write };
++ dontaudit $1 nfs_t:file rw_file_perms;
+ ')
+
+ ########################################
+@@ -2000,6 +2115,47 @@
+
+ ########################################
+ ## <summary>
++## Append files
++## on a NFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_append_nfs_files',`
++ gen_require(`
++ type nfs_t;
++ ')
++
++ append_files_pattern($1, nfs_t, nfs_t)
++')
++
++########################################
++## <summary>
++## dontaudit Append files
++## on a NFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_dontaudit_append_nfs_files',`
++ gen_require(`
++ type nfs_t;
++ ')
++
++ dontaudit $1 nfs_t:file append;
++')
++
++
++########################################
++## <summary>
+ ## Do not audit attempts to create,
+ ## read, write, and delete files
+ ## on a NFS filesystem.
+@@ -2994,6 +3150,7 @@
+ type tmpfs_t;
+ ')
+
++ dontaudit $1 tmpfs_t:dir rw_dir_perms;
+ dontaudit $1 tmpfs_t:file rw_file_perms;
+ ')
+
+@@ -3130,6 +3287,25 @@
+
+ ########################################
+ ## <summary>
++## Read and write block nodes on removable filesystems.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`fs_rw_removable_blk_files',`
++ gen_require(`
++ type removable_t;
++ ')
++
++ allow $1 removable_t:dir list_dir_perms;
++ rw_blk_files_pattern($1, removable_t, removable_t)
++')
++
++########################################
++## <summary>
+ ## Relabel block nodes on tmpfs filesystems.
+ ## </summary>
+ ## <param name="domain">
+@@ -3315,6 +3491,7 @@
+ ')
+
+ allow $1 filesystem_type:filesystem getattr;
++ files_getattr_all_file_type_fs($1)
+ ')
+
+ ########################################
+@@ -3642,3 +3819,142 @@
+ relabelfrom_blk_files_pattern($1, noxattrfs, noxattrfs)
+ relabelfrom_chr_files_pattern($1, noxattrfs, noxattrfs)
+ ')
++
++########################################
++## <summary>
++## Search directories
++## on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_search_fusefs_dirs',`
++ gen_require(`
++ type fusefs_t;
++ ')
++
++ allow $1 fusefs_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++## Create, read, write, and delete directories
++## on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_manage_fusefs_dirs',`
++ gen_require(`
++ type fusefs_t;
++ ')
++
++ allow $1 fusefs_t:dir manage_dir_perms;
++')
++
++########################################
++## <summary>
++## Do not audit attempts to create, read,
++## write, and delete directories
++## on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`fs_dontaudit_manage_fusefs_dirs',`
++ gen_require(`
++ type fusefs_t;
++ ')
++
++ dontaudit $1 fusefs_t:dir manage_dir_perms;
++')
++
++########################################
++## <summary>
++## Create, read, write, and delete files
++## on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_manage_fusefs_files',`
++ gen_require(`
++ type fusefs_t;
++ ')
++
++ manage_files_pattern($1, fusefs_t, fusefs_t)
++')
++
++########################################
++## <summary>
++## Read, a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`fs_read_fusefs_files',`
++ gen_require(`
++ type fusefs_t;
++ ')
++
++ read_files_pattern($1,fusefs_t,fusefs_t)
++')
++
++########################################
++## <summary>
++## Read symbolic links on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`fs_read_fusefs_symlinks',`
++ gen_require(`
++ type fusefs_t;
++ ')
++
++ allow $1 fusefs_t:dir list_dir_perms;
++ read_lnk_files_pattern($1, fusefs_t, fusefs_t)
++')
++
++
++########################################
++## <summary>
++## Do not audit attempts to create,
++## read, write, and delete files
++## on a FUSEFS filesystem.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`fs_dontaudit_manage_fusefs_files',`
++ gen_require(`
++ type fusefs_t;
++ ')
++
++ dontaudit $1 fusefs_t:file manage_file_perms;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.6.1/policy/modules/kernel/filesystem.te
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2008-10-14 11:58:07.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/filesystem.te 2008-11-25 09:48:01.000000000 -0500
+@@ -21,7 +21,7 @@
+
+ # Use xattrs for the following filesystem types.
+ # Requires that a security xattr handler exist for the filesystem.
+-fs_use_xattr ecryptfs gen_context(system_u:object_r:fs_t,s0);
++fs_use_xattr btrfs gen_context(system_u:object_r:fs_t,s0);
+ 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);
+ fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
+@@ -76,6 +76,11 @@
+ allow cpusetfs_t self:filesystem associate;
+ genfscon cpuset / gen_context(system_u:object_r:cpusetfs_t,s0)
+
++type ecryptfs_t;
++fs_noxattr_type(ecryptfs_t)
++files_mountpoint(ecryptfs_t)
++genfscon ecryptfs / gen_context(system_u:object_r:ecryptfs_t,s0)
++
+ type eventpollfs_t;
+ fs_type(eventpollfs_t)
+ # change to task SID 20060628
+@@ -141,6 +146,8 @@
+ fs_noxattr_type(vmblock_t)
+ files_mountpoint(vmblock_t)
+ genfscon vmblock / gen_context(system_u:object_r:vmblock_t,s0)
++genfscon vboxsf / gen_context(system_u:object_r:vmblock_t,s0)
++genfscon vmhgfs / gen_context(system_u:object_r:vmblock_t,s0)
+
+ type vxfs_t;
+ fs_noxattr_type(vxfs_t)
+@@ -241,6 +248,7 @@
+ genfscon lustre / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon panfs / gen_context(system_u:object_r:nfs_t,s0)
++genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0)
+
+ ########################################
+ #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.1/policy/modules/kernel/kernel.if
+--- nsaserefpolicy/policy/modules/kernel/kernel.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/kernel.if 2008-11-25 09:45:43.000000000 -0500
+@@ -1197,6 +1197,7 @@
+ ')
+
+ dontaudit $1 proc_type:dir list_dir_perms;
++ dontaudit $1 proc_type:file getattr;
+ ')
+
+ ########################################
+@@ -1233,9 +1234,11 @@
+ interface(`kernel_read_sysctl',`
+ gen_require(`
+ type sysctl_t;
++ type proc_t;
+ ')
+
+ list_dirs_pattern($1, proc_t, sysctl_t)
++ read_files_pattern($1, sysctl_t, sysctl_t)
+ ')
+
+ ########################################
+@@ -1568,6 +1571,26 @@
+
+ ########################################
+ ## <summary>
++## Read generic crypto sysctls.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`kernel_read_crypto_sysctls',`
++ gen_require(`
++ type proc_t, sysctl_t, sysctl_crypto_t;
++ ')
++
++ read_files_pattern($1, { proc_t sysctl_t sysctl_crypto_t }, sysctl_crypto_t)
++
++ list_dirs_pattern($1, { proc_t sysctl_t }, sysctl_crypto_t)
++')
++
++########################################
++## <summary>
+ ## Read generic kernel sysctls.
+ ## </summary>
+ ## <param name="domain">
+@@ -1767,6 +1790,7 @@
+ ')
+
+ dontaudit $1 sysctl_type:dir list_dir_perms;
++ dontaudit $1 sysctl_type:file read_file_perms;
+ ')
+
+ ########################################
+@@ -2580,6 +2604,24 @@
+
+ ########################################
+ ## <summary>
++## Relabel to unlabeled context .
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`kernel_relabelto_unlabeled',`
++ gen_require(`
++ type unlabeled_t;
++ ')
++
++ allow $1 unlabeled_t:dir_file_class_set relabelto;
++')
++
++########################################
++## <summary>
+ ## Unconfined access to kernel module resources.
+ ## </summary>
+ ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.6.1/policy/modules/kernel/kernel.te
+--- nsaserefpolicy/policy/modules/kernel/kernel.te 2008-08-07 11:15:01.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/kernel.te 2008-11-25 09:45:43.000000000 -0500
+@@ -63,6 +63,15 @@
+ genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
+
+ #
++# infinibandeventfs fs
++#
++
++type infinibandeventfs_t;
++fs_type(infinibandeventfs_t)
++allow infinibandeventfs_t self:filesystem associate;
++genfscon infinibandeventfs / gen_context(system_u:object_r:infinibandeventfs_t,s0)
++
++#
+ # kvmFS
+ #
+
+@@ -120,6 +129,10 @@
+ type sysctl_rpc_t, sysctl_type;
+ genfscon proc /net/rpc gen_context(system_u:object_r:sysctl_rpc_t,s0)
+
++# /proc/sys/crypto directory and files
++type sysctl_crypto_t, sysctl_type;
++genfscon proc /sys/crypto gen_context(system_u:object_r:sysctl_crypto_t,s0)
++
+ # /proc/sys/fs directory and files
+ type sysctl_fs_t, sysctl_type;
+ files_mountpoint(sysctl_fs_t)
+@@ -160,6 +173,7 @@
+ #
+ type unlabeled_t;
+ sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
++fs_associate(unlabeled_t)
+
+ # These initial sids are no longer used, and can be removed:
+ sid any_socket gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
+@@ -274,6 +288,8 @@
+ fs_rw_tmpfs_chr_files(kernel_t)
+ ')
+
++userdom_user_home_dir_filetrans_user_home_content(kernel_t, { file dir })
++
+ tunable_policy(`read_default_t',`
+ files_list_default(kernel_t)
+ files_read_default_files(kernel_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.6.1/policy/modules/kernel/selinux.if
+--- nsaserefpolicy/policy/modules/kernel/selinux.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/selinux.if 2008-11-25 09:45:43.000000000 -0500
+@@ -164,6 +164,7 @@
+ type security_t;
+ ')
+
++ selinux_dontaudit_getattr_fs($1)
+ dontaudit $1 security_t:dir search_dir_perms;
+ dontaudit $1 security_t:file read_file_perms;
+ ')
+@@ -185,6 +186,7 @@
+ type security_t;
+ ')
+
++ selinux_get_fs_mount($1)
+ allow $1 security_t:dir list_dir_perms;
+ allow $1 security_t:file read_file_perms;
+ ')
+@@ -265,6 +267,34 @@
+
+ ########################################
+ ## <summary>
++## Allow caller to read the state of Booleans
++## </summary>
++## <desc>
++## <p>
++## Allow caller read the state of Booleans
++## </p>
++## </desc>
++## <param name="domain">
++## <summary>
++## The process type allowed to set the Boolean.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`selinux_get_boolean',`
++ gen_require(`
++ type security_t;
++ attribute booleans_type;
++ bool secure_mode_policyload;
++ ')
++
++ allow $1 security_t:dir list_dir_perms;
++ allow $1 booleans_type:dir list_dir_perms;
++ allow $1 booleans_type:file read_file_perms;
++')
++
++########################################
++## <summary>
+ ## Allow caller to set the state of Booleans to
+ ## enable or disable conditional portions of the policy.
+ ## </summary>
+@@ -288,11 +318,13 @@
+ interface(`selinux_set_boolean',`
+ gen_require(`
+ type security_t;
++ attribute booleans_type;
+ bool secure_mode_policyload;
+ ')
+
+ allow $1 security_t:dir list_dir_perms;
+- allow $1 security_t:file rw_file_perms;
++ allow $1 booleans_type:dir list_dir_perms;
++ allow $1 booleans_type:file rw_file_perms;
+
+ if(!secure_mode_policyload) {
+ allow $1 security_t:security setbool;
+@@ -510,3 +542,23 @@
+
+ typeattribute $1 selinux_unconfined_type;
+ ')
++
++########################################
++## <summary>
++## Generate a file context for a boolean type
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`selinux_genbool',`
++ gen_require(`
++ attribute booleans_type;
++ ')
++
++ type $1, booleans_type;
++ fs_type($1)
++ mls_trusted_object($1)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-3.6.1/policy/modules/kernel/selinux.te
+--- nsaserefpolicy/policy/modules/kernel/selinux.te 2008-10-16 17:21:13.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/selinux.te 2008-11-25 09:45:43.000000000 -0500
+@@ -10,6 +10,7 @@
+ attribute can_setenforce;
+ attribute can_setsecparam;
+ attribute selinux_unconfined_type;
++attribute booleans_type;
+
+ #
+ # security_t is the target type when checking
+@@ -23,6 +24,11 @@
+ genfscon selinuxfs / gen_context(system_u:object_r:security_t,s0)
+ genfscon securityfs / gen_context(system_u:object_r:security_t,s0)
+
++type boolean_t, booleans_type;
++fs_type(boolean_t)
++mls_trusted_object(boolean_t)
++#genfscon selinuxfs /booleans gen_context(system_u:object_r:boolean_t,s0)
++
+ neverallow ~{ selinux_unconfined_type can_load_policy } security_t:security load_policy;
+ neverallow ~{ selinux_unconfined_type can_setenforce } security_t:security setenforce;
+ neverallow ~{ selinux_unconfined_type can_setsecparam } security_t:security setsecparam;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.6.1/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc 2008-10-08 19:00:23.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/kernel/storage.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -36,7 +36,7 @@
+ /dev/pg[0-3] -c gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/ps3d.* -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/ram.* -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+-/dev/rawctl -c gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
++/dev/(raw/)?rawctl -c gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ /dev/rd.* -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ ifdef(`distro_redhat', `
+ /dev/root -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.6.1/policy/modules/kernel/terminal.if
+--- nsaserefpolicy/policy/modules/kernel/terminal.if 2008-11-11 16:13:41.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/terminal.if 2008-11-25 09:45:43.000000000 -0500
+@@ -250,9 +250,11 @@
+ interface(`term_dontaudit_use_console',`
+ gen_require(`
+ type console_device_t;
++ type tty_device_t;
+ ')
+
+ dontaudit $1 console_device_t:chr_file rw_chr_file_perms;
++ dontaudit $1 tty_device_t:chr_file rw_chr_file_perms;
+ ')
+
+ ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/auditadm.te serefpolicy-3.6.1/policy/modules/roles/auditadm.te
+--- nsaserefpolicy/policy/modules/roles/auditadm.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/auditadm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -32,158 +32,18 @@
+ seutil_read_bin_policy(auditadm_t)
+
+ optional_policy(`
+- apache_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- auth_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- bluetooth_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- cdrecord_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+ consoletype_exec(auditadm_t)
+ ')
+
+ optional_policy(`
+- cron_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- dbus_role_template(auditadm, auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+ dmesg_exec(auditadm_t)
+ ')
+
+ optional_policy(`
+- ethereal_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- evolution_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- games_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- gift_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- gpg_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- gnome_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- irc_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- java_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- lockdev_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- lpd_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- mozilla_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- mplayer_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- mta_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- oident_manage_user_content(auditadm_t)
+- oident_relabel_user_content(auditadm_t)
+-')
+-
+-optional_policy(`
+- pyzor_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- razor_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- rssh_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- screen_role_template(auditadm, auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- spamassassin_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- ssh_role_template(auditadm, auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+ secadm_role_change(auditadm_r)
+ ')
+
+ optional_policy(`
+- su_role_template(auditadm, auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- sudo_role_template(auditadm, auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+ sysadm_role_change(auditadm_r)
+ ')
+
+-optional_policy(`
+- thunderbird_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- tvtime_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- userhelper_role_template(auditadm, auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- vmware_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- wireshark_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- uml_role(auditadm_r, auditadm_t)
+-')
+-
+-optional_policy(`
+- xserver_role(auditadm_r, auditadm_t)
+-')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.6.1/policy/modules/roles/guest.fc
+--- nsaserefpolicy/policy/modules/roles/guest.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/guest.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1 @@
++# file contexts handled by userdomain and genhomedircon
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.if serefpolicy-3.6.1/policy/modules/roles/guest.if
+--- nsaserefpolicy/policy/modules/roles/guest.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/guest.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,50 @@
++## <summary>Least privledge terminal user role</summary>
++
++########################################
++## <summary>
++## Change to the guest role.
++## </summary>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`guest_role_change',`
++ gen_require(`
++ role guest_r;
++ ')
++
++ allow $1 guest_r;
++')
++
++########################################
++## <summary>
++## Change from the guest role.
++## </summary>
++## <desc>
++## <p>
++## Change from the guest role to
++## the specified role.
++## </p>
++## <p>
++## This is an interface to support third party modules
++## and its use is not allowed in upstream reference
++## policy.
++## </p>
++## </desc>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`guest_role_change_to',`
++ gen_require(`
++ role guest_r;
++ ')
++
++ allow guest_r $1;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.6.1/policy/modules/roles/guest.te
+--- nsaserefpolicy/policy/modules/roles/guest.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/guest.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,36 @@
++
++policy_module(guest, 1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++role xguest_r;
++
++userdom_restricted_user_template(guest)
++
++########################################
++#
++# Local policy
++#
++
++optional_policy(`
++ java_role_template(guest, guest_r, guest_t)
++')
++
++optional_policy(`
++ mono_role_template(guest, guest_r, guest_t)
++')
++
++
++optional_policy(`
++ gen_require(`
++ type xguest_t;
++ role xguest_r;
++ ')
++
++ mozilla_role(xguest, xguest_t, xguest_r)
++')
++
++gen_user(guest_u, user, guest_r, s0, s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.6.1/policy/modules/roles/logadm.fc
+--- nsaserefpolicy/policy/modules/roles/logadm.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/logadm.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1 @@
++# file contexts handled by userdomain and genhomedircon
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.if serefpolicy-3.6.1/policy/modules/roles/logadm.if
+--- nsaserefpolicy/policy/modules/roles/logadm.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/logadm.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,50 @@
++## <summary>Log administrator role</summary>
++
++########################################
++## <summary>
++## Change to the log administrator role.
++## </summary>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`logadm_role_change',`
++ gen_require(`
++ role logadm_r;
++ ')
++
++ allow $1 logadm_r;
++')
++
++########################################
++## <summary>
++## Change from the log administrator role.
++## </summary>
++## <desc>
++## <p>
++## Change from the log administrator role to
++## the specified role.
++## </p>
++## <p>
++## This is an interface to support third party modules
++## and its use is not allowed in upstream reference
++## policy.
++## </p>
++## </desc>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`logadm_role_change_to',`
++ gen_require(`
++ role logadm_r;
++ ')
++
++ allow logadm_r $1;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.te serefpolicy-3.6.1/policy/modules/roles/logadm.te
+--- nsaserefpolicy/policy/modules/roles/logadm.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/logadm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,20 @@
++
++policy_module(logadm, 1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++role logadm_r;
++
++userdom_base_user_template(logadm)
++
++########################################
++#
++# logadmin local policy
++#
++
++allow logadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
++
++logging_admin(logadm_t, logadm_r)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/secadm.te serefpolicy-3.6.1/policy/modules/roles/secadm.te
+--- nsaserefpolicy/policy/modules/roles/secadm.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/secadm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -45,154 +45,18 @@
+ ')
+
+ optional_policy(`
+- apache_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+ auditadm_role_change(secadm_r)
+ ')
+
+ optional_policy(`
+- bluetooth_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- cdrecord_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- cron_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- dbus_role_template(secadm, secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+ dmesg_exec(secadm_t)
+ ')
+
+ optional_policy(`
+- ethereal_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- evolution_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- games_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- gift_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- gnome_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- gpg_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- irc_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- java_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- lockdev_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- lpd_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- mozilla_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- mplayer_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- mta_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+ netlabel_run_mgmt(secadm_t, secadm_r)
+ ')
+
+ optional_policy(`
+- oident_manage_user_content(secadm_t)
+- oident_relabel_user_content(secadm_t)
+-')
+-
+-optional_policy(`
+- pyzor_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- razor_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- rssh_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- screen_role_template(secadm, secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- spamassassin_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- ssh_role_template(secadm, secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- su_role_template(secadm, secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- sudo_role_template(secadm, secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+ sysadm_role_change(secadm_r)
+ ')
+
+-optional_policy(`
+- thunderbird_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- tvtime_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- uml_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- userhelper_role_template(secadm, secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- vmware_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- wireshark_role(secadm_r, secadm_t)
+-')
+-
+-optional_policy(`
+- xserver_role(secadm_r, secadm_t)
+-')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.1/policy/modules/roles/staff.te
+--- nsaserefpolicy/policy/modules/roles/staff.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/staff.te 2008-11-25 09:45:43.000000000 -0500
+@@ -8,112 +8,32 @@
+
+ role staff_r;
+
+-userdom_unpriv_user_template(staff)
++userdom_admin_login_user_template(staff)
+
+ ########################################
+ #
+ # Local policy
+ #
+
+-optional_policy(`
+- apache_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- auth_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- auditadm_role_change(staff_r)
+-')
+-
+-optional_policy(`
+- bluetooth_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- cdrecord_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- cron_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- dbus_role_template(staff, staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- ethereal_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- evolution_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- games_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- gift_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- gnome_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- gpg_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- irc_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- java_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- lockdev_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- lpd_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- mozilla_role(staff_r, staff_t)
+-')
++kernel_read_ring_buffer(staff_t)
++kernel_getattr_core_if(staff_t)
++kernel_getattr_message_if(staff_t)
++kernel_read_software_raid_state(staff_t)
+
+-optional_policy(`
+- mplayer_role(staff_r, staff_t)
+-')
++auth_domtrans_pam_console(staff_t)
+
+-optional_policy(`
+- mta_role(staff_r, staff_t)
+-')
++libs_manage_shared_libs(staff_t)
+
+ optional_policy(`
+- oident_manage_user_content(staff_t)
+- oident_relabel_user_content(staff_t)
+-')
+-
+-optional_policy(`
+- pyzor_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- razor_role(staff_r, staff_t)
++ auditadm_role_change(staff_r)
+ ')
+
+ optional_policy(`
+- rssh_role(staff_r, staff_t)
++ kerneloops_manage_tmp_files(staff_t)
+ ')
+
+ optional_policy(`
+- screen_role_template(staff, staff_r, staff_t)
++ logadm_role_change(staff_r)
+ ')
+
+ optional_policy(`
+@@ -121,50 +41,21 @@
+ ')
+
+ optional_policy(`
+- spamassassin_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+ ssh_role_template(staff, staff_r, staff_t)
+ ')
+
+ optional_policy(`
+- su_role_template(staff, staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- sudo_role_template(staff, staff_r, staff_t)
+-')
+-
+-optional_policy(`
+ sysadm_role_change(staff_r)
+- userdom_dontaudit_use_user_terminals(staff_t)
+-')
+-
+-optional_policy(`
+- thunderbird_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- tvtime_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- uml_role(staff_r, staff_t)
+-')
+-
+-optional_policy(`
+- userhelper_role_template(staff, staff_r, staff_t)
+ ')
+
+ optional_policy(`
+- vmware_role(staff_r, staff_t)
++ usernetctl_run(staff_t, staff_r)
+ ')
+
+ optional_policy(`
+- wireshark_role(staff_r, staff_t)
++ unconfined_role_change(staff_r)
+ ')
+
+ optional_policy(`
+- xserver_role(staff_r, staff_t)
++ webadm_role_change(staff_r)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.1/policy/modules/roles/sysadm.te
+--- nsaserefpolicy/policy/modules/roles/sysadm.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/sysadm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -15,7 +15,7 @@
+
+ role sysadm_r;
+
+-userdom_admin_user_template(sysadm)
++userdom_admin_login_user_template(sysadm)
+
+ ifndef(`enable_mls',`
+ userdom_security_admin_template(sysadm_t, sysadm_r)
+@@ -70,7 +70,6 @@
+ apache_run_helper(sysadm_t, sysadm_r)
+ #apache_run_all_scripts(sysadm_t, sysadm_r)
+ #apache_domtrans_sys_script(sysadm_t)
+- apache_role(sysadm_r, sysadm_t)
+ ')
+
+ optional_policy(`
+@@ -87,10 +86,6 @@
+ ')
+
+ optional_policy(`
+- auth_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ backup_run(sysadm_t, sysadm_r)
+ ')
+
+@@ -99,18 +94,10 @@
+ ')
+
+ optional_policy(`
+- bluetooth_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ bootloader_run(sysadm_t, sysadm_r)
+ ')
+
+ optional_policy(`
+- cdrecord_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ certwatch_run(sysadm_t, sysadm_r)
+ ')
+
+@@ -127,18 +114,10 @@
+ ')
+
+ optional_policy(`
+- cron_admin_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ cvs_exec(sysadm_t)
+ ')
+
+ optional_policy(`
+- dbus_role_template(sysadm, sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ dcc_run_cdcc(sysadm_t, sysadm_r)
+ dcc_run_client(sysadm_t, sysadm_r)
+ dcc_run_dbclean(sysadm_t, sysadm_r)
+@@ -166,10 +145,6 @@
+ ')
+
+ optional_policy(`
+- evolution_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ firstboot_run(sysadm_t, sysadm_r)
+ ')
+
+@@ -178,22 +153,6 @@
+ ')
+
+ optional_policy(`
+- games_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- gift_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- gnome_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- gpg_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ hostname_run(sysadm_t, sysadm_r)
+ ')
+
+@@ -212,11 +171,7 @@
+ ')
+
+ optional_policy(`
+- irc_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- java_role(sysadm_r, sysadm_t)
++ kerberos_exec_kadmind(sysadm_t)
+ ')
+
+ optional_policy(`
+@@ -228,10 +183,6 @@
+ ')
+
+ optional_policy(`
+- lockdev_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ logrotate_run(sysadm_t, sysadm_r)
+ ')
+
+@@ -255,14 +206,6 @@
+ ')
+
+ optional_policy(`
+- mozilla_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- mplayer_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ mta_role(sysadm_r, sysadm_t)
+ ')
+
+@@ -290,11 +233,6 @@
+ ')
+
+ optional_policy(`
+- oident_manage_user_content(sysadm_t)
+- oident_relabel_user_content(sysadm_t)
+-')
+-
+-optional_policy(`
+ pcmcia_run_cardctl(sysadm_t, sysadm_r)
+ ')
+
+@@ -308,10 +246,6 @@
+ ')
+
+ optional_policy(`
+- pyzor_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ quota_run(sysadm_t, sysadm_r)
+ ')
+
+@@ -320,10 +254,6 @@
+ ')
+
+ optional_policy(`
+- razor_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ rpc_domtrans_nfsd(sysadm_t)
+ ')
+
+@@ -332,10 +262,6 @@
+ ')
+
+ optional_policy(`
+- rssh_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ rsync_exec(sysadm_t)
+ ')
+
+@@ -345,10 +271,6 @@
+ ')
+
+ optional_policy(`
+- screen_role_template(sysadm, sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ secadm_role_change(sysadm_r)
+ ')
+
+@@ -358,35 +280,15 @@
+ ')
+
+ optional_policy(`
+- spamassassin_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- ssh_role_template(sysadm, sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ staff_role_change(sysadm_r)
+ ')
+
+ optional_policy(`
+- su_role_template(sysadm, sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- sudo_role_template(sysadm, sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ sysnet_run_ifconfig(sysadm_t, sysadm_r)
+ sysnet_run_dhcpc(sysadm_t, sysadm_r)
+ ')
+
+ optional_policy(`
+- thunderbird_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ tripwire_run_siggen(sysadm_t, sysadm_r)
+ tripwire_run_tripwire(sysadm_t, sysadm_r)
+ tripwire_run_twadmin(sysadm_t, sysadm_r)
+@@ -394,18 +296,10 @@
+ ')
+
+ optional_policy(`
+- tvtime_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ tzdata_domtrans(sysadm_t)
+ ')
+
+ optional_policy(`
+- uml_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ unconfined_domtrans(sysadm_t)
+ ')
+
+@@ -418,20 +312,12 @@
+ ')
+
+ optional_policy(`
+- userhelper_role_template(sysadm, sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ usermanage_run_admin_passwd(sysadm_t, sysadm_r)
+ usermanage_run_groupadd(sysadm_t, sysadm_r)
+ usermanage_run_useradd(sysadm_t, sysadm_r)
+ ')
+
+ optional_policy(`
+- vmware_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ vpn_run(sysadm_t, sysadm_r)
+ ')
+
+@@ -440,13 +326,5 @@
+ ')
+
+ optional_policy(`
+- wireshark_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+- xserver_role(sysadm_r, sysadm_t)
+-')
+-
+-optional_policy(`
+ yam_run(sysadm_t, sysadm_r)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.1/policy/modules/roles/unprivuser.te
+--- nsaserefpolicy/policy/modules/roles/unprivuser.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/unprivuser.te 2008-11-25 09:45:43.000000000 -0500
+@@ -14,142 +14,13 @@
+ userdom_unpriv_user_template(user)
+
+ optional_policy(`
+- apache_role(user_r, user_t)
++ kerneloops_dontaudit_dbus_chat(user_t)
+ ')
+
+ optional_policy(`
+- auth_role(user_r, user_t)
++ rpm_dontaudit_dbus_chat(user_t)
+ ')
+
+ optional_policy(`
+- bluetooth_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- cdrecord_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- cron_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- dbus_role_template(user, user_r, user_t)
+-')
+-
+-optional_policy(`
+- ethereal_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- evolution_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- games_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- gift_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- gnome_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- gpg_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- irc_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- java_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- lockdev_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- lpd_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- mozilla_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- mplayer_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- mta_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- oident_manage_user_content(user_t)
+- oident_relabel_user_content(user_t)
+-')
+-
+-optional_policy(`
+- pyzor_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- razor_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- rssh_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- screen_role_template(user, user_r, user_t)
+-')
+-
+-optional_policy(`
+- spamassassin_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- ssh_role_template(user, user_r, user_t)
+-')
+-
+-optional_policy(`
+- su_role_template(user, user_r, user_t)
+-')
+-
+-optional_policy(`
+- sudo_role_template(user, user_r, user_t)
+-')
+-
+-optional_policy(`
+- thunderbird_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- tvtime_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- uml_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- userhelper_role_template(user, user_r, user_t)
+-')
+-
+-optional_policy(`
+- vmware_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- wireshark_role(user_r, user_t)
+-')
+-
+-optional_policy(`
+- xserver_role(user_r, user_t)
++ setroubleshoot_dontaudit_stream_connect(user_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.fc serefpolicy-3.6.1/policy/modules/roles/webadm.fc
+--- nsaserefpolicy/policy/modules/roles/webadm.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/webadm.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1 @@
++# No webadm file contexts.
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.if serefpolicy-3.6.1/policy/modules/roles/webadm.if
+--- nsaserefpolicy/policy/modules/roles/webadm.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/webadm.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,50 @@
++## <summary>Web administrator role</summary>
++
++########################################
++## <summary>
++## Change to the web administrator role.
++## </summary>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`webadm_role_change',`
++ gen_require(`
++ role webadm_r;
++ ')
++
++ allow $1 webadm_r;
++')
++
++########################################
++## <summary>
++## Change from the web administrator role.
++## </summary>
++## <desc>
++## <p>
++## Change from the web administrator role to
++## the specified role.
++## </p>
++## <p>
++## This is an interface to support third party modules
++## and its use is not allowed in upstream reference
++## policy.
++## </p>
++## </desc>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`webadm_role_change_to',`
++ gen_require(`
++ role webadm_r;
++ ')
++
++ allow webadm_r $1;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.te serefpolicy-3.6.1/policy/modules/roles/webadm.te
+--- nsaserefpolicy/policy/modules/roles/webadm.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/webadm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,64 @@
++
++policy_module(webadm, 1.0.0)
++
++## <desc>
++## <p>
++## Allow webadm to read files in users home directories
++## </p>
++## </desc>
++gen_tunable(webadm_read_user_files, false)
++
++## <desc>
++## <p>
++## Allow webadm to manage files in users home directories
++## </p>
++## </desc>
++gen_tunable(webadm_manage_user_files, false)
++
++########################################
++#
++# Declarations
++#
++
++role webadm_r;
++
++userdom_base_user_template(webadm)
++
++########################################
++#
++# webadmin local policy
++#
++
++allow webadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
++
++files_dontaudit_search_all_dirs(webadm_t)
++files_manage_generic_locks(webadm_t)
++files_list_var(webadm_t)
++
++selinux_get_enforce_mode(webadm_t)
++seutil_domtrans_setfiles(webadm_t)
++
++logging_send_syslog_msg(webadm_t)
++
++userdom_dontaudit_search_user_home_dirs(webadm_t)
++
++optional_policy(`
++ sysadm_role_change(webadm_r)
++')
++
++apache_admin(webadm_t, webadm_r)
++
++optional_policy(`
++tunable_policy(`webadm_read_user_files',`
++ userdom_read_user_home_content_files(webadm_t)
++ userdom_read_user_tmp_files(webadm_t)
++')
++')
++
++optional_policy(`
++tunable_policy(`webadm_manage_user_files',`
++ userdom_manage_user_home_content_files(webadm_t)
++ userdom_read_user_tmp_files(webadm_t)
++ userdom_write_user_tmp_files(webadm_t)
++')
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.fc serefpolicy-3.6.1/policy/modules/roles/xguest.fc
+--- nsaserefpolicy/policy/modules/roles/xguest.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/xguest.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1 @@
++# file contexts handled by userdomain and genhomedircon
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.if serefpolicy-3.6.1/policy/modules/roles/xguest.if
+--- nsaserefpolicy/policy/modules/roles/xguest.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/xguest.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,50 @@
++## <summary>Least privledge xwindows user role</summary>
++
++########################################
++## <summary>
++## Change to the xguest role.
++## </summary>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`xguest_role_change',`
++ gen_require(`
++ role xguest_r;
++ ')
++
++ allow $1 xguest_r;
++')
++
++########################################
++## <summary>
++## Change from the xguest role.
++## </summary>
++## <desc>
++## <p>
++## Change from the xguest role to
++## the specified role.
++## </p>
++## <p>
++## This is an interface to support third party modules
++## and its use is not allowed in upstream reference
++## policy.
++## </p>
++## </desc>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`xguest_role_change_to',`
++ gen_require(`
++ role xguest_r;
++ ')
++
++ allow xguest_r $1;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.6.1/policy/modules/roles/xguest.te
+--- nsaserefpolicy/policy/modules/roles/xguest.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/roles/xguest.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,87 @@
++
++policy_module(xguest, 1.0.0)
++
++## <desc>
++## <p>
++## Allow xguest users to mount removable media
++## </p>
++## </desc>
++gen_tunable(xguest_mount_media, true)
++
++## <desc>
++## <p>
++## Allow xguest to configure Network Manager
++## </p>
++## </desc>
++gen_tunable(xguest_connect_network, true)
++
++## <desc>
++## <p>
++## Allow xguest to use blue tooth devices
++## </p>
++## </desc>
++gen_tunable(xguest_use_bluetooth, true)
++
++########################################
++#
++# Declarations
++#
++
++role xguest_r;
++
++userdom_restricted_xwindows_user_template(xguest)
++
++########################################
++#
++# Local policy
++#
++
++#optional_policy(`
++# mozilla_role(xguest_r, xguest_t)
++#')
++
++optional_policy(`
++ java_role_template(xguest, xguest_r, xguest_t)
++')
++
++optional_policy(`
++ mono_role_template(xguest, xguest_r, xguest_t)
++')
++
++optional_policy(`
++ nsplugin_role(xguest_r, xguest_t)
++')
++
++# Allow mounting of file systems
++optional_policy(`
++ tunable_policy(`xguest_mount_media',`
++ hal_dbus_chat(xguest_t)
++ init_read_utmp(xguest_t)
++ auth_list_pam_console_data(xguest_t)
++ kernel_read_fs_sysctls(xguest_t)
++ files_dontaudit_getattr_boot_dirs(xguest_t)
++ files_search_mnt(xguest_t)
++ fs_manage_noxattr_fs_files(xguest_t)
++ fs_manage_noxattr_fs_dirs(xguest_t)
++ fs_manage_noxattr_fs_dirs(xguest_t)
++ fs_getattr_noxattr_fs(xguest_t)
++ fs_read_noxattr_fs_symlinks(xguest_t)
++ ')
++')
++
++optional_policy(`
++ hal_dbus_chat(xguest_t)
++')
++
++optional_policy(`
++ tunable_policy(`xguest_connect_network',`
++ networkmanager_dbus_chat(xguest_t)
++ ')
++')
++
++optional_policy(`
++ tunable_policy(`xguest_use_bluetooth',`
++ bluetooth_dbus_chat(xguest_t)
++ ')
++')
++gen_user(xguest_u, user, xguest_r, s0, s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.1/policy/modules/services/apache.fc
+--- nsaserefpolicy/policy/modules/services/apache.fc 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/apache.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,12 +1,13 @@
+-HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
++HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
+
+ /etc/apache(2)?(/.*)? gen_context(system_u:object_r:httpd_config_t,s0)
+ /etc/apache-ssl(2)?(/.*)? gen_context(system_u:object_r:httpd_config_t,s0)
+ /etc/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+-/etc/httpd -d gen_context(system_u:object_r:httpd_config_t,s0)
+-/etc/httpd/conf.* gen_context(system_u:object_r:httpd_config_t,s0)
++/etc/httpd(/.*)? gen_context(system_u:object_r:httpd_config_t,s0)
++/etc/httpd/conf/keytab -- gen_context(system_u:object_r:httpd_keytab_t,s0)
+ /etc/httpd/logs gen_context(system_u:object_r:httpd_log_t,s0)
+ /etc/httpd/modules gen_context(system_u:object_r:httpd_modules_t,s0)
++/etc/rc\.d/init\.d/httpd -- gen_context(system_u:object_r:httpd_initrc_exec_t,s0)
+ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0)
+
+ /srv/([^/]*/)?www(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+@@ -22,6 +23,7 @@
+ /usr/lib(64)?/cgi-bin/(nph-)?cgiwrap(d)? -- gen_context(system_u:object_r:httpd_suexec_exec_t,s0)
+ /usr/lib(64)?/httpd(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0)
+
++/usr/bin/mongrel_rails -- gen_context(system_u:object_r:httpd_exec_t,s0)
+ /usr/sbin/apache(2)? -- gen_context(system_u:object_r:httpd_exec_t,s0)
+ /usr/sbin/apache-ssl(2)? -- gen_context(system_u:object_r:httpd_exec_t,s0)
+ /usr/sbin/httpd(\.worker)? -- gen_context(system_u:object_r:httpd_exec_t,s0)
+@@ -32,12 +34,14 @@
+ /usr/sbin/httpd2-.* -- gen_context(system_u:object_r:httpd_exec_t,s0)
+ ')
+
++/usr/share/drupal(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /usr/share/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /usr/share/openca/htdocs(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /usr/share/selinux-policy[^/]*/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+
+ /var/cache/httpd(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0)
+ /var/cache/mason(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0)
++/var/cache/mediawiki(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0)
+ /var/cache/mod_proxy(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0)
+ /var/cache/mod_ssl(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0)
+ /var/cache/php-eaccelerator(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0)
+@@ -47,6 +51,7 @@
+
+ /var/lib/cacti/rra(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/lib/dav(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0)
++/var/lib/drupal(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
+ /var/lib/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/lib/httpd(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0)
+ /var/lib/php/session(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0)
+@@ -50,8 +55,10 @@
+ /var/lib/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/lib/httpd(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0)
+ /var/lib/php/session(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0)
++
+ /var/lib/squirrelmail/prefs(/.*)? gen_context(system_u:object_r:httpd_squirrelmail_t,s0)
+
++/var/www(/.*)?/logs(/.*)? gen_context(system_u:object_r:httpd_log_t,s0)
+ /var/log/apache(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0)
+ /var/log/apache-ssl(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0)
+ /var/log/cacti(/.*)? gen_context(system_u:object_r:httpd_log_t,s0)
+@@ -64,11 +71,21 @@
+ /var/run/apache.* gen_context(system_u:object_r:httpd_var_run_t,s0)
+ /var/run/gcache_port -s gen_context(system_u:object_r:httpd_var_run_t,s0)
+ /var/run/httpd.* gen_context(system_u:object_r:httpd_var_run_t,s0)
++/var/run/wsgi.* -s gen_context(system_u:object_r:httpd_var_run_t,s0)
+
+ /var/spool/gosa(/.*)? gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
+ /var/spool/squirrelmail(/.*)? gen_context(system_u:object_r:squirrelmail_spool_t,s0)
+
+ /var/www(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/www/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
++/var/www/[^/]*/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
+ /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
++
++#Bugzilla file context
++/usr/share/bugzilla(/.*)? -d gen_context(system_u:object_r:httpd_bugzilla_content_t,s0)
++/usr/share/bugzilla(/.*)? -- gen_context(system_u:object_r:httpd_bugzilla_script_exec_t,s0)
++/var/lib/bugzilla(/.*)? gen_context(system_u:object_r:httpd_bugzilla_content_rw_t,s0)
++#viewvc file context
++/var/spool/viewvc(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
++/var/www/html/[^/]*/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.1/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/apache.if 2008-11-25 09:45:43.000000000 -0500
+@@ -13,21 +13,16 @@
+ #
+ template(`apache_content_template',`
+ gen_require(`
+- attribute httpdcontent;
+ attribute httpd_exec_scripts;
+ attribute httpd_script_exec_type;
+ type httpd_t, httpd_suexec_t, httpd_log_t;
+ ')
+- # allow write access to public file transfer
+- # services files.
+- gen_tunable(allow_httpd_$1_script_anon_write, false)
+-
+ #This type is for webpages
+- type httpd_$1_content_t, httpdcontent; # customizable
++ type httpd_$1_content_t;
+ files_type(httpd_$1_content_t)
+
+ # This type is used for .htaccess files
+- type httpd_$1_htaccess_t; # customizable;
++ type httpd_$1_htaccess_t;
+ files_type(httpd_$1_htaccess_t)
+
+ # Type that CGI scripts run as
+@@ -42,20 +37,22 @@
+
+ # The following three are the only areas that
+ # scripts can read, read/write, or append to
+- type httpd_$1_script_ro_t, httpdcontent; # customizable
+- files_type(httpd_$1_script_ro_t)
++ typealias httpd_$1_content_t alias httpd_$1_script_ro_t;
+
+- type httpd_$1_script_rw_t, httpdcontent; # customizable
+- files_type(httpd_$1_script_rw_t)
++ type httpd_$1_content_rw_t;
++ files_type(httpd_$1_content_rw_t)
++ typealias httpd_$1_content_rw_t alias httpd_$1_script_rw_t;
+
+- type httpd_$1_script_ra_t, httpdcontent; # customizable
+- files_type(httpd_$1_script_ra_t)
++ type httpd_$1_content_ra_t;
++ files_type(httpd_$1_content_ra_t)
++ typealias httpd_$1_content_ra_t alias httpd_$1_script_ra_t;
+
+- allow httpd_t httpd_$1_htaccess_t:file read_file_perms;
++ read_files_pattern(httpd_t, httpd_$1_content_t, httpd_$1_htaccess_t)
+
+ domtrans_pattern(httpd_suexec_t, httpd_$1_script_exec_t, httpd_$1_script_t)
+
+- allow httpd_suexec_t { httpd_$1_content_t httpd_$1_script_ro_t httpd_$1_script_rw_t httpd_$1_script_exec_t }:dir search_dir_perms;
++ allow httpd_suexec_t { httpd_$1_content_t httpd_$1_content_rw_t httpd_$1_script_exec_t }:dir search_dir_perms;
++ allow httpd_t { httpd_$1_content_t httpd_$1_content_rw_t httpd_$1_script_exec_t }:dir search_dir_perms;
+
+ allow httpd_$1_script_t self:fifo_file rw_file_perms;
+ allow httpd_$1_script_t self:unix_stream_socket connectto;
+@@ -65,29 +62,26 @@
+ dontaudit httpd_$1_script_t httpd_t:unix_stream_socket { read write };
+
+ # Allow the script process to search the cgi directory, and users directory
+- allow httpd_$1_script_t httpd_$1_content_t:dir search_dir_perms;
++ allow httpd_$1_script_t httpd_$1_content_t:dir list_dir_perms;
++ read_files_pattern(httpd_$1_script_t, httpd_$1_content_t, httpd_$1_content_t)
++ read_lnk_files_pattern(httpd_$1_script_t, httpd_$1_content_t, httpd_$1_content_t)
+
+ append_files_pattern(httpd_$1_script_t, httpd_log_t, httpd_log_t)
+ logging_search_logs(httpd_$1_script_t)
+
+ can_exec(httpd_$1_script_t, httpd_$1_script_exec_t)
+- allow httpd_$1_script_t httpd_$1_script_exec_t:dir search_dir_perms;
++ allow httpd_$1_script_t httpd_$1_script_exec_t:dir list_dir_perms;
+
+- allow httpd_$1_script_t httpd_$1_script_ra_t:dir { list_dir_perms add_entry_dir_perms };
+- read_files_pattern(httpd_$1_script_t, httpd_$1_script_ra_t, httpd_$1_script_ra_t)
+- append_files_pattern(httpd_$1_script_t, httpd_$1_script_ra_t, httpd_$1_script_ra_t)
+- read_lnk_files_pattern(httpd_$1_script_t, httpd_$1_script_ra_t, httpd_$1_script_ra_t)
+-
+- allow httpd_$1_script_t httpd_$1_script_ro_t:dir list_dir_perms;
+- read_files_pattern(httpd_$1_script_t,httpd_$1_script_ro_t,httpd_$1_script_ro_t)
+- read_lnk_files_pattern(httpd_$1_script_t,httpd_$1_script_ro_t,httpd_$1_script_ro_t)
+-
+- manage_dirs_pattern(httpd_$1_script_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- manage_files_pattern(httpd_$1_script_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- manage_lnk_files_pattern(httpd_$1_script_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- manage_fifo_files_pattern(httpd_$1_script_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- manage_sock_files_pattern(httpd_$1_script_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- files_tmp_filetrans(httpd_$1_script_t, httpd_$1_script_rw_t, { dir file lnk_file sock_file fifo_file })
++ allow httpd_$1_script_t httpd_$1_content_ra_t:dir { list_dir_perms add_entry_dir_perms };
++ read_files_pattern(httpd_$1_script_t, httpd_$1_content_ra_t, httpd_$1_content_ra_t)
++ append_files_pattern(httpd_$1_script_t, httpd_$1_content_ra_t, httpd_$1_content_ra_t)
++ read_lnk_files_pattern(httpd_$1_script_t, httpd_$1_content_ra_t, httpd_$1_content_ra_t)
++
++ manage_dirs_pattern(httpd_$1_script_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++ manage_files_pattern(httpd_$1_script_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++ manage_lnk_files_pattern(httpd_$1_script_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++ manage_fifo_files_pattern(httpd_$1_script_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++ manage_sock_files_pattern(httpd_$1_script_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
+
+ kernel_dontaudit_search_sysctl(httpd_$1_script_t)
+ kernel_dontaudit_search_kernel_sysctl(httpd_$1_script_t)
+@@ -96,6 +90,7 @@
+ dev_read_urand(httpd_$1_script_t)
+
+ corecmd_exec_all_executables(httpd_$1_script_t)
++ application_exec_all(httpd_$1_script_t)
+
+ files_exec_etc_files(httpd_$1_script_t)
+ files_read_etc_files(httpd_$1_script_t)
+@@ -109,34 +104,21 @@
+
+ seutil_dontaudit_search_config(httpd_$1_script_t)
+
+- tunable_policy(`httpd_enable_cgi && httpd_unified',`
+- allow httpd_$1_script_t httpdcontent:file entrypoint;
+-
+- manage_dirs_pattern(httpd_$1_script_t, httpdcontent, httpdcontent)
+- manage_files_pattern(httpd_$1_script_t, httpdcontent, httpdcontent)
+- manage_lnk_files_pattern(httpd_$1_script_t, httpdcontent, httpdcontent)
+- can_exec(httpd_$1_script_t, httpdcontent)
+- ')
+-
+- tunable_policy(`allow_httpd_$1_script_anon_write',`
+- miscfiles_manage_public_files(httpd_$1_script_t)
+- ')
+-
+ # Allow the web server to run scripts and serve pages
+ tunable_policy(`httpd_builtin_scripting',`
+- manage_dirs_pattern(httpd_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- manage_files_pattern(httpd_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- manage_lnk_files_pattern(httpd_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+- rw_sock_files_pattern(httpd_t, httpd_$1_script_rw_t, httpd_$1_script_rw_t)
+-
+- allow httpd_t httpd_$1_script_ra_t:dir { list_dir_perms add_entry_dir_perms };
+- read_files_pattern(httpd_t, httpd_$1_script_ra_t, httpd_$1_script_ra_t)
+- append_files_pattern(httpd_t, httpd_$1_script_ra_t, httpd_$1_script_ra_t)
+- read_lnk_files_pattern(httpd_t, httpd_$1_script_ra_t, httpd_$1_script_ra_t)
+-
+- allow httpd_t httpd_$1_script_ro_t:dir list_dir_perms;
+- read_files_pattern(httpd_t, httpd_$1_script_ro_t, httpd_$1_script_ro_t)
+- read_lnk_files_pattern(httpd_t, httpd_$1_script_ro_t, httpd_$1_script_ro_t)
++ manage_dirs_pattern(httpd_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++ manage_files_pattern(httpd_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++ manage_lnk_files_pattern(httpd_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++ rw_sock_files_pattern(httpd_t, httpd_$1_content_rw_t, httpd_$1_content_rw_t)
++
++ allow httpd_t httpd_$1_content_ra_t:dir { list_dir_perms add_entry_dir_perms };
++ read_files_pattern(httpd_t, httpd_$1_content_ra_t, httpd_$1_content_ra_t)
++ append_files_pattern(httpd_t, httpd_$1_content_ra_t, httpd_$1_content_ra_t)
++ read_lnk_files_pattern(httpd_t, httpd_$1_content_ra_t, httpd_$1_content_ra_t)
++
++ allow httpd_t httpd_$1_content_t:dir list_dir_perms;
++ read_files_pattern(httpd_t, httpd_$1_content_t, httpd_$1_content_t)
++ read_lnk_files_pattern(httpd_t, httpd_$1_content_t, httpd_$1_content_t)
+
+ allow httpd_t httpd_$1_content_t:dir list_dir_perms;
+ read_files_pattern(httpd_t, httpd_$1_content_t, httpd_$1_content_t)
+@@ -149,9 +131,13 @@
+ # privileged users run the script:
+ domtrans_pattern(httpd_exec_scripts, httpd_$1_script_exec_t, httpd_$1_script_t)
+
++ allow httpd_exec_scripts httpd_$1_script_exec_t:file read_file_perms;
++
+ # apache runs the script:
+ domtrans_pattern(httpd_t, httpd_$1_script_exec_t, httpd_$1_script_t)
+
++ allow httpd_t httpd_$1_script_exec_t:file read_file_perms;
++
+ allow httpd_t httpd_$1_script_t:process { signal sigkill sigstop };
+ allow httpd_t httpd_$1_script_exec_t:dir list_dir_perms;
+
+@@ -175,50 +161,6 @@
+ miscfiles_read_localization(httpd_$1_script_t)
+ ')
+
+- tunable_policy(`httpd_enable_cgi && httpd_can_network_connect_db',`
+- allow httpd_$1_script_t self:tcp_socket create_stream_socket_perms;
+- allow httpd_$1_script_t self:udp_socket create_socket_perms;
+-
+- corenet_all_recvfrom_unlabeled(httpd_$1_script_t)
+- corenet_all_recvfrom_netlabel(httpd_$1_script_t)
+- corenet_tcp_sendrecv_all_if(httpd_$1_script_t)
+- corenet_udp_sendrecv_all_if(httpd_$1_script_t)
+- corenet_tcp_sendrecv_all_nodes(httpd_$1_script_t)
+- corenet_udp_sendrecv_all_nodes(httpd_$1_script_t)
+- corenet_tcp_sendrecv_all_ports(httpd_$1_script_t)
+- corenet_udp_sendrecv_all_ports(httpd_$1_script_t)
+-
+- sysnet_read_config(httpd_$1_script_t)
+- ')
+-
+- tunable_policy(`httpd_enable_cgi && httpd_can_network_connect',`
+- allow httpd_$1_script_t self:tcp_socket create_stream_socket_perms;
+- allow httpd_$1_script_t self:udp_socket create_socket_perms;
+-
+- corenet_all_recvfrom_unlabeled(httpd_$1_script_t)
+- corenet_all_recvfrom_netlabel(httpd_$1_script_t)
+- corenet_tcp_sendrecv_all_if(httpd_$1_script_t)
+- corenet_udp_sendrecv_all_if(httpd_$1_script_t)
+- corenet_tcp_sendrecv_all_nodes(httpd_$1_script_t)
+- corenet_udp_sendrecv_all_nodes(httpd_$1_script_t)
+- corenet_tcp_sendrecv_all_ports(httpd_$1_script_t)
+- corenet_udp_sendrecv_all_ports(httpd_$1_script_t)
+- corenet_tcp_connect_all_ports(httpd_$1_script_t)
+- corenet_sendrecv_all_client_packets(httpd_$1_script_t)
+-
+- sysnet_read_config(httpd_$1_script_t)
+- ')
+-
+- optional_policy(`
+- mta_send_mail(httpd_$1_script_t)
+- ')
+-
+- optional_policy(`
+- tunable_policy(`httpd_enable_cgi && httpd_can_network_connect_db',`
+- mysql_tcp_connect(httpd_$1_script_t)
+- ')
+- ')
+-
+ optional_policy(`
+ tunable_policy(`httpd_enable_cgi && allow_ypbind',`
+ nis_use_ypbind_uncond(httpd_$1_script_t)
+@@ -227,10 +169,6 @@
+
+ optional_policy(`
+ postgresql_unpriv_client(httpd_$1_script_t)
+-
+- tunable_policy(`httpd_enable_cgi && httpd_can_network_connect_db',`
+- postgresql_tcp_connect(httpd_$1_script_t)
+- ')
+ ')
+
+ optional_policy(`
+@@ -579,7 +517,7 @@
+ ## </param>
+ ## <param name="role">
+ ## <summary>
+-## The role to be allowed the dmidecode domain.
++## The role to be allowed the http_helper domain.
+ ## </summary>
+ ## </param>
+ ## <rolecap/>
+@@ -715,6 +653,7 @@
+ ')
+
+ allow $1 httpd_modules_t:dir list_dir_perms;
++ read_lnk_files_pattern($1, httpd_modules_t, httpd_modules_t)
+ ')
+
+ ########################################
+@@ -782,6 +721,32 @@
+
+ ########################################
+ ## <summary>
++## Allow the specified domain to delete
++## apache system content rw files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++# Note that httpd_sys_content_t is found in /var, /etc, /srv and /usr
++interface(`apache_delete_sys_content_rw',`
++ gen_require(`
++ type httpd_sys_content_rw_t;
++ ')
++
++ files_search_tmp($1)
++ delete_dirs_pattern($1, httpd_sys_content_rw_t, httpd_sys_content_rw_t)
++ delete_files_pattern($1, httpd_sys_content_rw_t, httpd_sys_content_rw_t)
++ delete_lnk_files_pattern($1, httpd_sys_content_rw_t, httpd_sys_content_rw_t)
++ delete_fifo_files_pattern($1, httpd_sys_content_rw_t, httpd_sys_content_rw_t)
++ delete_sock_files_pattern($1, httpd_sys_content_rw_t, httpd_sys_content_rw_t)
++')
++
++########################################
++## <summary>
+ ## Execute all web scripts in the system
+ ## script domain.
+ ## </summary>
+@@ -791,16 +756,18 @@
+ ## </summary>
+ ## </param>
+ #
+-# cjp: this interface specifically added to allow
+-# sysadm_t to run scripts
+ interface(`apache_domtrans_sys_script',`
+ gen_require(`
+- attribute httpdcontent;
+ type httpd_sys_script_t;
++ type httpd_sys_content_t;
++ ')
++
++ tunable_policy(`httpd_enable_cgi',`
++ domtrans_pattern($1, httpd_sys_script_exec_t, httpd_sys_script_t)
+ ')
+
+ tunable_policy(`httpd_enable_cgi && httpd_unified',`
+- domtrans_pattern($1, httpdcontent, httpd_sys_script_t)
++ domtrans_pattern($1, httpd_sys_content_t, httpd_sys_script_t)
+ ')
+ ')
+
+@@ -859,6 +826,8 @@
+ ## </summary>
+ ## </param>
+ #
++# cjp: this is missing the terminal since scripts
++# do not output to the terminal
+ interface(`apache_run_all_scripts',`
+ gen_require(`
+ attribute httpd_exec_scripts, httpd_script_domains;
+@@ -884,7 +853,7 @@
+ type httpd_squirrelmail_t;
+ ')
+
+- allow $1 httpd_squirrelmail_t:file read_file_perms;
++ read_files_pattern($1, httpd_squirrelmail_t, httpd_squirrelmail_t)
+ ')
+
+ ########################################
+@@ -1040,3 +1009,160 @@
+
+ allow httpd_t $1:process signal;
+ ')
++
++########################################
++## <summary>
++## Allow the specified domain to search
++## apache bugzilla directories.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`apache_search_bugzilla_dirs',`
++ gen_require(`
++ type httpd_bugzilla_content_t;
++ ')
++
++ allow $1 httpd_bugzilla_content_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++## Do not audit attempts to read and write Apache
++## bugzill script unix domain stream sockets.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`apache_dontaudit_rw_bugzilla_script_stream_sockets',`
++ gen_require(`
++ type httpd_bugzilla_script_t;
++ ')
++
++ dontaudit $1 httpd_bugzilla_script_t:unix_stream_socket { read write };
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate an apache environment
++## </summary>
++## <param name="prefix">
++## <summary>
++## Prefix of the domain. Example, user would be
++## the prefix for the uder_t domain.
++## </summary>
++## </param>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the apache domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`apache_admin',`
++
++ gen_require(`
++ type httpd_t, httpd_initrc_exec_t, httpd_config_t;
++ type httpd_log_t, httpd_modules_t, httpd_lock_t;
++ type httpd_var_run_t;
++ attribute httpdcontent;
++ attribute httpd_script_exec_type;
++ type httpd_bool_t;
++ type httpd_php_tmp_t;
++ type httpd_suexec_tmp_t;
++ type httpd_tmp_t;
++
++ ')
++
++ allow $1 httpd_t:process { getattr ptrace signal_perms };
++ ps_process_pattern($1, httpd_t)
++
++ init_labeled_script_domtrans($1, httpd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 httpd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ apache_manage_all_content($1)
++ miscfiles_manage_public_files($1)
++
++ files_search_etc($1)
++ admin_pattern($1, httpd_config_t)
++
++ logging_search_logs($1)
++ admin_pattern($1, httpd_log_t)
++
++ admin_pattern($1, httpd_modules_t)
++
++ admin_pattern($1, httpd_lock_t)
++ files_lock_filetrans($1, httpd_lock_t, file)
++
++ admin_pattern($1, httpd_var_run_t)
++ files_pid_filetrans($1, httpd_var_run_t, file)
++
++ kernel_search_proc($1)
++ allow $1 httpd_t:dir list_dir_perms;
++ ps_process_pattern($1, httpd_t)
++ read_lnk_files_pattern($1, httpd_t, httpd_t)
++
++ admin_pattern($1, httpdcontent)
++ admin_pattern($1, httpd_script_exec_type)
++
++ seutil_domtrans_setfiles($1)
++
++ admin_pattern($1, httpd_tmp_t)
++ admin_pattern($1, httpd_php_tmp_t)
++ admin_pattern($1, httpd_suexec_tmp_t)
++ files_tmp_filetrans($1, httpd_tmp_t, { file dir })
++
++ifdef(`TODO',`
++ apache_set_booleans($1, $2, $3, httpd_bool_t )
++ seutil_setsebool_role_template($1, $3, $2)
++ allow httpd_setsebool_t httpd_bool_t:dir list_dir_perms;
++ allow httpd_setsebool_t httpd_bool_t:file rw_file_perms;
++')
++')
++
++########################################
++## <summary>
++## Mark content as being readable by standard apache processes
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++template(`apache_ro_content',`
++ gen_require(`
++ attribute httpd_ro_content;
++ ')
++ typeattribute $1 httpd_ro_content;
++')
++
++########################################
++## <summary>
++## Mark content as being read/write by standard apache processes
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++template(`apache_rw_content',`
++ gen_require(`
++ attribute httpd_rw_content;
++ ')
++ typeattribute $1 httpd_rw_content;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.1/policy/modules/services/apache.te
+--- nsaserefpolicy/policy/modules/services/apache.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/apache.te 2008-11-25 09:45:43.000000000 -0500
+@@ -19,6 +19,8 @@
+ # Declarations
+ #
+
++selinux_genbool(httpd_bool_t)
++
+ ## <desc>
+ ## <p>
+ ## Allow Apache to modify public files
+@@ -30,10 +32,17 @@
+
+ ## <desc>
+ ## <p>
+-## Allow Apache to use mod_auth_pam
++## Allow httpd scripts and modules execmem/execstack
+ ## </p>
+ ## </desc>
+-gen_tunable(allow_httpd_mod_auth_pam, false)
++gen_tunable(httpd_execmem, false)
++
++## <desc>
++## <p>
++## Allow Apache to communicate with avahi service via dbus
++## </p>
++## </desc>
++gen_tunable(httpd_dbus_avahi, false)
+
+ ## <desc>
+ ## <p>
+@@ -44,6 +53,13 @@
+
+ ## <desc>
+ ## <p>
++## Allow http daemon to send mail
++## </p>
++## </desc>
++gen_tunable(httpd_can_sendmail, false)
++
++## <desc>
++## <p>
+ ## Allow HTTPD scripts and modules to connect to the network using TCP.
+ ## </p>
+ ## </desc>
+@@ -108,6 +124,29 @@
+ ## </desc>
+ gen_tunable(httpd_unified, false)
+
++## <desc>
++## <p>
++## Allow httpd to access nfs file systems
++## </p>
++## </desc>
++gen_tunable(httpd_use_nfs, false)
++
++## <desc>
++## <p>
++## Allow httpd to access cifs file systems
++## </p>
++## </desc>
++gen_tunable(httpd_use_cifs, false)
++
++## <desc>
++## <p>
++## Allow apache scripts to write to public content. Directories/Files must be labeled public_content_rw_t.
++## </p>
++## </desc>
++gen_tunable(allow_httpd_sys_script_anon_write, false)
++
++attribute httpd_ro_content;
++attribute httpd_rw_content;
+ attribute httpdcontent;
+ attribute httpd_user_content_type;
+
+@@ -140,6 +179,9 @@
+ domain_entry_file(httpd_helper_t, httpd_helper_exec_t)
+ role system_r types httpd_helper_t;
+
++type httpd_initrc_exec_t;
++init_script_file(httpd_initrc_exec_t)
++
+ type httpd_lock_t;
+ files_lock_file(httpd_lock_t)
+
+@@ -180,6 +222,10 @@
+ # setup the system domain for system CGI scripts
+ apache_content_template(sys)
+
++typeattribute httpd_sys_content_t httpdcontent, httpd_ro_content; # customizable
++typeattribute httpd_sys_content_rw_t httpdcontent, httpd_rw_content; # customizable
++typeattribute httpd_sys_content_ra_t httpdcontent; # customizable
++
+ type httpd_tmp_t;
+ files_tmp_file(httpd_tmp_t)
+
+@@ -196,6 +242,7 @@
+ userdom_user_home_content(httpd_user_script_rw_t)
+ typeattribute httpd_user_script_t httpd_script_domains;
+ typealias httpd_user_content_t alias { httpd_staff_content_t httpd_sysadm_content_t };
++typealias httpd_user_content_t alias httpd_unconfined_content_t;
+ typealias httpd_user_content_t alias { httpd_auditadm_content_t httpd_secadm_content_t };
+ typealias httpd_user_htaccess_t alias { httpd_staff_htaccess_t httpd_sysadm_htaccess_t };
+ typealias httpd_user_htaccess_t alias { httpd_auditadm_htaccess_t httpd_secadm_htaccess_t };
+@@ -230,7 +277,7 @@
+ # Apache server local policy
+ #
+
+-allow httpd_t self:capability { chown dac_override kill setgid setuid sys_tty_config };
++allow httpd_t self:capability { chown dac_override kill setgid setuid sys_nice sys_tty_config };
+ dontaudit httpd_t self:capability { net_admin sys_tty_config };
+ allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow httpd_t self:fd use;
+@@ -272,6 +319,7 @@
+ allow httpd_t httpd_modules_t:dir list_dir_perms;
+ mmap_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
+ read_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
++read_lnk_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
+
+ apache_domtrans_rotatelogs(httpd_t)
+ # Apache-httpd needs to be able to send signals to the log rotate procs.
+@@ -283,9 +331,9 @@
+
+ allow httpd_t httpd_suexec_exec_t:file read_file_perms;
+
+-allow httpd_t httpd_sys_content_t:dir list_dir_perms;
+-read_files_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_t)
+-read_lnk_files_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_t)
++allow httpd_t httpd_ro_content:dir list_dir_perms;
++read_files_pattern(httpd_t, httpd_ro_content, httpd_ro_content)
++read_lnk_files_pattern(httpd_t, httpd_ro_content, httpd_ro_content)
+
+ manage_dirs_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
+ manage_files_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
+@@ -301,6 +349,7 @@
+ manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
+ files_var_lib_filetrans(httpd_t, httpd_var_lib_t, file)
+
++setattr_dirs_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
+ manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
+ manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
+ files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
+@@ -312,6 +361,7 @@
+ kernel_read_kernel_sysctls(httpd_t)
+ # for modules that want to access /proc/meminfo
+ kernel_read_system_state(httpd_t)
++kernel_search_network_sysctl(httpd_t)
+
+ corenet_all_recvfrom_unlabeled(httpd_t)
+ corenet_all_recvfrom_netlabel(httpd_t)
+@@ -322,6 +372,7 @@
+ corenet_tcp_sendrecv_all_ports(httpd_t)
+ corenet_udp_sendrecv_all_ports(httpd_t)
+ corenet_tcp_bind_all_nodes(httpd_t)
++corenet_udp_bind_all_nodes(httpd_t)
+ corenet_tcp_bind_http_port(httpd_t)
+ corenet_tcp_bind_http_cache_port(httpd_t)
+ corenet_sendrecv_http_server_packets(httpd_t)
+@@ -335,12 +386,11 @@
+
+ fs_getattr_all_fs(httpd_t)
+ fs_search_auto_mountpoints(httpd_t)
++fs_list_inotifyfs(httpd_t)
+
+ auth_use_nsswitch(httpd_t)
+
+-# execute perl
+-corecmd_exec_bin(httpd_t)
+-corecmd_exec_shell(httpd_t)
++application_exec_all(httpd_t)
+
+ domain_use_interactive_fds(httpd_t)
+
+@@ -358,6 +408,10 @@
+ files_read_var_lib_symlinks(httpd_t)
+
+ fs_search_auto_mountpoints(httpd_sys_script_t)
++# php uploads a file to /tmp and then execs programs to acton them
++manage_dirs_pattern(httpd_sys_script_t, httpd_tmp_t, httpd_tmp_t)
++manage_files_pattern(httpd_sys_script_t, httpd_tmp_t, httpd_tmp_t)
++files_tmp_filetrans(httpd_sys_script_t, httpd_sys_content_rw_t, { dir file lnk_file sock_file fifo_file })
+
+ libs_read_lib_files(httpd_t)
+
+@@ -372,18 +426,33 @@
+
+ userdom_use_unpriv_users_fds(httpd_t)
+
+-mta_send_mail(httpd_t)
+-
+ tunable_policy(`allow_httpd_anon_write',`
+ miscfiles_manage_public_files(httpd_t)
+ ')
+
+-ifdef(`TODO', `
+ #
+ # We need optionals to be able to be within booleans to make this work
+ #
++## <desc>
++## <p>
++## Allow Apache to use mod_auth_pam
++## </p>
++## </desc>
++gen_tunable(allow_httpd_mod_auth_pam, false)
++
+ tunable_policy(`allow_httpd_mod_auth_pam',`
+- auth_domtrans_chk_passwd(httpd_t)
++ auth_domtrans_chkpwd(httpd_t)
++')
++
++## <desc>
++## <p>
++## Allow Apache to use mod_auth_pam
++## </p>
++## </desc>
++gen_tunable(allow_httpd_mod_auth_ntlm_winbind, false)
++optional_policy(`
++tunable_policy(`allow_httpd_mod_auth_pam',`
++ samba_domtrans_winbind_helper(httpd_t)
+ ')
+ ')
+
+@@ -391,20 +460,54 @@
+ corenet_tcp_connect_all_ports(httpd_t)
+ ')
+
++tunable_policy(`httpd_can_sendmail',`
++ # allow httpd to connect to mail servers
++ corenet_tcp_connect_smtp_port(httpd_t)
++ corenet_sendrecv_smtp_client_packets(httpd_t)
++ corenet_tcp_connect_pop_port(httpd_t)
++ corenet_sendrecv_pop_client_packets(httpd_t)
++ mta_send_mail(httpd_t)
++ mta_send_mail(httpd_sys_script_t)
++')
++
+ tunable_policy(`httpd_can_network_relay',`
+ # allow httpd to work as a relay
+ corenet_tcp_connect_gopher_port(httpd_t)
+ corenet_tcp_connect_ftp_port(httpd_t)
+ corenet_tcp_connect_http_port(httpd_t)
+ corenet_tcp_connect_http_cache_port(httpd_t)
++ corenet_tcp_connect_memcache_port(httpd_t)
+ corenet_sendrecv_gopher_client_packets(httpd_t)
+ corenet_sendrecv_ftp_client_packets(httpd_t)
+ corenet_sendrecv_http_client_packets(httpd_t)
+ corenet_sendrecv_http_cache_client_packets(httpd_t)
+ ')
+
++tunable_policy(`httpd_enable_cgi && httpd_unified',`
++ allow httpd_sys_script_t httpd_sys_content_t:file entrypoint;
++ filetrans_pattern(httpd_sys_script_t, httpd_sys_content_t, httpd_sys_content_rw_t, { file dir lnk_file })
++ can_exec(httpd_sys_script_t, httpd_sys_content_t)
++')
++
++tunable_policy(`allow_httpd_sys_script_anon_write',`
++ miscfiles_manage_public_files(httpd_sys_script_t)
++')
++
++tunable_policy(`httpd_enable_cgi && httpd_use_nfs',`
++ fs_nfs_domtrans(httpd_t, httpd_sys_script_t)
++')
++
++tunable_policy(`httpd_enable_cgi && httpd_use_cifs',`
++ fs_cifs_domtrans(httpd_t, httpd_sys_script_t)
++')
++
++
+ tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
+- domtrans_pattern(httpd_t, httpdcontent, httpd_sys_script_t)
++ domtrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_script_t)
++ filetrans_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_rw_t, { file dir lnk_file })
++ manage_dirs_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
++ manage_files_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
++ manage_lnk_files_pattern(httpd_t, httpdcontent, httpd_sys_content_rw_t)
+
+ manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
+ manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
+@@ -415,20 +518,28 @@
+ corenet_tcp_bind_ftp_port(httpd_t)
+ ')
+
+-tunable_policy(`httpd_enable_homedirs',`
+- userdom_read_user_home_content_files(httpd_t)
+-')
+-
+ tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
+ fs_read_nfs_files(httpd_t)
+ fs_read_nfs_symlinks(httpd_t)
+ ')
+
++tunable_policy(`httpd_use_nfs',`
++ fs_manage_nfs_dirs(httpd_t)
++ fs_manage_nfs_files(httpd_t)
++ fs_manage_nfs_symlinks(httpd_t)
++')
++
+ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
+ fs_read_cifs_files(httpd_t)
+ fs_read_cifs_symlinks(httpd_t)
+ ')
+
++tunable_policy(`httpd_use_cifs',`
++ fs_manage_cifs_dirs(httpd_t)
++ fs_manage_cifs_files(httpd_t)
++ fs_manage_cifs_symlinks(httpd_t)
++')
++
+ tunable_policy(`httpd_ssi_exec',`
+ corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
+ allow httpd_sys_script_t httpd_t:fd use;
+@@ -459,8 +570,13 @@
+ ')
+
+ optional_policy(`
+- kerberos_use(httpd_t)
+- kerberos_read_kdc_config(httpd_t)
++ dbus_system_bus_client(httpd_t)
++ tunable_policy(`httpd_dbus_avahi',`
++ avahi_dbus_chat(httpd_t)
++ ')
++')
++optional_policy(`
++ kerberos_keytab_template(httpd, httpd_t)
+ ')
+
+ optional_policy(`
+@@ -472,18 +588,13 @@
+ ')
+
+ optional_policy(`
+- # Allow httpd to work with mysql
+ mysql_stream_connect(httpd_t)
+ mysql_rw_db_sockets(httpd_t)
+-
+- tunable_policy(`httpd_can_network_connect_db',`
+- mysql_tcp_connect(httpd_t)
+- ')
++ mysql_read_config(httpd_t)
+ ')
+
+ optional_policy(`
+ nagios_read_config(httpd_t)
+- nagios_domtrans_cgi(httpd_t)
+ ')
+
+ optional_policy(`
+@@ -493,6 +604,12 @@
+ openca_kill(httpd_t)
+ ')
+
++tunable_policy(`httpd_execmem',`
++ allow httpd_t self:process { execmem execstack };
++ allow httpd_sys_script_t self:process { execmem execstack };
++ allow httpd_suexec_t self:process { execmem execstack };
++')
++
+ optional_policy(`
+ # Allow httpd to work with postgresql
+ postgresql_stream_connect(httpd_t)
+@@ -500,6 +617,7 @@
+
+ tunable_policy(`httpd_can_network_connect_db',`
+ postgresql_tcp_connect(httpd_t)
++ postgresql_tcp_connect(httpd_sys_script_t)
+ ')
+ ')
+
+@@ -508,6 +626,7 @@
+ ')
+
+ optional_policy(`
++ files_dontaudit_rw_usr_dirs(httpd_t)
+ snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
+ snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
+ ')
+@@ -535,6 +654,22 @@
+
+ userdom_use_user_terminals(httpd_helper_t)
+
++tunable_policy(`httpd_tty_comm',`
++ userdom_use_user_terminals(httpd_helper_t)
++')
++
++optional_policy(`
++ type httpd_unconfined_script_t;
++ type httpd_unconfined_script_exec_t;
++ domain_type(httpd_unconfined_script_t)
++ domain_entry_file(httpd_unconfined_script_t, httpd_unconfined_script_exec_t)
++ domtrans_pattern(httpd_t, httpd_unconfined_script_exec_t, httpd_unconfined_script_t)
++ unconfined_domain(httpd_unconfined_script_t)
++
++ role system_r types httpd_unconfined_script_t;
++')
++
++
+ ########################################
+ #
+ # Apache PHP script local policy
+@@ -564,20 +699,25 @@
+
+ fs_search_auto_mountpoints(httpd_php_t)
+
++auth_use_nsswitch(httpd_php_t)
++
+ libs_exec_lib_files(httpd_php_t)
+
+ userdom_use_unpriv_users_fds(httpd_php_t)
+
+-optional_policy(`
+- mysql_stream_connect(httpd_php_t)
++tunable_policy(`httpd_can_network_connect_db',`
++ corenet_tcp_connect_mysqld_port(httpd_t)
++ corenet_sendrecv_mysqld_client_packets(httpd_t)
++ corenet_tcp_connect_mysqld_port(httpd_sys_script_t)
++ corenet_sendrecv_mysqld_client_packets(httpd_sys_script_t)
++ corenet_tcp_connect_mysqld_port(httpd_suexec_t)
++ corenet_sendrecv_mysqld_client_packets(httpd_suexec_t)
+ ')
+
+-optional_policy(`
+- nis_use_ypbind(httpd_php_t)
+-')
+
+ optional_policy(`
+- postgresql_stream_connect(httpd_php_t)
++ mysql_stream_connect(httpd_php_t)
++ mysql_read_config(httpd_php_t)
+ ')
+
+ ########################################
+@@ -595,12 +735,14 @@
+ append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
+ read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
+
+-allow httpd_suexec_t httpd_t:fifo_file getattr;
++allow httpd_suexec_t httpd_t:fifo_file read_fifo_file_perms;
+
+ manage_dirs_pattern(httpd_suexec_t, httpd_suexec_tmp_t, httpd_suexec_tmp_t)
+ manage_files_pattern(httpd_suexec_t, httpd_suexec_tmp_t, httpd_suexec_tmp_t)
+ files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
+
++can_exec(httpd_suexec_t, httpd_sys_script_exec_t)
++
+ kernel_read_kernel_sysctls(httpd_suexec_t)
+ kernel_list_proc(httpd_suexec_t)
+ kernel_read_proc_symlinks(httpd_suexec_t)
+@@ -609,9 +751,7 @@
+
+ fs_search_auto_mountpoints(httpd_suexec_t)
+
+-# for shell scripts
+-corecmd_exec_bin(httpd_suexec_t)
+-corecmd_exec_shell(httpd_suexec_t)
++application_exec_all(httpd_suexec_t)
+
+ files_read_etc_files(httpd_suexec_t)
+ files_read_usr_files(httpd_suexec_t)
+@@ -641,12 +781,25 @@
+ corenet_sendrecv_all_client_packets(httpd_suexec_t)
+ ')
+
++read_files_pattern(httpd_suexec_t, httpd_user_content_t, httpd_user_content_t)
++read_files_pattern(httpd_suexec_t, httpd_user_script_rw_t, httpd_user_script_rw_t)
++read_files_pattern(httpd_suexec_t, httpd_user_script_ro_t, httpd_user_script_ro_t)
++read_files_pattern(httpd_suexec_t, httpd_user_script_ra_t, httpd_user_script_ra_t)
++
++domain_entry_file(httpd_sys_script_t, httpd_sys_content_t)
+ tunable_policy(`httpd_enable_cgi && httpd_unified',`
+ domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
++ domtrans_pattern(httpd_suexec_t, httpd_user_content_t, httpd_user_script_t)
++ domtrans_pattern(httpd_suexec_t, httpd_user_script_ro_t, httpd_user_script_t)
++ domtrans_pattern(httpd_suexec_t, httpd_user_script_ra_t, httpd_user_script_t)
++ domtrans_pattern(httpd_suexec_t, httpd_user_script_rw_t, httpd_user_script_t)
++
++ manage_dirs_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
++ manage_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
++ manage_lnk_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
+ ')
+-
+-tunable_policy(`httpd_enable_homedirs',`
+- userdom_read_user_home_content_files(httpd_suexec_t)
++tunable_policy(`httpd_enable_cgi',`
++ domtrans_pattern(httpd_suexec_t, httpd_user_script_t, httpd_user_script_t)
+ ')
+
+ tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
+@@ -655,6 +808,12 @@
+ fs_exec_nfs_files(httpd_suexec_t)
+ ')
+
++tunable_policy(`httpd_use_cifs',`
++ fs_manage_cifs_files(httpd_suexec_t)
++ fs_manage_cifs_symlinks(httpd_suexec_t)
++ fs_exec_cifs_files(httpd_suexec_t)
++')
++
+ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
+ fs_read_cifs_files(httpd_suexec_t)
+ fs_read_cifs_symlinks(httpd_suexec_t)
+@@ -672,15 +831,14 @@
+ dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
+ ')
+
+-optional_policy(`
+- nagios_domtrans_cgi(httpd_suexec_t)
+-')
+-
+ ########################################
+ #
+ # Apache system script local policy
+ #
+
++auth_use_nsswitch(httpd_sys_script_t)
++
++allow httpd_sys_script_t httpd_t:unix_stream_socket rw_stream_socket_perms;
+ allow httpd_sys_script_t httpd_t:tcp_socket { read write };
+
+ dontaudit httpd_sys_script_t httpd_config_t:dir search;
+@@ -699,12 +857,22 @@
+ # Should we add a boolean?
+ apache_domtrans_rotatelogs(httpd_sys_script_t)
+
++sysnet_read_config(httpd_sys_script_t)
++
+ ifdef(`distro_redhat',`
+ allow httpd_sys_script_t httpd_log_t:file append_file_perms;
+ ')
+
+-tunable_policy(`httpd_enable_homedirs',`
+- userdom_read_user_home_content_files(httpd_sys_script_t)
++tunable_policy(`httpd_use_nfs',`
++ fs_manage_nfs_dirs(httpd_sys_script_t)
++ fs_manage_nfs_files(httpd_sys_script_t)
++ fs_manage_nfs_symlinks(httpd_sys_script_t)
++')
++
++tunable_policy(`httpd_use_nfs',`
++ fs_manage_nfs_dirs(httpd_suexec_t)
++ fs_manage_nfs_files(httpd_suexec_t)
++ fs_manage_nfs_symlinks(httpd_suexec_t)
+ ')
+
+ tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
+@@ -712,6 +880,35 @@
+ fs_read_nfs_symlinks(httpd_sys_script_t)
+ ')
+
++tunable_policy(`httpd_enable_cgi && httpd_can_network_connect',`
++ allow httpd_sys_script_t self:tcp_socket create_stream_socket_perms;
++ allow httpd_sys_script_t self:udp_socket create_socket_perms;
++
++ corenet_tcp_bind_all_nodes(httpd_sys_script_t)
++ corenet_udp_bind_all_nodes(httpd_sys_script_t)
++ corenet_all_recvfrom_unlabeled(httpd_sys_script_t)
++ corenet_all_recvfrom_netlabel(httpd_sys_script_t)
++ corenet_tcp_sendrecv_all_if(httpd_sys_script_t)
++ corenet_udp_sendrecv_all_if(httpd_sys_script_t)
++ corenet_tcp_sendrecv_all_nodes(httpd_sys_script_t)
++ corenet_udp_sendrecv_all_nodes(httpd_sys_script_t)
++ corenet_tcp_sendrecv_all_ports(httpd_sys_script_t)
++ corenet_udp_sendrecv_all_ports(httpd_sys_script_t)
++ corenet_tcp_connect_all_ports(httpd_sys_script_t)
++ corenet_sendrecv_all_client_packets(httpd_sys_script_t)
++')
++
++
++tunable_policy(`httpd_use_cifs',`
++ fs_manage_cifs_dirs(httpd_sys_script_t)
++ fs_manage_cifs_files(httpd_sys_script_t)
++ fs_manage_cifs_symlinks(httpd_sys_script_t)
++ fs_manage_cifs_dirs(httpd_suexec_t)
++ fs_manage_cifs_files(httpd_suexec_t)
++ fs_manage_cifs_symlinks(httpd_suexec_t)
++')
++
++
+ tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
+ fs_read_cifs_files(httpd_sys_script_t)
+ fs_read_cifs_symlinks(httpd_sys_script_t)
+@@ -724,10 +921,10 @@
+ optional_policy(`
+ mysql_stream_connect(httpd_sys_script_t)
+ mysql_rw_db_sockets(httpd_sys_script_t)
+-')
+-
+-optional_policy(`
+- postgresql_stream_connect(httpd_sys_script_t)
++ mysql_read_config(httpd_sys_script_t)
++ mysql_stream_connect(httpd_suexec_t)
++ mysql_rw_db_sockets(httpd_suexec_t)
++ mysql_read_config(httpd_suexec_t)
+ ')
+
+ ########################################
+@@ -735,6 +932,8 @@
+ # httpd_rotatelogs local policy
+ #
+
++allow httpd_rotatelogs_t self:capability dac_override;
++
+ manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
+
+ kernel_read_kernel_sysctls(httpd_rotatelogs_t)
+@@ -762,3 +961,66 @@
+ userdom_search_user_home_dirs(httpd_suexec_t)
+ userdom_search_user_home_dirs(httpd_user_script_t)
+ ')
++
++#============= bugzilla policy ==============
++apache_content_template(bugzilla)
++
++type httpd_bugzilla_tmp_t;
++files_tmp_file(httpd_bugzilla_tmp_t)
++
++allow httpd_bugzilla_script_t self:netlink_route_socket r_netlink_socket_perms;
++allow httpd_bugzilla_script_t self:tcp_socket create_stream_socket_perms;
++allow httpd_bugzilla_script_t self:udp_socket create_socket_perms;
++
++corenet_all_recvfrom_unlabeled(httpd_bugzilla_script_t)
++corenet_all_recvfrom_netlabel(httpd_bugzilla_script_t)
++corenet_tcp_sendrecv_all_if(httpd_bugzilla_script_t)
++corenet_udp_sendrecv_all_if(httpd_bugzilla_script_t)
++corenet_tcp_sendrecv_all_nodes(httpd_bugzilla_script_t)
++corenet_udp_sendrecv_all_nodes(httpd_bugzilla_script_t)
++corenet_tcp_sendrecv_all_ports(httpd_bugzilla_script_t)
++corenet_udp_sendrecv_all_ports(httpd_bugzilla_script_t)
++corenet_tcp_connect_postgresql_port(httpd_bugzilla_script_t)
++corenet_tcp_connect_mysqld_port(httpd_bugzilla_script_t)
++corenet_tcp_connect_http_port(httpd_bugzilla_script_t)
++corenet_tcp_connect_smtp_port(httpd_bugzilla_script_t)
++corenet_sendrecv_postgresql_client_packets(httpd_bugzilla_script_t)
++corenet_sendrecv_mysqld_client_packets(httpd_bugzilla_script_t)
++
++manage_dirs_pattern(httpd_bugzilla_script_t, httpd_bugzilla_tmp_t, httpd_bugzilla_tmp_t)
++manage_files_pattern(httpd_bugzilla_script_t, httpd_bugzilla_tmp_t, httpd_bugzilla_tmp_t)
++files_tmp_filetrans(httpd_bugzilla_script_t, httpd_bugzilla_tmp_t, { file dir })
++
++files_search_var_lib(httpd_bugzilla_script_t)
++
++mta_send_mail(httpd_bugzilla_script_t)
++
++sysnet_read_config(httpd_bugzilla_script_t)
++sysnet_use_ldap(httpd_bugzilla_script_t)
++
++optional_policy(`
++ mysql_search_db(httpd_bugzilla_script_t)
++ mysql_stream_connect(httpd_bugzilla_script_t)
++')
++
++optional_policy(`
++ postgresql_stream_connect(httpd_bugzilla_script_t)
++')
++
++manage_dirs_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
++manage_files_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
++manage_lnk_files_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
++
++manage_dirs_pattern(httpd_t,httpdcontent,httpd_rw_content)
++manage_files_pattern(httpd_t,httpdcontent,httpd_rw_content)
++manage_lnk_files_pattern(httpd_t,httpdcontent,httpd_rw_content)
++
++# Removal of fastcgi, will cause problems without the following
++typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t;
++typealias httpd_sys_content_t alias httpd_fastcgi_content_t;
++typealias httpd_sys_content_rw_t alias httpd_fastcgi_content_rw_t;
++typealias httpd_sys_script_ra_t alias httpd_fastcgi_script_ra_t;
++typealias httpd_sys_script_ro_t alias httpd_fastcgi_script_ro_t;
++typealias httpd_sys_script_rw_t alias httpd_fastcgi_script_rw_t;
++typealias httpd_sys_script_t alias httpd_fastcgi_script_t;
++typealias httpd_var_run_t alias httpd_fastcgi_var_run_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.1/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/automount.te 2008-11-25 09:45:43.000000000 -0500
+@@ -71,6 +71,7 @@
+ files_mounton_all_mountpoints(automount_t)
+ files_mount_all_file_type_fs(automount_t)
+ files_unmount_all_file_type_fs(automount_t)
++files_manage_non_security_dirs(automount_t)
+
+ fs_mount_all_fs(automount_t)
+ fs_unmount_all_fs(automount_t)
+@@ -100,6 +101,7 @@
+ corenet_udp_bind_all_rpc_ports(automount_t)
+
+ dev_read_sysfs(automount_t)
++dev_rw_autofs(automount_t)
+ # for SSP
+ dev_read_rand(automount_t)
+ dev_read_urand(automount_t)
+@@ -127,6 +129,7 @@
+ fs_unmount_autofs(automount_t)
+ fs_mount_autofs(automount_t)
+ fs_manage_autofs_symlinks(automount_t)
++fs_read_nfs_files(automount_t)
+
+ storage_rw_fuse(automount_t)
+
+@@ -155,7 +158,7 @@
+ ')
+
+ optional_policy(`
+- kerberos_read_keytab(automount_t)
++ kerberos_keytab_template(automount, automount_t)
+ kerberos_read_config(automount_t)
+ kerberos_dontaudit_write_config(automount_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.6.1/policy/modules/services/avahi.if
+--- nsaserefpolicy/policy/modules/services/avahi.if 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/avahi.if 2008-11-25 09:45:43.000000000 -0500
+@@ -21,6 +21,25 @@
+
+ ########################################
+ ## <summary>
++## Execute avahi server in the avahi domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++#
++interface(`avahi_initrc_domtrans',`
++ gen_require(`
++ type avahi_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, avahi_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## Send avahi a signal
+ ## </summary>
+ ## <param name="domain">
+@@ -57,6 +76,24 @@
+
+ ########################################
+ ## <summary>
++## Send avahi a signull
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`avahi_signull',`
++ gen_require(`
++ type avahi_t;
++ ')
++
++ allow $1 avahi_t:process signull;
++')
++
++########################################
++## <summary>
+ ## Send and receive messages from
+ ## avahi over dbus.
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.6.1/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/avahi.te 2008-11-25 09:45:43.000000000 -0500
+@@ -33,6 +33,7 @@
+ allow avahi_t self:tcp_socket create_stream_socket_perms;
+ allow avahi_t self:udp_socket create_socket_perms;
+
++files_search_var_lib(avahi_t)
+ manage_dirs_pattern(avahi_t, avahi_var_lib_t, avahi_var_lib_t)
+ manage_files_pattern(avahi_t, avahi_var_lib_t, avahi_var_lib_t)
+ files_var_lib_filetrans(avahi_t, avahi_var_lib_t, { dir file })
+@@ -93,6 +94,7 @@
+ dbus_connect_system_bus(avahi_t)
+
+ init_dbus_chat_script(avahi_t)
++ dbus_system_domain(avahi_t, avahi_exec_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.6.1/policy/modules/services/bind.if
+--- nsaserefpolicy/policy/modules/services/bind.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/bind.if 2008-11-25 09:45:43.000000000 -0500
+@@ -38,6 +38,42 @@
+
+ ########################################
+ ## <summary>
++## Send signulls to BIND.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`bind_signull',`
++ gen_require(`
++ type named_t;
++ ')
++
++ allow $1 named_t:process signull;
++')
++
++########################################
++## <summary>
++## Send BIND the kill signal
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`bind_kill',`
++ gen_require(`
++ type named_t;
++ ')
++
++ allow $1 named_t:process sigkill;
++')
++
++########################################
++## <summary>
+ ## Execute ndc in the ndc domain, and
+ ## allow the specified role the ndc domain.
+ ## </summary>
+@@ -251,6 +287,25 @@
+
+ ########################################
+ ## <summary>
++## Execute bind server in the bind domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++#
++interface(`bind_initrc_domtrans',`
++ gen_require(`
++ type bind_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, bind_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## All of the rules required to administrate
+ ## an bind environment
+ ## </summary>
+@@ -269,7 +324,7 @@
+ interface(`bind_admin',`
+ gen_require(`
+ type named_t, named_tmp_t, named_log_t;
+- type named_conf_t, named_var_run_t;
++ type named_conf_t, named_var_lib_t, named_var_run_t;
+ type named_cache_t, named_zone_t;
+ type dnssec_t, ndc_t;
+ type named_initrc_exec_t;
+@@ -283,6 +338,7 @@
+
+ bind_run_ndc($1, $2)
+
++ bind_initrc_domtrans($1)
+ domain_system_change_exemption($1)
+ role_transition $2 named_initrc_exec_t system_r;
+ allow $2 system_r;
+@@ -300,6 +356,9 @@
+ admin_pattern($1, named_zone_t)
+ admin_pattern($1, dnssec_t)
+
++ files_list_var_lib($1)
++ admin_pattern($1, named_var_lib_t)
++
+ files_list_pids($1)
+ admin_pattern($1, named_var_run_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.6.1/policy/modules/services/bind.te
+--- nsaserefpolicy/policy/modules/services/bind.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/bind.te 2008-11-25 09:45:43.000000000 -0500
+@@ -169,7 +169,7 @@
+ ')
+
+ optional_policy(`
+- kerberos_use(named_t)
++ kerberos_keytab_template(named, named_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.6.1/policy/modules/services/bluetooth.fc
+--- nsaserefpolicy/policy/modules/services/bluetooth.fc 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/bluetooth.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -15,6 +15,7 @@
+ /usr/bin/hidd -- gen_context(system_u:object_r:bluetooth_exec_t,s0)
+ /usr/bin/rfcomm -- gen_context(system_u:object_r:bluetooth_exec_t,s0)
+
++/usr/sbin/bluetoothd -- gen_context(system_u:object_r:bluetooth_exec_t,s0)
+ /usr/sbin/hciattach -- gen_context(system_u:object_r:bluetooth_exec_t,s0)
+ /usr/sbin/hcid -- gen_context(system_u:object_r:bluetooth_exec_t,s0)
+ /usr/sbin/hid2hci -- gen_context(system_u:object_r:bluetooth_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.6.1/policy/modules/services/bluetooth.if
+--- nsaserefpolicy/policy/modules/services/bluetooth.if 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/bluetooth.if 2008-11-25 09:45:43.000000000 -0500
+@@ -173,7 +173,7 @@
+ interface(`bluetooth_admin',`
+ gen_require(`
+ type bluetooth_t, bluetooth_tmp_t, bluetooth_lock_t;
+- type bluetooth_var_lib_t, bluetooth_var_run_t;
++ type bluetooth_spool_t, bluetooth_var_lib_t, bluetooth_var_run_t;
+ type bluetooth_conf_t, bluetooth_conf_rw_t;
+ type bluetooth_initrc_exec_t;
+ ')
+@@ -196,6 +196,9 @@
+ admin_pattern($1, bluetooth_conf_t)
+ admin_pattern($1, bluetooth_conf_rw_t)
+
++ files_list_spool($1)
++ admin_pattern($1, bluetooth_spool_t)
++
+ files_list_var_lib($1)
+ admin_pattern($1, bluetooth_var_lib_t)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.1/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/bluetooth.te 2008-11-25 09:45:43.000000000 -0500
+@@ -147,10 +147,10 @@
+ optional_policy(`
+ cups_dbus_chat(bluetooth_t)
+ ')
+-')
+
+ optional_policy(`
+- nis_use_ypbind(bluetooth_t)
++ hal_dbus_chat(bluetooth_t)
++ ')
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.fc serefpolicy-3.6.1/policy/modules/services/certmaster.fc
+--- nsaserefpolicy/policy/modules/services/certmaster.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/certmaster.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,9 @@
++
++/etc/rc\.d/init\.d/certmaster -- gen_context(system_u:object_r:certmaster_initrc_exec_t,s0)
++/usr/bin/certmaster -- gen_context(system_u:object_r:certmaster_exec_t,s0)
++
++/etc/certmaster(/.*)? gen_context(system_u:object_r:certmaster_etc_rw_t,s0)
++
++/var/run/certmaster.* gen_context(system_u:object_r:certmaster_var_run_t,s0)
++
++/var/log/certmaster(/.*)? gen_context(system_u:object_r:certmaster_var_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.if serefpolicy-3.6.1/policy/modules/services/certmaster.if
+--- nsaserefpolicy/policy/modules/services/certmaster.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/certmaster.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,123 @@
++## <summary>policy for certmaster</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run certmaster.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`certmaster_domtrans',`
++ gen_require(`
++ type certmaster_t, certmaster_exec_t;
++ ')
++
++ domtrans_pattern($1,certmaster_exec_t,certmaster_t)
++')
++
++#######################################
++## <summary>
++## read certmaster logs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`certmaster_read_log',`
++ gen_require(`
++ type certmaster_var_log_t;
++ ')
++
++ read_files_pattern($1, certmaster_var_log_t, certmaster_var_log_t)
++')
++
++#######################################
++## <summary>
++## Append to certmaster logs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`certmaster_append_log',`
++ gen_require(`
++ type certmaster_var_log_t;
++ ')
++
++ append_files_pattern($1, certmaster_var_log_t, certmaster_var_log_t)
++')
++
++#######################################
++## <summary>
++## Create, read, write, and delete
++## certmaster logs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`certmaster_manage_log',`
++ gen_require(`
++ type certmaster_var_log_t;
++ ')
++
++ manage_files_pattern($1, certmaster_var_log_t, certmaster_var_log_t)
++ manage_lnk_files_pattern($1, certmaster_var_log_t, certmaster_var_log_t)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an snort environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`certmaster_admin',`
++ gen_require(`
++ type certmaster_t, certmaster_var_run_t, certmaster_var_lib_t;
++ type certmaster_etc_rw_t, certmaster_var_log_t;
++ type certmaster_initrc_exec_t;
++ ')
++
++ allow $1 certmaster_t:process { ptrace signal_perms };
++ ps_process_pattern($1, certmaster_t)
++
++ init_labeled_script_domtrans($1, certmaster_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 certmaster_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_etc($1)
++ miscfiles_manage_cert_dirs($1)
++ miscfiles_manage_cert_files($1)
++
++ admin_pattern($1, certmaster_etc_rw_t)
++
++ files_list_pids($1)
++ admin_pattern($1, certmaster_var_run_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, certmaster_var_log_t)
++
++ files_list_var_lib($1)
++ admin_pattern($1, certmaster_var_lib_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.te serefpolicy-3.6.1/policy/modules/services/certmaster.te
+--- nsaserefpolicy/policy/modules/services/certmaster.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/certmaster.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,79 @@
++policy_module(certmaster,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++# type and domain for certmaster
++type certmaster_t;
++type certmaster_exec_t;
++init_daemon_domain(certmaster_t, certmaster_exec_t)
++
++type certmaster_initrc_exec_t;
++init_script_file(certmaster_initrc_exec_t)
++
++# var/lib files
++type certmaster_var_lib_t;
++files_type(certmaster_var_lib_t)
++
++# config files
++type certmaster_etc_rw_t;
++files_config_file(certmaster_etc_rw_t)
++
++# log files
++type certmaster_var_log_t;
++logging_log_file(certmaster_var_log_t)
++
++# pid files
++type certmaster_var_run_t;
++files_pid_file(certmaster_var_run_t)
++
++###########################################
++#
++# certmaster local policy
++#
++
++allow certmaster_t self:capability sys_tty_config;
++allow certmaster_t self:tcp_socket create_stream_socket_perms;
++
++# config files
++list_dirs_pattern(certmaster_t,certmaster_etc_rw_t,certmaster_etc_rw_t)
++manage_files_pattern(certmaster_t, certmaster_etc_rw_t, certmaster_etc_rw_t)
++
++# var/lib files for certmaster
++manage_files_pattern(certmaster_t,certmaster_var_lib_t,certmaster_var_lib_t)
++manage_dirs_pattern(certmaster_t,certmaster_var_lib_t,certmaster_var_lib_t)
++files_var_lib_filetrans(certmaster_t,certmaster_var_lib_t, { file dir })
++
++# log files
++manage_files_pattern(certmaster_t, certmaster_var_log_t, certmaster_var_log_t)
++logging_log_filetrans(certmaster_t,certmaster_var_log_t, file )
++
++# pid file
++manage_files_pattern(certmaster_t, certmaster_var_run_t,certmaster_var_run_t)
++manage_sock_files_pattern(certmaster_t, certmaster_var_run_t,certmaster_var_run_t)
++files_pid_filetrans(certmaster_t,certmaster_var_run_t, { file sock_file })
++
++corecmd_search_bin(certmaster_t)
++corecmd_getattr_bin_files(certmaster_t)
++
++# network
++corenet_tcp_bind_inaddr_any_node(certmaster_t)
++corenet_tcp_bind_certmaster_port(certmaster_t)
++
++files_search_etc(certmaster_t)
++files_list_var(certmaster_t)
++files_search_var_lib(certmaster_t)
++
++# read meminfo
++kernel_read_system_state(certmaster_t)
++
++auth_use_nsswitch(certmaster_t)
++
++miscfiles_read_localization(certmaster_t)
++
++miscfiles_manage_cert_dirs(certmaster_t)
++miscfiles_manage_cert_files(certmaster_t)
++
++permissive certmaster_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.6.1/policy/modules/services/clamav.fc
+--- nsaserefpolicy/policy/modules/services/clamav.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/clamav.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,20 +1,22 @@
+ /etc/clamav(/.*)? gen_context(system_u:object_r:clamd_etc_t,s0)
++/etc/rc\.d/init\.d/clamd-wrapper -- gen_context(system_u:object_r:clamd_initrc_exec_t,s0)
+
+ /usr/bin/clamscan -- gen_context(system_u:object_r:clamscan_exec_t,s0)
+ /usr/bin/clamdscan -- gen_context(system_u:object_r:clamscan_exec_t,s0)
+ /usr/bin/freshclam -- gen_context(system_u:object_r:freshclam_exec_t,s0)
+
+ /usr/sbin/clamd -- gen_context(system_u:object_r:clamd_exec_t,s0)
++/usr/sbin/clamav-milter -- gen_context(system_u:object_r:clamd_exec_t,s0)
+
+ /var/run/amavis(d)?/clamd\.pid -- gen_context(system_u:object_r:clamd_var_run_t,s0)
+-/var/run/clamav(/.*)? gen_context(system_u:object_r:clamd_var_run_t,s0)
+-/var/run/clamd\..* gen_context(system_u:object_r:clamd_var_run_t,s0)
+-/var/run/clamav\..* gen_context(system_u:object_r:clamd_var_run_t,s0)
++/var/run/clamav.* gen_context(system_u:object_r:clamd_var_run_t,s0)
++/var/run/clamd.* gen_context(system_u:object_r:clamd_var_run_t,s0)
+
+ /var/lib/clamav(/.*)? gen_context(system_u:object_r:clamd_var_lib_t,s0)
++/var/clamav(/.*)? gen_context(system_u:object_r:clamd_var_lib_t,s0)
+
+-/var/log/clamav -d gen_context(system_u:object_r:clamd_var_log_t,s0)
+-/var/log/clamav/clamav.* -- gen_context(system_u:object_r:clamd_var_log_t,s0)
++/var/log/clamav.* gen_context(system_u:object_r:clamd_var_log_t,s0)
+ /var/log/clamav/freshclam.* -- gen_context(system_u:object_r:freshclam_var_log_t,s0)
++/var/log/clamd.* gen_context(system_u:object_r:clamd_var_log_t,s0)
+
+ /var/spool/amavisd/clamd\.sock -s gen_context(system_u:object_r:clamd_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-3.6.1/policy/modules/services/clamav.if
+--- nsaserefpolicy/policy/modules/services/clamav.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/clamav.if 2008-11-25 09:45:43.000000000 -0500
+@@ -38,6 +38,27 @@
+
+ ########################################
+ ## <summary>
++## Allow the specified domain to append
++## to clamav log files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`clamav_append_log',`
++ gen_require(`
++ type clamav_log_t;
++ ')
++
++ logging_search_logs($1)
++ allow $1 clamav_log_t:dir list_dir_perms;
++ append_files_pattern($1, clamav_log_t, clamav_log_t)
++')
++
++########################################
++## <summary>
+ ## Read clamav configuration files.
+ ## </summary>
+ ## <param name="domain">
+@@ -91,3 +112,87 @@
+
+ domtrans_pattern($1, clamscan_exec_t, clamscan_t)
+ ')
++
++########################################
++## <summary>
++## Execute clamscan without a transition.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`clamav_exec_clamscan',`
++ gen_require(`
++ type clamscan_exec_t;
++ ')
++
++ can_exec($1, clamscan_exec_t)
++
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an clamav environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the clamav domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`clamav_admin',`
++ gen_require(`
++ type clamd_t, clamd_etc_t, clamd_tmp_t;
++ type clamd_var_log_t, clamd_var_lib_t;
++ type clamd_var_run_t;
++
++ type clamscan_t, clamscan_tmp_t;
++
++ type freshclam_t, freshclam_var_log_t;
++
++ type clamd_initrc_exec_t;
++ ')
++
++ allow $1 clamd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, clamd_t)
++
++ allow $1 clamscan_t:process { ptrace signal_perms };
++ ps_process_pattern($1, clamscan_t)
++
++ allow $1 freshclam_t:process { ptrace signal_perms };
++ ps_process_pattern($1, freshclam_t)
++
++ init_labeled_script_domtrans($1, clamd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 clamd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, clamd_tmp_t)
++
++ files_list_etc($1)
++ admin_pattern($1, clamd_etc_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, clamd_var_log_t)
++
++ files_list_var_lib($1)
++ admin_pattern($1, clamd_var_lib_t)
++
++ files_list_pids($1)
++ admin_pattern($1, clamd_var_run_t)
++
++ admin_pattern($1, clamscan_tmp_t)
++
++ admin_pattern($1, freshclam_var_log_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.6.1/policy/modules/services/clamav.te
+--- nsaserefpolicy/policy/modules/services/clamav.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/clamav.te 2008-11-25 09:45:43.000000000 -0500
+@@ -13,7 +13,10 @@
+
+ # configuration files
+ type clamd_etc_t;
+-files_type(clamd_etc_t)
++files_config_file(clamd_etc_t)
++
++type clamd_initrc_exec_t;
++init_script_file(clamd_initrc_exec_t)
+
+ # tmp files
+ type clamd_tmp_t;
+@@ -87,6 +90,9 @@
+ kernel_dontaudit_list_proc(clamd_t)
+ kernel_read_sysctl(clamd_t)
+ kernel_read_kernel_sysctls(clamd_t)
++kernel_read_system_state(clamd_t)
++
++corecmd_exec_shell(clamd_t)
+
+ corenet_all_recvfrom_unlabeled(clamd_t)
+ corenet_all_recvfrom_netlabel(clamd_t)
+@@ -97,6 +103,8 @@
+ corenet_tcp_bind_all_nodes(clamd_t)
+ corenet_tcp_bind_clamd_port(clamd_t)
+ corenet_sendrecv_clamd_server_packets(clamd_t)
++corenet_tcp_bind_generic_port(clamd_t)
++corenet_tcp_connect_generic_port(clamd_t)
+
+ dev_read_rand(clamd_t)
+ dev_read_urand(clamd_t)
+@@ -117,6 +125,9 @@
+ cron_use_system_job_fds(clamd_t)
+ cron_rw_pipes(clamd_t)
+
++mta_read_config(clamd_t)
++mta_send_mail(clamd_t)
++
+ optional_policy(`
+ amavis_read_lib_files(clamd_t)
+ amavis_read_spool_files(clamd_t)
+@@ -124,6 +135,10 @@
+ amavis_create_pid_files(clamd_t)
+ ')
+
++optional_policy(`
++ exim_read_spool_files(clamd_t)
++')
++
+ ########################################
+ #
+ # Freshclam local policy
+@@ -191,7 +206,7 @@
+ allow clamscan_t self:fifo_file rw_file_perms;
+ allow clamscan_t self:unix_stream_socket create_stream_socket_perms;
+ allow clamscan_t self:unix_dgram_socket create_socket_perms;
+-allow clamscan_t self:tcp_socket { listen accept };
++allow clamscan_t self:tcp_socket create_stream_socket_perms;
+
+ # configuration files
+ allow clamscan_t clamd_etc_t:dir list_dir_perms;
+@@ -207,6 +222,14 @@
+ manage_files_pattern(clamscan_t, clamd_var_lib_t, clamd_var_lib_t)
+ allow clamscan_t clamd_var_lib_t:dir list_dir_perms;
+
++corenet_all_recvfrom_unlabeled(clamscan_t)
++corenet_all_recvfrom_netlabel(clamscan_t)
++corenet_tcp_sendrecv_all_if(clamscan_t)
++corenet_tcp_sendrecv_all_nodes(clamscan_t)
++corenet_tcp_sendrecv_all_ports(clamscan_t)
++corenet_tcp_sendrecv_clamd_port(clamscan_t)
++corenet_tcp_connect_clamd_port(clamscan_t)
++
+ kernel_read_kernel_sysctls(clamscan_t)
+
+ files_read_etc_files(clamscan_t)
+@@ -221,6 +244,12 @@
+
+ clamav_stream_connect(clamscan_t)
+
++mta_send_mail(clamscan_t)
++
+ optional_policy(`
+ apache_read_sys_content(clamscan_t)
+ ')
++
++optional_policy(`
++ mailscanner_manage_spool(clamscan_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.6.1/policy/modules/services/consolekit.fc
+--- nsaserefpolicy/policy/modules/services/consolekit.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/consolekit.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,3 +1,6 @@
+ /usr/sbin/console-kit-daemon -- gen_context(system_u:object_r:consolekit_exec_t,s0)
+
+ /var/run/consolekit\.pid -- gen_context(system_u:object_r:consolekit_var_run_t,s0)
++/var/run/ConsoleKit(/.*)? -- gen_context(system_u:object_r:consolekit_var_run_t,s0)
++
++/var/log/ConsoleKit(/.*)? gen_context(system_u:object_r:consolekit_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.6.1/policy/modules/services/consolekit.if
+--- nsaserefpolicy/policy/modules/services/consolekit.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/consolekit.if 2008-11-25 09:45:43.000000000 -0500
+@@ -38,3 +38,24 @@
+ allow $1 consolekit_t:dbus send_msg;
+ allow consolekit_t $1:dbus send_msg;
+ ')
++
++########################################
++## <summary>
++## Read consolekit log files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`consolekit_read_log',`
++ gen_require(`
++ type consolekit_log_t;
++ ')
++
++ files_search_pids($1)
++ read_files_pattern($1, consolekit_log_t, consolekit_log_t)
++')
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.1/policy/modules/services/consolekit.te
+--- nsaserefpolicy/policy/modules/services/consolekit.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/consolekit.te 2008-12-01 14:27:59.000000000 -0500
+@@ -13,6 +13,9 @@
+ type consolekit_var_run_t;
+ files_pid_file(consolekit_var_run_t)
+
++type consolekit_log_t;
++files_pid_file(consolekit_log_t)
++
+ ########################################
+ #
+ # consolekit local policy
+@@ -24,20 +27,27 @@
+ allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
+ allow consolekit_t self:unix_dgram_socket create_socket_perms;
+
++manage_files_pattern(consolekit_t, consolekit_log_t, consolekit_log_t)
++logging_log_filetrans(consolekit_t, consolekit_log_t, file)
++
++manage_dirs_pattern(consolekit_t, consolekit_var_run_t, consolekit_var_run_t)
+ manage_files_pattern(consolekit_t, consolekit_var_run_t, consolekit_var_run_t)
+-files_pid_filetrans(consolekit_t, consolekit_var_run_t, file)
++files_pid_filetrans(consolekit_t, consolekit_var_run_t, { file dir })
+
+ kernel_read_system_state(consolekit_t)
+
+ corecmd_exec_bin(consolekit_t)
++corecmd_exec_shell(consolekit_t)
+
+ dev_read_urand(consolekit_t)
+ dev_read_sysfs(consolekit_t)
+
+ domain_read_all_domains_state(consolekit_t)
+ domain_use_interactive_fds(consolekit_t)
++domain_dontaudit_ptrace_all_domains(consolekit_t)
+
+ files_read_etc_files(consolekit_t)
++files_read_usr_files(consolekit_t)
+ # needs to read /var/lib/dbus/machine-id
+ files_read_var_lib_files(consolekit_t)
+
+@@ -47,13 +57,35 @@
+
+ auth_use_nsswitch(consolekit_t)
+
++init_telinit(consolekit_t)
++init_rw_utmp(consolekit_t)
++init_chat(consolekit_t)
++
++logging_send_syslog_msg(consolekit_t)
++
+ miscfiles_read_localization(consolekit_t)
+
++# consolekit needs to be able to ptrace all logged in users
++userdom_ptrace_all_users(consolekit_t)
++userdom_dontaudit_read_user_home_content_files(consolekit_t)
++userdom_read_user_tmp_files(consolekit_t)
++
++hal_ptrace(consolekit_t)
++mcs_ptrace_all(consolekit_t)
++
+ optional_policy(`
+- dbus_system_bus_client(consolekit_t)
+- dbus_connect_system_bus(consolekit_t)
++ cron_read_system_job_lib_files(consolekit_t)
++')
+
++optional_policy(`
++ dbus_system_domain(consolekit_t, consolekit_exec_t)
++ optional_policy(`
+ hal_dbus_chat(consolekit_t)
++ ')
++
++ optional_policy(`
++ rpm_dbus_chat(consolekit_t)
++ ')
+
+ optional_policy(`
+ unconfined_dbus_chat(consolekit_t)
+@@ -61,6 +93,29 @@
+ ')
+
+ optional_policy(`
++ polkit_domtrans_auth(consolekit_t)
++ polkit_read_lib(consolekit_t)
++')
++
++optional_policy(`
+ xserver_read_user_xauth(consolekit_t)
+ xserver_stream_connect(consolekit_t)
++ xserver_ptrace_xdm(consolekit_t)
++')
++
++optional_policy(`
++ #reading .Xauthity
++ unconfined_ptrace(consolekit_t)
++ unconfined_stream_connect(consolekit_t)
++')
++
++tunable_policy(`use_nfs_home_dirs',`
++ fs_dontaudit_list_nfs(consolekit_t)
++ fs_dontaudit_rw_nfs_files(consolekit_t)
+ ')
++
++tunable_policy(`use_samba_home_dirs',`
++ fs_dontaudit_list_cifs(consolekit_t)
++ fs_dontaudit_rw_cifs_files(consolekit_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.6.1/policy/modules/services/courier.te
+--- nsaserefpolicy/policy/modules/services/courier.te 2008-11-18 18:57:20.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/courier.te 2008-11-25 09:45:43.000000000 -0500
+@@ -10,6 +10,7 @@
+
+ type courier_etc_t;
+ files_config_file(courier_etc_t)
++mta_system_content(courier_etc_t)
+
+ courier_domain_template(pcp)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.6.1/policy/modules/services/cron.fc
+--- nsaserefpolicy/policy/modules/services/cron.fc 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/cron.fc 2008-11-25 09:45:43.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)
+
++/var/spool/anacron(/.*)? gen_context(system_u:object_r:system_cron_spool_t,s0)
++
+ /var/spool/at -d gen_context(system_u:object_r:cron_spool_t,s0)
+ /var/spool/at/spool -d gen_context(system_u:object_r:cron_spool_t,s0)
+ /var/spool/at/[^/]* -- <<none>>
+@@ -41,7 +43,12 @@
+ #/var/spool/cron/crontabs/root -- gen_context(system_u:object_r:sysadm_cron_spool_t,s0)
+
+ /var/spool/fcron -d gen_context(system_u:object_r:cron_spool_t,s0)
+-/var/spool/fcron/[^/]* <<none>>
++/var/spool/fcron/.* <<none>>
+ /var/spool/fcron/systab\.orig -- gen_context(system_u:object_r:system_cron_spool_t,s0)
+ /var/spool/fcron/systab -- gen_context(system_u:object_r:system_cron_spool_t,s0)
+ /var/spool/fcron/new\.systab -- gen_context(system_u:object_r:system_cron_spool_t,s0)
++/var/lib/misc(/.*)? gen_context(system_u:object_r:system_cronjob_var_lib_t,s0)
++
++/var/lib/glpi/files(/.*)? gen_context(system_u:object_r:cron_var_lib_t,s0)
++
++/var/log/rpmpkgs.* -- gen_context(system_u:object_r:cron_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.1/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/cron.if 2008-11-25 09:45:43.000000000 -0500
+@@ -343,6 +343,24 @@
+
+ ########################################
+ ## <summary>
++## Allow read/write unix stream sockets from the system cron jobs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`cron_rw_system_stream_sockets',`
++ gen_require(`
++ type system_cronjob_t;
++ ')
++
++ allow $1 system_cronjob_t:unix_stream_socket { read write };
++')
++
++########################################
++## <summary>
+ ## Read and write a cron daemon unnamed pipe.
+ ## </summary>
+ ## <param name="domain">
+@@ -361,7 +379,7 @@
+
+ ########################################
+ ## <summary>
+-## Read, and write cron daemon TCP sockets.
++## Dontaudit Read, and write cron daemon TCP sockets.
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+@@ -369,7 +387,7 @@
+ ## </summary>
+ ## </param>
+ #
+-interface(`cron_rw_tcp_sockets',`
++interface(`cron_dontaudit_rw_tcp_sockets',`
+ gen_require(`
+ type crond_t;
+ ')
+@@ -481,11 +499,14 @@
+ #
+ interface(`cron_read_system_job_tmp_files',`
+ gen_require(`
+- type system_cronjob_tmp_t;
++ type system_cronjob_tmp_t, cron_var_run_t;
+ ')
+
+ files_search_tmp($1)
+ allow $1 system_cronjob_tmp_t:file read_file_perms;
++
++ files_search_pids($1)
++ allow $1 cron_var_run_t:file read_file_perms;
+ ')
+
+ ########################################
+@@ -506,3 +527,83 @@
+
+ dontaudit $1 system_cronjob_tmp_t:file append;
+ ')
++
++
++########################################
++## <summary>
++## Do not audit attempts to write temporary
++## files from the system cron jobs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`cron_dontaudit_write_system_job_tmp_files',`
++ gen_require(`
++ type system_cronjob_tmp_t;
++ type cron_var_run_t;
++ type system_cronjob_var_run_t;
++ ')
++
++ dontaudit $1 system_cronjob_tmp_t:file write_file_perms;
++ dontaudit $1 cron_var_run_t:file write_file_perms;
++ ')
++
++########################################
++## <summary>
++## Read temporary files from the system cron jobs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`cron_read_system_job_lib_files',`
++ gen_require(`
++ type system_cronjob_var_lib_t;
++ ')
++
++
++ read_files_pattern($1, system_cronjob_var_lib_t, system_cronjob_var_lib_t)
++')
++
++########################################
++## <summary>
++## Manage files from the system cron jobs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`cron_manage_system_job_lib_files',`
++ gen_require(`
++ type system_cronjob_var_lib_t;
++ ')
++
++
++ manage_files_pattern($1, system_cronjob_var_lib_t, system_cronjob_var_lib_t)
++')
++
++########################################
++## <summary>
++## Manage pid files used by cron
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`cron_manage_pid_files',`
++ gen_require(`
++ type crond_var_run_t;
++ ')
++
++
++ manage_files_pattern($1, crond_var_run_t, crond_var_run_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.1/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/cron.te 2008-11-25 09:45:43.000000000 -0500
+@@ -38,6 +38,10 @@
+ type cron_var_lib_t;
+ files_type(cron_var_lib_t)
+
++# var/lib files
++type cron_var_run_t;
++files_type(cron_var_run_t)
++
+ # var/log files
+ type cron_log_t;
+ logging_log_file(cron_log_t)
+@@ -58,6 +62,8 @@
+
+ type crond_tmp_t;
+ files_tmp_file(crond_tmp_t)
++files_poly_parent(crond_tmp_t)
++mta_system_content(crond_tmp_t)
+
+ type crond_var_run_t;
+ files_pid_file(crond_var_run_t)
+@@ -103,6 +109,12 @@
+ files_type(user_cron_spool_t)
+ ubac_constrained(user_cron_spool_t)
+
++type system_cronjob_var_lib_t;
++files_type(system_cronjob_var_lib_t)
++
++type system_cronjob_var_run_t;
++files_pid_file(system_cronjob_var_run_t)
++
+ ########################################
+ #
+ # Admin crontab local policy
+@@ -130,7 +142,7 @@
+ # Cron daemon local policy
+ #
+
+-allow crond_t self:capability { dac_override setgid setuid sys_nice dac_read_search audit_control };
++allow crond_t self:capability { dac_override setgid setuid sys_nice dac_read_search };
+ dontaudit crond_t self:capability { sys_resource sys_tty_config };
+ allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow crond_t self:process { setexec setfscreate };
+@@ -149,15 +161,14 @@
+ allow crond_t crond_var_run_t:file manage_file_perms;
+ files_pid_filetrans(crond_t,crond_var_run_t,file)
+
+-allow crond_t cron_spool_t:dir rw_dir_perms;
+-allow crond_t cron_spool_t:file read_file_perms;
++manage_files_pattern(crond_t, cron_spool_t, cron_spool_t)
+
+ manage_dirs_pattern(crond_t, crond_tmp_t, crond_tmp_t)
+ manage_files_pattern(crond_t, crond_tmp_t, crond_tmp_t)
+ files_tmp_filetrans(crond_t, crond_tmp_t, { file dir })
+
+-allow crond_t system_cron_spool_t:dir list_dir_perms;
+-allow crond_t system_cron_spool_t:file read_file_perms;
++list_dirs_pattern(crond_t, system_cron_spool_t, system_cron_spool_t)
++read_files_pattern(crond_t, system_cron_spool_t, system_cron_spool_t)
+
+ kernel_read_kernel_sysctls(crond_t)
+ kernel_search_key(crond_t)
+@@ -183,6 +194,8 @@
+ corecmd_read_bin_symlinks(crond_t)
+
+ domain_use_interactive_fds(crond_t)
++domain_subj_id_change_exemption(crond_t)
++domain_role_change_exemption(crond_t)
+
+ files_read_etc_files(crond_t)
+ files_read_generic_spool(crond_t)
+@@ -192,10 +205,13 @@
+ files_search_default(crond_t)
+
+ init_rw_utmp(crond_t)
++init_spec_domtrans_script(crond_t)
+
+ auth_use_nsswitch(crond_t)
+
++logging_send_audit_msgs(crond_t)
+ logging_send_syslog_msg(crond_t)
++logging_set_loginuid(crond_t)
+
+ seutil_read_config(crond_t)
+ seutil_read_default_contexts(crond_t)
+@@ -208,6 +224,7 @@
+ userdom_list_user_home_dirs(crond_t)
+
+ mta_send_mail(crond_t)
++mta_system_content(cron_spool_t)
+
+ ifdef(`distro_debian',`
+ # pam_limits is used
+@@ -227,21 +244,45 @@
+ ')
+ ')
+
++tunable_policy(`allow_polyinstantiation',`
++ allow crond_t self:capability fowner;
++ files_search_tmp(crond_t)
++ files_polyinstantiate_all(crond_t)
++')
++
++optional_policy(`
++ apache_search_sys_content(crond_t)
++')
++
+ optional_policy(`
+ locallogin_search_keys(crond_t)
+ locallogin_link_keys(crond_t)
+ ')
+
++optional_policy(`
++ # these should probably be unconfined_crond_t
++ init_dbus_send_script(crond_t)
++')
++
++optional_policy(`
++ mono_domtrans(crond_t)
++')
++
+ tunable_policy(`fcron_crond', `
+ allow crond_t system_cron_spool_t:file manage_file_perms;
+ ')
+
+ optional_policy(`
++ amanda_search_var_lib(crond_t)
++')
++
++optional_policy(`
+ amavis_search_lib(crond_t)
+ ')
+
+ optional_policy(`
+- hal_dbus_send(crond_t)
++ hal_dbus_chat(crond_t)
++ hal_dbus_chat(system_cronjob_t)
+ ')
+
+ optional_policy(`
+@@ -283,6 +324,9 @@
+ allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
+ files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
+
++allow system_cronjob_t cron_var_run_t:file manage_file_perms;
++files_pid_filetrans(system_cronjob_t, cron_var_run_t, file)
++
+ allow system_cronjob_t system_cron_spool_t:file read_file_perms;
+ # The entrypoint interface is not used as this is not
+ # a regular entrypoint. Since crontab files are
+@@ -314,9 +358,13 @@
+ filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
+ files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
+
++# var/lib files for system_crond
++files_search_var_lib(system_cronjob_t)
++manage_files_pattern(system_cronjob_t, system_cronjob_var_lib_t, system_cronjob_var_lib_t)
++
+ # Read from /var/spool/cron.
+ allow system_cronjob_t cron_spool_t:dir list_dir_perms;
+-allow system_cronjob_t cron_spool_t:file read_file_perms;
++allow system_cronjob_t cron_spool_t:file rw_file_perms;
+
+ kernel_read_kernel_sysctls(system_cronjob_t)
+ kernel_read_system_state(system_cronjob_t)
+@@ -370,7 +418,8 @@
+ init_read_utmp(system_cronjob_t)
+ init_dontaudit_rw_utmp(system_cronjob_t)
+ # prelink tells init to restart it self, we either need to allow or dontaudit
+-init_write_initctl(system_cronjob_t)
++init_telinit(system_cronjob_t)
++init_spec_domtrans_script(system_cronjob_t)
+
+ auth_use_nsswitch(system_cronjob_t)
+
+@@ -378,6 +427,7 @@
+ libs_exec_ld_so(system_cronjob_t)
+
+ logging_read_generic_logs(system_cronjob_t)
++logging_send_audit_msgs(system_cronjob_t)
+ logging_send_syslog_msg(system_cronjob_t)
+
+ miscfiles_read_localization(system_cronjob_t)
+@@ -428,11 +478,20 @@
+ ')
+
+ optional_policy(`
++ lpd_list_spool(system_cronjob_t)
++')
++
++optional_policy(`
++ mono_domtrans(system_cronjob_t)
++')
++
++optional_policy(`
+ mrtg_append_create_logs(system_cronjob_t)
+ ')
+
+ optional_policy(`
+ mta_send_mail(system_cronjob_t)
++ mta_system_content(system_cron_spool_t)
+ ')
+
+ optional_policy(`
+@@ -460,8 +519,7 @@
+ ')
+
+ optional_policy(`
+- # cjp: why?
+- squid_domtrans(system_cronjob_t)
++ spamassassin_manage_lib_files(system_cronjob_t)
+ ')
+
+ optional_policy(`
+@@ -469,17 +527,11 @@
+ ')
+
+ optional_policy(`
++ unconfined_dbus_send(crond_t)
++ unconfined_shell_domtrans(crond_t)
++ unconfined_domain(crond_t)
+ unconfined_domain(system_cronjob_t)
+- userdom_user_home_dir_filetrans_user_home_content(system_cronjob_t, { dir file lnk_file fifo_file sock_file })
+-')
+-
+-ifdef(`TODO',`
+-ifdef(`mta.te', `
+-allow system_cronjob_t mail_spool_t:lnk_file read;
+-allow mta_user_agent system_cronjob_t:fd use;
+-r_dir_file(system_mail_t, crond_tmp_t)
+ ')
+-') dnl end TODO
+
+ ########################################
+ #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.6.1/policy/modules/services/cups.fc
+--- nsaserefpolicy/policy/modules/services/cups.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/cups.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -8,24 +8,35 @@
+ /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)
+ /etc/cups/printers\.conf.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
++/etc/cups/subscriptions.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ /etc/cups/certs -d gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ /etc/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
++/etc/rc\.d/init\.d/cups -- gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
++
++/etc/cups/interfaces(/.*)? gen_context(system_u:object_r:cupsd_interface_t,s0)
+
+ /etc/hp(/.*)? gen_context(system_u:object_r:hplip_etc_t,s0)
+
+ /etc/printcap.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+
++/opt/gutenprint/ppds(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
++
+ /usr/bin/cups-config-daemon -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
++/usr/bin/hpijs -- gen_context(system_u:object_r:hplip_exec_t,s0)
+
+-/usr/lib(64)?/cups/backend/.* -- gen_context(system_u:object_r:cupsd_exec_t,s0)
+-/usr/lib(64)?/cups/daemon/.* -- gen_context(system_u:object_r:cupsd_exec_t,s0)
+-/usr/lib(64)?/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
++/usr/lib/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
++/usr/lib64/cups/daemon/cups-lpd -- gen_context(system_u:object_r:cupsd_lpd_exec_t,s0)
+
+ /usr/libexec/hal_lpadmin -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+
+ /usr/sbin/cupsd -- gen_context(system_u:object_r:cupsd_exec_t,s0)
+ /usr/sbin/hal_lpadmin -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/hpiod -- gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/sbin/hp-[^/]+ -- gen_context(system_u:object_r:hplip_exec_t,s0)
++# keep as separate lines to ensure proper sorting
++/usr/lib/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/lib64/cups/backend/hp.* -- gen_context(system_u:object_r:hplip_exec_t,s0)
++
+ /usr/sbin/printconf-backend -- gen_context(system_u:object_r:cupsd_config_exec_t,s0)
+ /usr/sbin/ptal-printd -- gen_context(system_u:object_r:ptal_exec_t,s0)
+ /usr/sbin/ptal-mlcd -- gen_context(system_u:object_r:ptal_exec_t,s0)
+@@ -33,7 +44,7 @@
+
+ /usr/share/cups(/.*)? gen_context(system_u:object_r:cupsd_etc_t,s0)
+ /usr/share/foomatic/db/oldprinterids -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+-/usr/share/hplip/hpssd\.py -- gen_context(system_u:object_r:hplip_exec_t,s0)
++/usr/share/hplip/.*\.py -- gen_context(system_u:object_r:hplip_exec_t,s0)
+
+ /var/cache/alchemist/printconf.* gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+ /var/cache/foomatic(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+@@ -43,10 +54,18 @@
+ /var/lib/cups/certs/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
+
+ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0)
+-/var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0)
++/var/log/turboprint.* gen_context(system_u:object_r:cupsd_log_t,s0)
+
+ /var/run/cups(/.*)? gen_context(system_u:object_r:cupsd_var_run_t,s0)
++/var/ccpd(/.*)? gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/hp.*\.pid -- gen_context(system_u:object_r:hplip_var_run_t,s0)
+ /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0)
+ /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0)
+ /var/run/ptal-mlcd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0)
++
++/usr/local/Brother/(.*/)?inf(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
++/usr/local/Printer/(.*/)?inf(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
++
++/usr/local/linuxprinter/ppd(/.*)? gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
++
++/usr/lib/cups/backend/cups-pdf -- gen_context(system_u:object_r:cups_pdf_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.6.1/policy/modules/services/cups.if
+--- nsaserefpolicy/policy/modules/services/cups.if 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/cups.if 2008-11-25 09:45:43.000000000 -0500
+@@ -20,6 +20,30 @@
+
+ ########################################
+ ## <summary>
++## Setup cups to transtion to the cups backend domain
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`cups_backend',`
++ gen_require(`
++ type cupsd_t;
++ ')
++
++ domtrans_pattern(cupsd_t, $2, $1)
++
++ allow cupsd_t $1:process signal;
++ allow $1 cupsd_t:unix_stream_socket connected_stream_socket_perms;
++
++ cups_read_config($1)
++ cups_append_log($1)
++')
++
++########################################
++## <summary>
+ ## Connect to cupsd over an unix domain stream socket.
+ ## </summary>
+ ## <param name="domain">
+@@ -212,6 +236,25 @@
+
+ ########################################
+ ## <summary>
++## Append cups log files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`cups_append_log',`
++ gen_require(`
++ type cupsd_log_t;
++ ')
++
++ logging_search_logs($1)
++ append_files_pattern($1, cupsd_log_t, cupsd_log_t)
++')
++
++########################################
++## <summary>
+ ## Write cups log files.
+ ## </summary>
+ ## <param name="domain">
+@@ -247,3 +290,66 @@
+ files_search_pids($1)
+ stream_connect_pattern($1, ptal_var_run_t, ptal_var_run_t, ptal_t)
+ ')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an cups environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the cups domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`cups_admin',`
++ gen_require(`
++ type cupsd_t, cupsd_tmp_t, cupsd_lpd_tmp_t;
++ type cupsd_etc_t, cupsd_log_t, cupsd_spool_t;
++ type cupsd_config_var_run_t, cupsd_lpd_var_run_t;
++ type cupsd_var_run_t, ptal_etc_t;
++ type ptal_var_run_t, hplip_var_run_t;
++ type cupsd_initrc_exec_t;
++ ')
++
++ allow $1 cupsd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, cupsd_t)
++
++ init_labeled_script_domtrans($1, cupsd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 cupsd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, cupsd_tmp_t)
++
++ admin_pattern($1, cupsd_lpd_tmp_t)
++
++ files_list_etc($1)
++ admin_pattern($1, cupsd_etc_t)
++
++ admin_pattern($1, ptal_etc_t)
++
++ files_list_spool($1)
++ admin_pattern($1, cupsd_spool_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, cupsd_log_t)
++
++ files_list_pids($1)
++ admin_pattern($1, cupsd_var_run_t)
++
++ admin_pattern($1, ptal_var_run_t)
++
++ admin_pattern($1, cupsd_config_var_run_t)
++
++ admin_pattern($1, cupsd_lpd_var_run_t)
++
++ admin_pattern($1, hplip_var_run_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.1/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/cups.te 2008-12-02 10:19:15.000000000 -0500
+@@ -20,6 +20,12 @@
+ type cupsd_etc_t;
+ files_config_file(cupsd_etc_t)
+
++type cupsd_initrc_exec_t;
++init_script_file(cupsd_initrc_exec_t)
++
++type cupsd_interface_t;
++files_type(cupsd_interface_t)
++
+ type cupsd_rw_etc_t;
+ files_config_file(cupsd_rw_etc_t)
+
+@@ -48,6 +54,10 @@
+ type hplip_t;
+ type hplip_exec_t;
+ init_daemon_domain(hplip_t, hplip_exec_t)
++# For CUPS to run as a backend
++cups_backend(hplip_t, hplip_exec_t)
++domtrans_pattern(cupsd_config_t, hplip_exec_t, hplip_t)
++read_files_pattern(cupsd_config_t, hplip_etc_t, hplip_etc_t)
+
+ type hplip_etc_t;
+ files_config_file(hplip_etc_t)
+@@ -65,6 +75,16 @@
+ type ptal_var_run_t;
+ files_pid_file(ptal_var_run_t)
+
++type cups_pdf_t;
++type cups_pdf_exec_t;
++domain_type(cups_pdf_t)
++domain_entry_file(cups_pdf_t, cups_pdf_exec_t)
++cups_backend(cups_pdf_t, cups_pdf_exec_t)
++role system_r types cups_pdf_t;
++
++type cups_pdf_tmp_t;
++files_tmp_file(cups_pdf_tmp_t)
++
+ ifdef(`enable_mcs',`
+ init_ranged_daemon_domain(cupsd_t,cupsd_exec_t,s0 - mcs_systemhigh)
+ ')
+@@ -79,13 +99,14 @@
+ #
+
+ # /usr/lib/cups/backend/serial needs sys_admin(?!)
+-allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_resource sys_tty_config };
++allow cupsd_t self:capability { sys_admin dac_override dac_read_search kill setgid setuid fsetid net_bind_service fowner chown dac_override sys_rawio sys_resource sys_tty_config };
+ dontaudit cupsd_t self:capability { sys_tty_config net_admin };
+-allow cupsd_t self:process { setsched signal_perms };
+-allow cupsd_t self:fifo_file rw_file_perms;
++allow cupsd_t self:process { setpgid setsched signal_perms };
++allow cupsd_t self:fifo_file rw_fifo_file_perms;
+ allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow cupsd_t self:unix_dgram_socket create_socket_perms;
+ allow cupsd_t self:netlink_selinux_socket create_socket_perms;
++allow cupsd_t self:shm create_shm_perms;
+ allow cupsd_t self:tcp_socket create_stream_socket_perms;
+ allow cupsd_t self:udp_socket create_socket_perms;
+ allow cupsd_t self:appletalk_socket create_socket_perms;
+@@ -97,6 +118,9 @@
+ read_lnk_files_pattern(cupsd_t, cupsd_etc_t, cupsd_etc_t)
+ files_search_etc(cupsd_t)
+
++manage_files_pattern(cupsd_t, cupsd_interface_t, cupsd_interface_t)
++can_exec(cupsd_t, cupsd_interface_t)
++
+ manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
+ manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
+ filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
+@@ -104,8 +128,8 @@
+
+ # allow cups to execute its backend scripts
+ can_exec(cupsd_t, cupsd_exec_t)
+-allow cupsd_t cupsd_exec_t:dir search;
+-allow cupsd_t cupsd_exec_t:lnk_file read;
++allow cupsd_t cupsd_exec_t:dir search_dir_perms;
++allow cupsd_t cupsd_exec_t:lnk_file read_lnk_file_perms;
+
+ manage_files_pattern(cupsd_t, cupsd_log_t, cupsd_log_t)
+ allow cupsd_t cupsd_log_t:dir setattr;
+@@ -116,13 +140,20 @@
+ manage_fifo_files_pattern(cupsd_t, cupsd_tmp_t, cupsd_tmp_t)
+ files_tmp_filetrans(cupsd_t, cupsd_tmp_t, { file dir fifo_file })
+
++# This whole section needs to be moved to a smbspool policy
++# smbspool seems to be iterating through all existing tmp files.
++# Looking for kerberos files
++files_getattr_all_tmp_files(cupsd_t)
++userdom_read_user_tmp_files(cupsd_t)
++files_dontaudit_getattr_all_tmp_sockets(cupsd_t)
++
+ allow cupsd_t cupsd_var_run_t:dir setattr;
+ manage_files_pattern(cupsd_t, cupsd_var_run_t, cupsd_var_run_t)
+ manage_sock_files_pattern(cupsd_t, cupsd_var_run_t, cupsd_var_run_t)
++manage_fifo_files_pattern(cupsd_t,cupsd_var_run_t,cupsd_var_run_t)
+ files_pid_filetrans(cupsd_t, cupsd_var_run_t, file)
+
+-read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
+-
++allow cupsd_t hplip_t:process {signal sigkill };
+ allow cupsd_t hplip_var_run_t:file read_file_perms;
+
+ stream_connect_pattern(cupsd_t, ptal_var_run_t, ptal_var_run_t, ptal_t)
+@@ -149,44 +180,49 @@
+ corenet_tcp_bind_reserved_port(cupsd_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
+ corenet_tcp_connect_all_ports(cupsd_t)
++corenet_tcp_connect_smbd_port(cupsd_t)
+ corenet_sendrecv_hplip_client_packets(cupsd_t)
+ corenet_sendrecv_ipp_client_packets(cupsd_t)
+ corenet_sendrecv_ipp_server_packets(cupsd_t)
++corenet_tcp_bind_all_rpc_ports(cupsd_t)
+
+ dev_rw_printer(cupsd_t)
+ dev_read_urand(cupsd_t)
+ dev_read_sysfs(cupsd_t)
+-dev_read_usbfs(cupsd_t)
++dev_rw_input_dev(cupsd_t) #447878
++dev_rw_generic_usb_dev(cupsd_t)
++dev_rw_usbfs(cupsd_t)
+ dev_getattr_printer_dev(cupsd_t)
+
+ domain_read_all_domains_state(cupsd_t)
+
+ fs_getattr_all_fs(cupsd_t)
+ fs_search_auto_mountpoints(cupsd_t)
++fs_read_anon_inodefs_files(cupsd_t)
+
++mls_fd_use_all_levels(cupsd_t)
+ mls_file_downgrade(cupsd_t)
+ mls_file_write_all_levels(cupsd_t)
+ mls_file_read_all_levels(cupsd_t)
++mls_rangetrans_target(cupsd_t)
+ mls_socket_write_all_levels(cupsd_t)
+
+ term_use_unallocated_ttys(cupsd_t)
+ term_search_ptys(cupsd_t)
+
+-auth_domtrans_chk_passwd(cupsd_t)
+-auth_dontaudit_read_pam_pid(cupsd_t)
+-
+ # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
+ corecmd_exec_shell(cupsd_t)
+ corecmd_exec_bin(cupsd_t)
+
+ domain_use_interactive_fds(cupsd_t)
+
++files_list_spool(cupsd_t)
+ files_read_etc_files(cupsd_t)
+ files_read_etc_runtime_files(cupsd_t)
+ # read python modules
+ files_read_usr_files(cupsd_t)
+ # for /var/lib/defoma
+-files_search_var_lib(cupsd_t)
++files_read_var_lib_files(cupsd_t)
+ files_list_world_readable(cupsd_t)
+ files_read_world_readable_files(cupsd_t)
+ files_read_world_readable_symlinks(cupsd_t)
+@@ -195,15 +231,16 @@
+ files_read_var_symlinks(cupsd_t)
+ # for /etc/printcap
+ files_dontaudit_write_etc_files(cupsd_t)
+-# smbspool seems to be iterating through all existing tmp files.
+-# redhat bug #214953
+-# cjp: this might be a broken behavior
+-files_dontaudit_getattr_all_tmp_files(cupsd_t)
+
+ selinux_compute_access_vector(cupsd_t)
++selinux_validate_context(cupsd_t)
+
+ init_exec_script_files(cupsd_t)
++init_read_utmp(cupsd_t)
+
++auth_domtrans_chk_passwd(cupsd_t)
++auth_dontaudit_read_pam_pid(cupsd_t)
++auth_rw_faillog(cupsd_t)
+ auth_use_nsswitch(cupsd_t)
+
+ # Read /usr/lib/gconv/gconv-modules.* and /usr/lib/python2.2/.*
+@@ -217,17 +254,21 @@
+ miscfiles_read_fonts(cupsd_t)
+
+ seutil_read_config(cupsd_t)
++sysnet_exec_ifconfig(cupsd_t)
+
+-sysnet_read_config(cupsd_t)
+-
++files_dontaudit_list_home(cupsd_t)
+ userdom_dontaudit_use_unpriv_user_fds(cupsd_t)
+ userdom_dontaudit_search_user_home_content(cupsd_t)
+
+ # Write to /var/spool/cups.
+ lpd_manage_spool(cupsd_t)
++lpd_read_config(cupsd_t)
++lpd_exec_lpr(cupsd_t)
++lpd_relabel_spool(cupsd_t)
+
+ ifdef(`enable_mls',`
+- lpd_relabel_spool(cupsd_t)
++ mls_trusted_object(cupsd_var_run_t)
++ init_ranged_daemon_domain(cupsd_t, cupsd_exec_t,mls_systemhigh)
+ ')
+
+ optional_policy(`
+@@ -244,8 +285,16 @@
+ userdom_dbus_send_all_users(cupsd_t)
+
+ optional_policy(`
++ avahi_dbus_chat(cupsd_t)
++ ')
++
++ optional_policy(`
+ hal_dbus_chat(cupsd_t)
+ ')
++
++ optional_policy(`
++ unconfined_dbus_chat(cupsd_t)
++ ')
+ ')
+
+ optional_policy(`
+@@ -261,6 +310,10 @@
+ ')
+
+ optional_policy(`
++ mta_send_mail(cupsd_t)
++')
++
++optional_policy(`
+ # cups execs smbtool which reads samba_etc_t files
+ samba_read_config(cupsd_t)
+ samba_rw_var_files(cupsd_t)
+@@ -279,7 +332,7 @@
+ # Cups configuration daemon local policy
+ #
+
+-allow cupsd_config_t self:capability { chown sys_tty_config };
++allow cupsd_config_t self:capability { chown dac_override sys_tty_config };
+ dontaudit cupsd_config_t self:capability sys_tty_config;
+ allow cupsd_config_t self:process signal_perms;
+ allow cupsd_config_t self:fifo_file rw_fifo_file_perms;
+@@ -311,7 +364,7 @@
+ files_pid_filetrans(cupsd_config_t, cupsd_config_var_run_t, file)
+
+ kernel_read_system_state(cupsd_config_t)
+-kernel_read_kernel_sysctls(cupsd_config_t)
++kernel_read_all_sysctls(cupsd_config_t)
+
+ corenet_all_recvfrom_unlabeled(cupsd_config_t)
+ corenet_all_recvfrom_netlabel(cupsd_config_t)
+@@ -324,6 +377,7 @@
+ dev_read_sysfs(cupsd_config_t)
+ dev_read_urand(cupsd_config_t)
+ dev_read_rand(cupsd_config_t)
++dev_rw_generic_usb_dev(cupsd_config_t)
+
+ fs_getattr_all_fs(cupsd_config_t)
+ fs_search_auto_mountpoints(cupsd_config_t)
+@@ -341,13 +395,14 @@
+ files_read_var_symlinks(cupsd_config_t)
+
+ # Alternatives asks for this
+-init_getattr_script_files(cupsd_config_t)
++init_getattr_all_script_files(cupsd_config_t)
+
+ auth_use_nsswitch(cupsd_config_t)
+
+ logging_send_syslog_msg(cupsd_config_t)
+
+ miscfiles_read_localization(cupsd_config_t)
++miscfiles_read_hwdata(cupsd_config_t)
+
+ seutil_dontaudit_search_config(cupsd_config_t)
+
+@@ -359,14 +414,16 @@
+ lpd_read_config(cupsd_config_t)
+
+ ifdef(`distro_redhat',`
+- init_getattr_script_files(cupsd_config_t)
+-
+ optional_policy(`
+ rpm_read_db(cupsd_config_t)
+ ')
+ ')
+
+ optional_policy(`
++ term_use_generic_ptys(cupsd_config_t)
++')
++
++optional_policy(`
+ cron_system_entry(cupsd_config_t, cupsd_config_exec_t)
+ ')
+
+@@ -382,6 +439,7 @@
+ optional_policy(`
+ hal_domtrans(cupsd_config_t)
+ hal_read_tmp_files(cupsd_config_t)
++ hal_dontaudit_use_fds(hplip_t)
+ ')
+
+ optional_policy(`
+@@ -491,7 +549,8 @@
+ allow hplip_t self:udp_socket create_socket_perms;
+ allow hplip_t self:rawip_socket create_socket_perms;
+
+-allow hplip_t cupsd_etc_t:dir search;
++allow hplip_t cupsd_etc_t:dir search_dir_perms;
++allow hplip_t cupsd_tmp_t:file rw_file_perms;
+
+ cups_stream_connect(hplip_t)
+
+@@ -500,6 +559,10 @@
+ read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
+ files_search_etc(hplip_t)
+
++fs_read_anon_inodefs_files(hplip_t)
++
++read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
++
+ manage_files_pattern(hplip_t, hplip_var_run_t, hplip_var_run_t)
+ files_pid_filetrans(hplip_t, hplip_var_run_t, file)
+
+@@ -529,7 +592,8 @@
+ dev_read_urand(hplip_t)
+ dev_read_rand(hplip_t)
+ dev_rw_generic_usb_dev(hplip_t)
+-dev_read_usbfs(hplip_t)
++dev_rw_usbfs(hplip_t)
++
+
+ fs_getattr_all_fs(hplip_t)
+ fs_search_auto_mountpoints(hplip_t)
+@@ -553,7 +617,9 @@
+ userdom_dontaudit_search_user_home_dirs(hplip_t)
+ userdom_dontaudit_search_user_home_content(hplip_t)
+
+-lpd_read_config(cupsd_t)
++
++lpd_read_config(hplip_t)
++lpd_manage_spool(hplip_t)
+
+ optional_policy(`
+ dbus_system_bus_client(hplip_t)
+@@ -635,3 +701,39 @@
+ optional_policy(`
+ udev_read_db(ptal_t)
+ ')
++
++########################################
++#
++# cups_pdf local policy
++#
++
++allow cups_pdf_t self:capability { chown fsetid setuid setgid dac_override };
++
++allow cups_pdf_t self:fifo_file rw_file_perms;
++allow cups_pdf_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(cups_pdf_t)
++files_read_usr_files(cups_pdf_t)
++
++kernel_read_system_state(cups_pdf_t)
++
++auth_use_nsswitch(cups_pdf_t)
++
++corecmd_exec_shell(cups_pdf_t)
++corecmd_exec_bin(cups_pdf_t)
++
++miscfiles_read_localization(cups_pdf_t)
++
++manage_files_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
++manage_dirs_pattern(cups_pdf_t, cups_pdf_tmp_t, cups_pdf_tmp_t)
++files_tmp_filetrans(cups_pdf_t, cups_pdf_tmp_t, { file dir })
++
++userdom_home_filetrans_user_home_dir(cups_pdf_t)
++userdom_manage_user_home_content_dirs(cups_pdf_t)
++userdom_manage_user_home_content_files(cups_pdf_t)
++
++lpd_manage_spool(cups_pdf_t)
++
++manage_files_pattern(cups_pdf_t, cupsd_log_t, cupsd_log_t)
++miscfiles_read_fonts(cups_pdf_t)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.6.1/policy/modules/services/cvs.te
+--- nsaserefpolicy/policy/modules/services/cvs.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/cvs.te 2008-11-25 09:45:43.000000000 -0500
+@@ -112,4 +112,5 @@
+ read_files_pattern(httpd_cvs_script_t, cvs_data_t, cvs_data_t)
+ manage_dirs_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
+ manage_files_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
++ files_tmp_filetrans(httpd_cvs_script_t, cvs_tmp_t, { file dir })
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.fc serefpolicy-3.6.1/policy/modules/services/cyphesis.fc
+--- nsaserefpolicy/policy/modules/services/cyphesis.fc 2008-09-03 11:05:02.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/cyphesis.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1 +1,6 @@
+ /usr/bin/cyphesis -- gen_context(system_u:object_r:cyphesis_exec_t,s0)
++
++/var/log/cyphesis(/.*)? gen_context(system_u:object_r:cyphesis_log_t,s0)
++
++/var/run/cyphesis(/.*)? gen_context(system_u:object_r:cyphesis_var_run_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.6.1/policy/modules/services/dbus.fc
+--- nsaserefpolicy/policy/modules/services/dbus.fc 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dbus.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -4,6 +4,9 @@
+ /usr/bin/dbus-daemon(-1)? -- gen_context(system_u:object_r:dbusd_exec_t,s0)
+ /bin/dbus-daemon -- gen_context(system_u:object_r:dbusd_exec_t,s0)
+
++/lib/dbus-1/dbus-daemon-launch-helper -- gen_context(system_u:object_r:dbusd_exec_t,s0)
++/lib64/dbus-1/dbus-daemon-launch-helper -- gen_context(system_u:object_r:dbusd_exec_t,s0)
++
+ /var/lib/dbus(/.*)? gen_context(system_u:object_r:system_dbusd_var_lib_t,s0)
+
+ /var/run/dbus(/.*)? gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.6.1/policy/modules/services/dbus.if
+--- nsaserefpolicy/policy/modules/services/dbus.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dbus.if 2008-11-25 09:45:43.000000000 -0500
+@@ -185,10 +185,12 @@
+ type system_dbusd_t, system_dbusd_t;
+ type system_dbusd_var_run_t, system_dbusd_var_lib_t;
+ class dbus send_msg;
++ attribute dbusd_unconfined;
+ ')
+
+ # SE-DBus specific permissions
+- allow $1 { system_dbusd_t self }:dbus send_msg;
++ allow $1 { system_dbusd_t self dbusd_unconfined }:dbus send_msg;
++ allow { system_dbusd_t dbusd_unconfined } $1:dbus send_msg;
+
+ read_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
+ files_search_var_lib($1)
+@@ -197,6 +199,10 @@
+ files_search_pids($1)
+ stream_connect_pattern($1, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
+ dbus_read_config($1)
++
++ optional_policy(`
++ rpm_script_dbus_chat($1)
++ ')
+ ')
+
+ #######################################
+@@ -244,6 +250,35 @@
+
+ ########################################
+ ## <summary>
++## Chat on user/application specific DBUS.
++## </summary>
++## <param name="domain_prefix">
++## <summary>
++## The prefix of the domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++template(`dbus_chat_user_bus',`
++ gen_require(`
++ type $1_t;
++ type $1_dbusd_t;
++ class dbus send_msg;
++ ')
++
++ allow $2 $1_dbusd_t:dbus send_msg;
++ allow $1_dbusd_t $2:dbus send_msg;
++ allow $2 $1_t:dbus send_msg;
++ allow $1_t $2:dbus send_msg;
++')
++
++########################################
++## <summary>
+ ## Read dbus configuration.
+ ## </summary>
+ ## <param name="domain">
+@@ -318,3 +353,77 @@
+
+ allow $1 system_dbusd_t:dbus *;
+ ')
++
++########################################
++## <summary>
++## Allow unconfined access to the system DBUS.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dbus_unconfined',`
++ gen_require(`
++ attribute dbusd_unconfined;
++ ')
++
++ typeattribute $1 dbusd_unconfined;
++')
++
++########################################
++## <summary>
++## Create a domain for processes
++## which can be started by the system dbus
++## </summary>
++## <param name="domain">
++## <summary>
++## Type to be used as a domain.
++## </summary>
++## </param>
++## <param name="entry_point">
++## <summary>
++## Type of the program to be used as an entry point to this domain.
++## </summary>
++## </param>
++#
++interface(`dbus_system_domain',`
++ gen_require(`
++ type system_dbusd_t;
++ role system_r;
++ ')
++
++ domain_type($1)
++ domain_entry_file($1, $2)
++
++ role system_r types $1;
++
++ domtrans_pattern(system_dbusd_t, $2, $1)
++
++ dbus_system_bus_client($1)
++ dbus_connect_system_bus($1)
++
++ ifdef(`hide_broken_symptoms', `
++ dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write };
++ ');
++')
++
++########################################
++## <summary>
++## Dontaudit Read, and write system dbus TCP sockets.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dbus_dontaudit_system_bus_rw_tcp_sockets',`
++ gen_require(`
++ type system_dbusd_t;
++ ')
++
++ allow $1 system_dbusd_t:tcp_socket { read write };
++ allow $1 system_dbusd_t:fd use;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.1/policy/modules/services/dbus.te
+--- nsaserefpolicy/policy/modules/services/dbus.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dbus.te 2008-11-25 09:45:43.000000000 -0500
+@@ -9,11 +9,11 @@
+ #
+ # Delcarations
+ #
+-
++attribute dbusd_unconfined;
+ attribute session_bus_type;
+
+ type dbusd_etc_t;
+-files_type(dbusd_etc_t)
++files_config_file(dbusd_etc_t)
+
+ type dbusd_exec_t;
+ corecmd_executable_file(dbusd_exec_t)
+@@ -31,11 +31,23 @@
+ files_tmp_file(system_dbusd_tmp_t)
+
+ type system_dbusd_var_lib_t;
+-files_pid_file(system_dbusd_var_lib_t)
++files_type(system_dbusd_var_lib_t)
+
+ type system_dbusd_var_run_t;
+ files_pid_file(system_dbusd_var_run_t)
+
++ifdef(`enable_mcs',`
++ init_ranged_daemon_domain(system_dbusd_t, dbusd_exec_t,s0 - mcs_systemhigh)
++')
++
++ifdef(`enable_mls',`
++ init_ranged_daemon_domain(system_dbusd_t, 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)
++')
++
+ ##############################
+ #
+ # System bus local policy
+@@ -45,7 +57,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;
+-allow system_dbusd_t self:process { getattr signal_perms setcap };
++allow system_dbusd_t self:process { getattr signal_perms setpgid getcap setcap };
+ allow system_dbusd_t self:fifo_file rw_fifo_file_perms;
+ allow system_dbusd_t self:dbus { send_msg acquire_svc };
+ allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
+@@ -53,6 +65,8 @@
+ # Receive notifications of policy reloads and enforcing status changes.
+ allow system_dbusd_t self:netlink_selinux_socket { create bind read };
+
++can_exec(system_dbusd_t, dbusd_exec_t)
++
+ allow system_dbusd_t dbusd_etc_t:dir list_dir_perms;
+ read_files_pattern(system_dbusd_t, dbusd_etc_t, dbusd_etc_t)
+ read_lnk_files_pattern(system_dbusd_t, dbusd_etc_t, dbusd_etc_t)
+@@ -75,6 +89,8 @@
+
+ fs_getattr_all_fs(system_dbusd_t)
+ fs_search_auto_mountpoints(system_dbusd_t)
++fs_list_inotifyfs(system_dbusd_t)
++fs_dontaudit_list_nfs(system_dbusd_t)
+
+ selinux_get_fs_mount(system_dbusd_t)
+ selinux_validate_context(system_dbusd_t)
+@@ -91,7 +107,6 @@
+ corecmd_list_bin(system_dbusd_t)
+ corecmd_read_bin_pipes(system_dbusd_t)
+ corecmd_read_bin_sockets(system_dbusd_t)
+-corecmd_exec_bin(system_dbusd_t)
+
+ domain_use_interactive_fds(system_dbusd_t)
+
+@@ -101,6 +116,8 @@
+
+ init_use_fds(system_dbusd_t)
+ init_use_script_ptys(system_dbusd_t)
++init_bin_domtrans_spec(system_dbusd_t)
++init_domtrans_script(system_dbusd_t)
+
+ logging_send_audit_msgs(system_dbusd_t)
+ logging_send_syslog_msg(system_dbusd_t)
+@@ -128,9 +145,34 @@
+ ')
+
+ optional_policy(`
++ gnome_exec_gconf(system_dbusd_t)
++')
++
++optional_policy(`
++ networkmanager_initrc_domtrans(system_dbusd_t)
++')
++
++optional_policy(`
++ polkit_domtrans_auth(system_dbusd_t)
++ polkit_search_lib(system_dbusd_t)
++')
++
++optional_policy(`
+ sysnet_domtrans_dhcpc(system_dbusd_t)
+ ')
+
+ optional_policy(`
+ udev_read_db(system_dbusd_t)
+ ')
++
++optional_policy(`
++ gen_require(`
++ type unconfined_dbusd_t;
++ ')
++ unconfined_domain(unconfined_dbusd_t)
++ unconfined_execmem_domtrans(unconfined_dbusd_t)
++
++ optional_policy(`
++ xserver_rw_shm(unconfined_dbusd_t)
++ ')
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.6.1/policy/modules/services/dcc.te
+--- nsaserefpolicy/policy/modules/services/dcc.te 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dcc.te 2008-11-25 09:45:43.000000000 -0500
+@@ -137,6 +137,7 @@
+
+ corenet_all_recvfrom_unlabeled(dcc_client_t)
+ corenet_all_recvfrom_netlabel(dcc_client_t)
++corenet_udp_bind_all_nodes(dcc_client_t)
+ corenet_udp_sendrecv_generic_if(dcc_client_t)
+ corenet_udp_sendrecv_all_nodes(dcc_client_t)
+ corenet_udp_sendrecv_all_ports(dcc_client_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.6.1/policy/modules/services/dhcp.if
+--- nsaserefpolicy/policy/modules/services/dhcp.if 2008-11-18 18:57:20.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dhcp.if 2008-11-25 09:45:43.000000000 -0500
+@@ -22,6 +22,25 @@
+
+ ########################################
+ ## <summary>
++## Execute dhcp server in the dhcp domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++#
++interface(`dhcpd_initrc_domtrans',`
++ gen_require(`
++ type dhcpd_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, dhcpd_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## All of the rules required to administrate
+ ## an dhcp environment
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.6.1/policy/modules/services/dnsmasq.if
+--- nsaserefpolicy/policy/modules/services/dnsmasq.if 2008-11-18 18:57:21.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dnsmasq.if 2008-11-25 09:45:43.000000000 -0500
+@@ -22,6 +22,25 @@
+
+ ########################################
+ ## <summary>
++## Execute dnsmasq server in the dnsmasq domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++#
++interface(`dnsmasq_initrc_domtrans',`
++ gen_require(`
++ type dnsmasq_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, dnsmasq_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## Send dnsmasq a signal
+ ## </summary>
+ ## <param name="domain">
+@@ -39,6 +58,26 @@
+ allow $1 dnsmasq_t:process signal;
+ ')
+
++
++########################################
++## <summary>
++## Send dnsmasq a signull
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++#
++interface(`dnsmasq_signull',`
++ gen_require(`
++ type dnsmasq_t;
++ ')
++
++ allow $1 dnsmasq_t:process signull;
++')
++
+ ########################################
+ ## <summary>
+ ## Send dnsmasq a kill signal.
+@@ -60,6 +99,44 @@
+
+ ########################################
+ ## <summary>
++## Delete dnsmasq pid files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++#
++interface(`dnsmasq_delete_pid_files',`
++ gen_require(`
++ type dnsmasq_var_run_t;
++ ')
++
++ delete_files_pattern($1, dnsmasq_var_run_t, dnsmasq_var_run_t)
++')
++
++########################################
++## <summary>
++## Read dnsmasq pid files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++#
++interface(`dnsmasq_read_pid_files',`
++ gen_require(`
++ type dnsmasq_var_run_t;
++ ')
++
++ read_files_pattern($1, dnsmasq_var_run_t, dnsmasq_var_run_t)
++')
++
++########################################
++## <summary>
+ ## All of the rules required to administrate
+ ## an dnsmasq environment
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.6.1/policy/modules/services/dnsmasq.te
+--- nsaserefpolicy/policy/modules/services/dnsmasq.te 2008-11-18 18:57:20.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dnsmasq.te 2008-11-25 09:45:43.000000000 -0500
+@@ -73,17 +73,17 @@
+ fs_getattr_all_fs(dnsmasq_t)
+ fs_search_auto_mountpoints(dnsmasq_t)
+
++auth_use_nsswitch(dnsmasq_t)
++
+ logging_send_syslog_msg(dnsmasq_t)
+
+ miscfiles_read_localization(dnsmasq_t)
+
+-sysnet_read_config(dnsmasq_t)
+-
+ userdom_dontaudit_use_unpriv_user_fds(dnsmasq_t)
+ userdom_dontaudit_search_user_home_dirs(dnsmasq_t)
+
+ optional_policy(`
+- nis_use_ypbind(dnsmasq_t)
++ cron_manage_pid_files(dnsmasq_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.6.1/policy/modules/services/dovecot.fc
+--- nsaserefpolicy/policy/modules/services/dovecot.fc 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dovecot.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -6,6 +6,7 @@
+ /etc/dovecot\.passwd.* gen_context(system_u:object_r:dovecot_passwd_t,s0)
+
+ /etc/pki/dovecot(/.*)? gen_context(system_u:object_r:dovecot_cert_t,s0)
++/etc/rc\.d/init\.d/dovecot -- gen_context(system_u:object_r:dovecot_initrc_exec_t,s0)
+
+ #
+ # /usr
+@@ -17,19 +18,22 @@
+
+ ifdef(`distro_debian', `
+ /usr/lib/dovecot/dovecot-auth -- gen_context(system_u:object_r:dovecot_auth_exec_t,s0)
++/usr/lib/dovecot/deliver -- gen_context(system_u:object_r:dovecot_deliver_exec_t,s0)
+ ')
+
+ ifdef(`distro_redhat', `
+ /usr/libexec/dovecot/dovecot-auth -- gen_context(system_u:object_r:dovecot_auth_exec_t,s0)
++/usr/libexec/dovecot/deliver -- gen_context(system_u:object_r:dovecot_deliver_exec_t,s0)
+ ')
+
+ #
+ # /var
+ #
+ /var/run/dovecot(-login)?(/.*)? gen_context(system_u:object_r:dovecot_var_run_t,s0)
+-# this is a hard link to /var/lib/dovecot/ssl-parameters.dat
+-/var/run/dovecot/login/ssl-parameters.dat gen_context(system_u:object_r:dovecot_var_lib_t,s0)
++/var/run/dovecot/login/ssl-parameters.dat -- gen_context(system_u:object_r:dovecot_var_lib_t,s0)
+
+ /var/lib/dovecot(/.*)? gen_context(system_u:object_r:dovecot_var_lib_t,s0)
+
++/var/log/dovecot\.log.* gen_context(system_u:object_r:dovecot_var_log_t,s0)
++
+ /var/spool/dovecot(/.*)? gen_context(system_u:object_r:dovecot_spool_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.6.1/policy/modules/services/dovecot.if
+--- nsaserefpolicy/policy/modules/services/dovecot.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/dovecot.if 2008-11-25 09:45:43.000000000 -0500
+@@ -21,7 +21,46 @@
+
+ ########################################
+ ## <summary>
+-## Do not audit attempts to delete dovecot lib files.
++## Connect to dovecot auth unix domain stream socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`dovecot_auth_stream_connect',`
++ gen_require(`
++ type dovecot_auth_t, dovecot_var_run_t;
++ ')
++
++ allow $1 dovecot_var_run_t:dir search;
++ allow $1 dovecot_var_run_t:sock_file write;
++ allow $1 dovecot_auth_t:unix_stream_socket connectto;
++')
++
++########################################
++## <summary>
++## Execute dovecot_deliver in the dovecot_deliver domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`dovecot_domtrans_deliver',`
++ gen_require(`
++ type dovecot_deliver_t, dovecot_deliver_exec_t;
++ ')
++
++ domtrans_pattern($1, dovecot_deliver_exec_t, dovecot_deliver_t)
++')
++
++#######################################
++## <summary>
++## Do not audit attempts to d`elete dovecot lib files.
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+@@ -36,3 +75,60 @@
+
+ dontaudit $1 dovecot_var_lib_t:file unlink;
+ ')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an dovecot environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the dovecot domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`dovecot_admin',`
++ gen_require(`
++ type dovecot_t, dovecot_etc_t, dovecot_log_t;
++ type dovecot_spool_t, dovecot_var_lib_t;
++ type dovecot_var_run_t;
++
++ type dovecot_cert_t, dovecot_passwd_t;
++ type dovecot_initrc_exec_t;
++ ')
++
++ allow $1 dovecot_t:process { ptrace signal_perms };
++ ps_process_pattern($1, dovecot_t)
++
++ init_labeled_script_domtrans($1, dovecot_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 dovecot_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_etc($1)
++ admin_pattern($1, dovecot_etc_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, dovecot_log_t)
++
++ files_list_spool($1)
++ admin_pattern($1, dovecot_spool_t)
++
++ files_list_var_lib($1)
++ admin_pattern($1, dovecot_var_lib_t)
++
++ files_list_pids($1)
++ admin_pattern($1, dovecot_var_run_t)
++
++ admin_pattern($1, dovecot_cert_t)
++
++ admin_pattern($1, dovecot_passwd_t)
++')
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.6.1/policy/modules/services/dovecot.te
+--- nsaserefpolicy/policy/modules/services/dovecot.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/dovecot.te 2008-11-25 09:45:43.000000000 -0500
+@@ -15,12 +15,21 @@
+ domain_entry_file(dovecot_auth_t, dovecot_auth_exec_t)
+ role system_r types dovecot_auth_t;
+
++type dovecot_deliver_t;
++type dovecot_deliver_exec_t;
++domain_type(dovecot_deliver_t)
++domain_entry_file(dovecot_deliver_t, dovecot_deliver_exec_t)
++role system_r types dovecot_deliver_t;
++
+ type dovecot_cert_t;
+ files_type(dovecot_cert_t)
+
+ type dovecot_etc_t;
+ files_config_file(dovecot_etc_t)
+
++type dovecot_initrc_exec_t;
++init_script_file(dovecot_initrc_exec_t)
++
+ type dovecot_passwd_t;
+ files_type(dovecot_passwd_t)
+
+@@ -31,9 +40,15 @@
+ type dovecot_var_lib_t;
+ files_type(dovecot_var_lib_t)
+
++type dovecot_var_log_t;
++logging_log_file(dovecot_var_log_t)
++
+ type dovecot_var_run_t;
+ files_pid_file(dovecot_var_run_t)
+
++type dovecot_auth_tmp_t;
++files_tmp_file(dovecot_auth_tmp_t)
++
+ ########################################
+ #
+ # dovecot local policy
+@@ -58,6 +73,10 @@
+
+ can_exec(dovecot_t, dovecot_exec_t)
+
++# log files
++manage_files_pattern(dovecot_t, dovecot_var_log_t, dovecot_var_log_t)
++logging_log_filetrans(dovecot_t, dovecot_var_log_t, file)
++
+ manage_dirs_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
+ manage_files_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
+ manage_lnk_files_pattern(dovecot_t, dovecot_spool_t, dovecot_spool_t)
+@@ -85,6 +104,7 @@
+ dev_read_urand(dovecot_t)
+
+ fs_getattr_all_fs(dovecot_t)
++fs_getattr_all_dirs(dovecot_t)
+ fs_search_auto_mountpoints(dovecot_t)
+ fs_list_inotifyfs(dovecot_t)
+
+@@ -98,7 +118,7 @@
+ files_dontaudit_list_default(dovecot_t)
+ # Dovecot now has quota support and it uses getmntent() to find the mountpoints.
+ files_read_etc_runtime_files(dovecot_t)
+-files_getattr_all_mountpoints(dovecot_t)
++files_search_all_mountpoints(dovecot_t)
+
+ init_getattr_utmp(dovecot_t)
+
+@@ -120,7 +140,7 @@
+ mta_manage_spool(dovecot_t)
+
+ optional_policy(`
+- kerberos_use(dovecot_t)
++ kerberos_keytab_template(dovecot, dovecot_t)
+ ')
+
+ optional_policy(`
+@@ -140,25 +160,35 @@
+ # dovecot auth local policy
+ #
+
+-allow dovecot_auth_t self:capability { setgid setuid };
++allow dovecot_auth_t self:capability { chown dac_override setgid setuid };
+ allow dovecot_auth_t self:process signal_perms;
+ allow dovecot_auth_t self:fifo_file rw_fifo_file_perms;
+ allow dovecot_auth_t self:unix_dgram_socket create_socket_perms;
+ allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms;
+
+-allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl };
++allow dovecot_auth_t dovecot_t:unix_stream_socket { connectto rw_stream_socket_perms };
+
+ allow dovecot_auth_t dovecot_passwd_t:file read_file_perms;
+
++manage_dirs_pattern(dovecot_auth_t, dovecot_auth_tmp_t, dovecot_auth_tmp_t)
++manage_files_pattern(dovecot_auth_t, dovecot_auth_tmp_t, dovecot_auth_tmp_t)
++files_tmp_filetrans(dovecot_auth_t, dovecot_auth_tmp_t, { file dir })
++
+ # Allow dovecot to create and read SSL parameters file
+ manage_files_pattern(dovecot_t, dovecot_var_lib_t, dovecot_var_lib_t)
+ files_search_var_lib(dovecot_t)
++files_read_var_symlinks(dovecot_t)
+
+ allow dovecot_auth_t dovecot_var_run_t:dir list_dir_perms;
++manage_sock_files_pattern(dovecot_auth_t, dovecot_var_run_t, dovecot_var_run_t)
++dovecot_auth_stream_connect(dovecot_auth_t)
+
+ kernel_read_all_sysctls(dovecot_auth_t)
+ kernel_read_system_state(dovecot_auth_t)
+
++logging_send_audit_msgs(dovecot_auth_t)
++logging_send_syslog_msg(dovecot_auth_t)
++
+ dev_read_urand(dovecot_auth_t)
+
+ auth_domtrans_chk_passwd(dovecot_auth_t)
+@@ -167,6 +197,7 @@
+ files_read_etc_files(dovecot_auth_t)
+ files_read_etc_runtime_files(dovecot_auth_t)
+ files_search_pids(dovecot_auth_t)
++files_read_usr_files(dovecot_auth_t)
+ files_read_usr_symlinks(dovecot_auth_t)
+ files_search_tmp(dovecot_auth_t)
+ files_read_var_lib_files(dovecot_t)
+@@ -182,5 +213,55 @@
+ ')
+
+ optional_policy(`
+- logging_send_syslog_msg(dovecot_auth_t)
++ mysql_search_db(dovecot_auth_t)
++ mysql_stream_connect(dovecot_auth_t)
++')
++
++optional_policy(`
++ nis_authenticate(dovecot_auth_t)
++')
++
++optional_policy(`
++ postfix_manage_private_sockets(dovecot_auth_t)
++ postfix_search_spool(dovecot_auth_t)
++')
++
++# for gssapi (kerberos)
++userdom_list_user_tmp(dovecot_auth_t)
++userdom_read_user_tmp_files(dovecot_auth_t)
++userdom_read_user_tmp_symlinks(dovecot_auth_t)
++
++########################################
++#
++# dovecot deliver local policy
++#
++allow dovecot_deliver_t self:unix_dgram_socket create_socket_perms;
++
++allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
++allow dovecot_deliver_t dovecot_var_run_t:dir list_dir_perms;
++
++kernel_read_all_sysctls(dovecot_deliver_t)
++kernel_read_system_state(dovecot_deliver_t)
++
++files_read_etc_files(dovecot_deliver_t)
++files_read_etc_runtime_files(dovecot_deliver_t)
++
++auth_use_nsswitch(dovecot_deliver_t)
++
++logging_send_syslog_msg(dovecot_deliver_t)
++
++miscfiles_read_localization(dovecot_deliver_t)
++
++dovecot_auth_stream_connect(dovecot_deliver_t)
++
++userdom_manage_user_home_content_dirs(dovecot_t)
++userdom_manage_user_home_content_files(dovecot_t)
++userdom_manage_user_home_content_symlinks(dovecot_t)
++userdom_manage_user_home_content_pipes(dovecot_t)
++userdom_manage_user_home_content_sockets(dovecot_t)
++userdom_user_home_dir_filetrans_user_home_content(dovecot_t, { dir file lnk_file fifo_file sock_file })
++
++optional_policy(`
++ mta_manage_spool(dovecot_deliver_t)
+ ')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.6.1/policy/modules/services/exim.if
+--- nsaserefpolicy/policy/modules/services/exim.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/exim.if 2008-11-25 09:45:43.000000000 -0500
+@@ -97,6 +97,26 @@
+
+ ########################################
+ ## <summary>
++## Allow the specified domain to manage exim's log files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`exim_manage_log',`
++ gen_require(`
++ type exim_log_t;
++ ')
++
++ manage_files_pattern($1, exim_log_t, exim_log_t)
++ logging_search_logs($1)
++')
++
++########################################
++## <summary>
+ ## Allow the specified domain to append
+ ## exim log files.
+ ## </summary>
+@@ -154,3 +174,23 @@
+ manage_files_pattern($1, exim_spool_t, exim_spool_t)
+ files_search_spool($1)
+ ')
++
++########################################
++## <summary>
++## Create, read, write, and delete
++## exim spool dirs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`exim_manage_spool_dirs',`
++ gen_require(`
++ type exim_spool_t;
++ ')
++
++ manage_dirs_pattern($1, exim_spool_t, exim_spool_t)
++ files_search_spool($1)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.6.1/policy/modules/services/exim.te
+--- nsaserefpolicy/policy/modules/services/exim.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/exim.te 2008-11-25 09:45:43.000000000 -0500
+@@ -21,9 +21,20 @@
+ ## </desc>
+ gen_tunable(exim_manage_user_files, false)
+
++## <desc>
++## <p>
++## Allow exim to connect to databases (postgres, mysql)
++## </p>
++## </desc>
++gen_tunable(exim_can_connect_db, false)
++
+ type exim_t;
+ type exim_exec_t;
+ init_daemon_domain(exim_t, exim_exec_t)
++mta_mailserver(exim_t, exim_exec_t)
++mta_mailserver_user_agent(exim_t)
++application_executable_file(exim_exec_t)
++mta_agent_executable(exim_exec_t)
+
+ type exim_log_t;
+ logging_log_file(exim_log_t)
+@@ -42,10 +53,12 @@
+ # exim local policy
+ #
+
+-allow exim_t self:capability { dac_override dac_read_search setuid setgid fowner chown };
++allow exim_t self:capability { chown dac_override dac_read_search fowner setuid setgid sys_resource };
++allow exim_t self:process { setrlimit setpgid };
+ allow exim_t self:fifo_file rw_fifo_file_perms;
+ allow exim_t self:unix_stream_socket create_stream_socket_perms;
+ allow exim_t self:tcp_socket create_stream_socket_perms;
++allow exim_t self:udp_socket create_socket_perms;
+
+ can_exec(exim_t,exim_exec_t)
+
+@@ -66,12 +79,15 @@
+ files_pid_filetrans(exim_t, exim_var_run_t, { file dir })
+
+ kernel_read_kernel_sysctls(exim_t)
+-
+ kernel_dontaudit_read_system_state(exim_t)
++kernel_read_network_state(exim_t)
+
+ corecmd_search_bin(exim_t)
+
+ corenet_all_recvfrom_unlabeled(exim_t)
++corenet_all_recvfrom_netlabel(exim_t)
++corenet_udp_sendrecv_all_if(exim_t)
++corenet_udp_sendrecv_all_nodes(exim_t)
+ corenet_tcp_sendrecv_all_if(exim_t)
+ corenet_tcp_sendrecv_all_nodes(exim_t)
+ corenet_tcp_sendrecv_all_ports(exim_t)
+@@ -82,6 +98,8 @@
+ corenet_tcp_connect_smtp_port(exim_t)
+ corenet_tcp_connect_ldap_port(exim_t)
+ corenet_tcp_connect_inetd_child_port(exim_t)
++# connect to spamassassin
++corenet_tcp_connect_spamd_port(exim_t)
+
+ dev_read_rand(exim_t)
+ dev_read_urand(exim_t)
+@@ -89,20 +107,27 @@
+ # Init script handling
+ domain_use_interactive_fds(exim_t)
+
++files_search_usr(exim_t)
++files_search_var(exim_t)
+ files_read_etc_files(exim_t)
++files_read_etc_runtime_files(exim_t)
+
+ auth_use_nsswitch(exim_t)
+
+ logging_send_syslog_msg(exim_t)
+
+ miscfiles_read_localization(exim_t)
++miscfiles_read_certs(exim_t)
+
+-sysnet_dns_name_resolve(exim_t)
++fs_getattr_xattr_fs(exim_t)
++fs_list_inotifyfs(exim_t)
+
+ userdom_dontaudit_search_user_home_dirs(exim_t)
+
+ mta_read_aliases(exim_t)
+-mta_rw_spool(exim_t)
++mta_read_config(exim_t)
++mta_manage_spool(exim_t)
++mta_mailserver_delivery(exim_t)
+
+ tunable_policy(`exim_read_user_files',`
+ userdom_read_user_home_content_files(exim_t)
+@@ -114,3 +139,62 @@
+ userdom_read_user_tmp_files(exim_t)
+ userdom_write_user_tmp_files(exim_t)
+ ')
++
++tunable_policy(`exim_can_connect_db',`
++ corenet_tcp_connect_mysqld_port(exim_t)
++ corenet_sendrecv_mysqld_client_packets(exim_t)
++ corenet_tcp_connect_postgresql_port(exim_t)
++ corenet_sendrecv_postgresql_client_packets(exim_t)
++')
++
++optional_policy(`
++ dovecot_auth_stream_connect(exim_t)
++')
++
++optional_policy(`
++ tunable_policy(`exim_can_connect_db',`
++ mysql_stream_connect(exim_t)
++ ')
++')
++
++optional_policy(`
++ tunable_policy(`exim_can_connect_db',`
++ postgresql_stream_connect(exim_t)
++')
++')
++
++optional_policy(`
++ kerberos_keytab_template(exim, exim_t)
++')
++
++optional_policy(`
++ mailman_read_data_files(exim_t)
++ mailman_domtrans(exim_t)
++')
++
++optional_policy(`
++ procmail_domtrans(exim_t)
++')
++
++optional_policy(`
++ sasl_connect(exim_t)
++')
++
++optional_policy(`
++ cron_read_pipes(exim_t)
++ cron_rw_system_job_pipes(exim_t)
++')
++
++optional_policy(`
++ cyrus_stream_connect(exim_t)
++')
++
++optional_policy(`
++ clamav_domtrans_clamscan(exim_t)
++ clamav_stream_connect(exim_t)
++')
++
++optional_policy(`
++ spamassassin_exec(exim_t)
++ spamassassin_exec_client(exim_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.6.1/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ftp.te 2008-11-25 09:45:43.000000000 -0500
+@@ -160,6 +160,7 @@
+
+ fs_search_auto_mountpoints(ftpd_t)
+ fs_getattr_all_fs(ftpd_t)
++fs_search_fusefs_dirs(ftpd_t)
+
+ auth_use_nsswitch(ftpd_t)
+ auth_domtrans_chk_passwd(ftpd_t)
+@@ -223,6 +224,10 @@
+ userdom_manage_user_home_content_files(ftpd_t)
+ userdom_manage_user_home_content_symlinks(ftpd_t)
+ userdom_user_home_dir_filetrans_user_home_content(ftpd_t, { dir file lnk_file })
++
++ auth_read_all_dirs_except_shadow(ftpd_t)
++ auth_read_all_files_except_shadow(ftpd_t)
++ auth_read_all_symlinks_except_shadow(ftpd_t)
+ ')
+
+ tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
+@@ -258,7 +263,9 @@
+ ')
+
+ optional_policy(`
+- kerberos_read_keytab(ftpd_t)
++ kerberos_keytab_template(ftpd, ftpd_t)
++ kerberos_manage_host_rcache(ftpd_t)
++ selinux_validate_context(ftpd_t)
+ ')
+
+ optional_policy(`
+@@ -270,6 +277,14 @@
+ ')
+
+ optional_policy(`
++ dbus_system_bus_client(ftpd_t)
++ optional_policy(`
++ oddjob_dbus_chat(ftpd_t)
++ oddjob_domtrans_mkhomedir(ftpd_t)
++ ')
++')
++
++optional_policy(`
+ seutil_sigchld_newrole(ftpd_t)
+ ')
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.fc serefpolicy-3.6.1/policy/modules/services/gnomeclock.fc
+--- nsaserefpolicy/policy/modules/services/gnomeclock.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/gnomeclock.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,3 @@
++
++/usr/libexec/gnome-clock-applet-mechanism -- gen_context(system_u:object_r:gnomeclock_exec_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.if serefpolicy-3.6.1/policy/modules/services/gnomeclock.if
+--- nsaserefpolicy/policy/modules/services/gnomeclock.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/gnomeclock.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,69 @@
++
++## <summary>policy for gnomeclock</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run gnomeclock.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`gnomeclock_domtrans',`
++ gen_require(`
++ type gnomeclock_t;
++ type gnomeclock_exec_t;
++ ')
++
++ domtrans_pattern($1, gnomeclock_exec_t, gnomeclock_t)
++')
++
++
++########################################
++## <summary>
++## Execute gnomeclock in the gnomeclock domain, and
++## allow the specified role the gnomeclock domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the gnomeclock domain.
++## </summary>
++## </param>
++#
++interface(`gnomeclock_run',`
++ gen_require(`
++ type gnomeclock_t;
++ ')
++
++ gnomeclock_domtrans($1)
++ role $2 types gnomeclock_t;
++')
++
++
++########################################
++## <summary>
++## Send and receive messages from
++## gnomeclock over dbus.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`gnomeclock_dbus_chat',`
++ gen_require(`
++ type gnomeclock_t;
++ class dbus send_msg;
++ ')
++
++ allow $1 gnomeclock_t:dbus send_msg;
++ allow gnomeclock_t $1:dbus send_msg;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.te serefpolicy-3.6.1/policy/modules/services/gnomeclock.te
+--- nsaserefpolicy/policy/modules/services/gnomeclock.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/gnomeclock.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,50 @@
++policy_module(gnomeclock, 1.0.0)
++########################################
++#
++# Declarations
++#
++
++type gnomeclock_t;
++type gnomeclock_exec_t;
++dbus_system_domain(gnomeclock_t, gnomeclock_exec_t)
++
++########################################
++#
++# gnomeclock local policy
++#
++allow gnomeclock_t self:capability { sys_nice sys_time sys_ptrace };
++allow gnomeclock_t self:process { getattr getsched };
++allow gnomeclock_t self:fifo_file rw_fifo_file_perms;
++allow gnomeclock_t self:unix_stream_socket create_stream_socket_perms;
++
++corecmd_exec_bin(gnomeclock_t)
++
++userdom_ptrace_all_users(gnomeclock_t)
++
++files_read_etc_files(gnomeclock_t)
++files_read_usr_files(gnomeclock_t)
++
++miscfiles_manage_localization(gnomeclock_t)
++miscfiles_etc_filetrans_localization(gnomeclock_t)
++
++fs_list_inotifyfs(gnomeclock_t)
++
++auth_use_nsswitch(gnomeclock_t)
++
++miscfiles_read_localization(gnomeclock_t)
++
++userdom_read_all_users_state(gnomeclock_t)
++
++optional_policy(`
++ consolekit_dbus_chat(gnomeclock_t)
++')
++
++optional_policy(`
++ clock_domtrans(gnomeclock_t)
++')
++
++optional_policy(`
++ polkit_domtrans_auth(gnomeclock_t)
++ polkit_read_lib(gnomeclock_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.1/policy/modules/services/hal.if
+--- nsaserefpolicy/policy/modules/services/hal.if 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/hal.if 2008-11-25 09:45:43.000000000 -0500
+@@ -51,10 +51,7 @@
+ type hald_t;
+ ')
+
+- allow $1 hald_t:dir list_dir_perms;
+- read_files_pattern($1, hald_t, hald_t)
+- read_lnk_files_pattern($1, hald_t, hald_t)
+- dontaudit $1 hald_t:process ptrace;
++ ps_process_pattern($1, hald_t)
+ ')
+
+ ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.1/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te 2008-11-19 11:51:44.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/hal.te 2008-11-25 09:45:43.000000000 -0500
+@@ -49,6 +49,9 @@
+ type hald_var_lib_t;
+ files_type(hald_var_lib_t)
+
++typealias hald_log_t alias pmtools_log_t;
++typealias hald_var_run_t alias pmtools_var_run_t;
++
+ ########################################
+ #
+ # Local policy
+@@ -143,6 +146,7 @@
+ files_getattr_all_dirs(hald_t)
+ files_read_kernel_img(hald_t)
+ files_rw_lock_dirs(hald_t)
++files_read_generic_pids(hald_t)
+
+ fs_getattr_all_fs(hald_t)
+ fs_search_all(hald_t)
+@@ -277,6 +281,12 @@
+ ')
+
+ optional_policy(`
++ polkit_domtrans_auth(hald_t)
++ polkit_domtrans_resolve(hald_t)
++ polkit_read_lib(hald_t)
++')
++
++optional_policy(`
+ rpc_search_nfs_state_data(hald_t)
+ ')
+
+@@ -301,12 +311,16 @@
+ virt_manage_images(hald_t)
+ ')
+
++optional_policy(`
++ xserver_read_pid(hald_t)
++')
++
+ ########################################
+ #
+ # Hal acl local policy
+ #
+
+-allow hald_acl_t self:capability { dac_override fowner };
++allow hald_acl_t self:capability { dac_override fowner sys_resource };
+ allow hald_acl_t self:process { getattr signal };
+ allow hald_acl_t self:fifo_file rw_fifo_file_perms;
+
+@@ -346,6 +360,11 @@
+
+ miscfiles_read_localization(hald_acl_t)
+
++optional_policy(`
++ polkit_domtrans_auth(hald_acl_t)
++ polkit_read_lib(hald_acl_t)
++')
++
+ ########################################
+ #
+ # Local hald mac policy
+@@ -418,3 +437,7 @@
+ files_read_usr_files(hald_keymap_t)
+
+ miscfiles_read_localization(hald_keymap_t)
++
++# This is caused by a bug in hald and PolicyKit.
++# Should be removed when this is fixed
++cron_read_system_job_lib_files(hald_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ifplugd.fc serefpolicy-3.6.1/policy/modules/services/ifplugd.fc
+--- nsaserefpolicy/policy/modules/services/ifplugd.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ifplugd.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,9 @@
++
++/etc/ifplugd(/.*)? gen_context(system_u:object_r:ifplugd_etc_t,s0)
++
++/etc/rc\.d/init\.d/ifplugd -- gen_context(system_u:object_r:ifplugd_initrc_exec_t,s0)
++
++/usr/sbin/ifplugd -- gen_context(system_u:object_r:ifplugd_exec_t,s0)
++
++/var/run/ifplugd.* gen_context(system_u:object_r:ifplugd_var_run_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ifplugd.if serefpolicy-3.6.1/policy/modules/services/ifplugd.if
+--- nsaserefpolicy/policy/modules/services/ifplugd.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ifplugd.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,194 @@
++## <summary>policy for ifplugd</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run ifplugd.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ifplugd_domtrans',`
++ gen_require(`
++ type ifplugd_t, ifplugd_exec_t;
++ ')
++
++ domtrans_pattern($1,ifplugd_exec_t,ifplugd_t)
++')
++
++########################################
++## <summary>
++## Read and write ifplugd UDP sockets.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`ifplugd_rw_udp_sockets',`
++ gen_require(`
++ type ifplugd_t;
++ ')
++
++ allow $1 ifplugd_t:udp_socket { read write };
++')
++
++########################################
++## <summary>
++## Read and write ifplugd packet sockets.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`ifplugd_rw_packet_sockets',`
++ gen_require(`
++ type ifplugd_t;
++ ')
++
++ allow $1 ifplugd_t:packet_socket { read write };
++')
++
++########################################
++## <summary>
++## Read and write ifplugd netlink
++## routing sockets.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`ifplugd_rw_routing_sockets',`
++ gen_require(`
++ type ifplugd_t;
++ ')
++
++ allow $1 ifplugd_t:netlink_route_socket { read write };
++')
++
++########################################
++## <summary>
++## Send a generic signal to ifplugd
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`ifplugd_signal',`
++ gen_require(`
++ type ifplugd_t;
++ ')
++
++ allow $1 ifplugd_t:process signal;
++')
++
++########################################
++## <summary>
++## Read ifplugd etc configuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++##
++#
++interface(`ifplugd_read_etc',`
++ gen_require(`
++ type ifplugd_etc_t;
++ ')
++
++ files_search_etc($1)
++ read_files_pattern($1, ifplugd_etc_t, ifplugd_etc_t)
++')
++
++########################################
++## <summary>
++## Manage ifplugd etc configuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++##
++#
++interface(`ifplugd_manage_etc',`
++ gen_require(`
++ type ifplugd_etc_t;
++ ')
++
++ files_search_etc($1)
++ manage_dirs_pattern($1, ifplugd_etc_t, ifplugd_etc_t)
++ manage_files_pattern($1, ifplugd_etc_t, ifplugd_etc_t)
++
++')
++
++########################################
++## <summary>
++## Read ifplugd PID files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++##
++#
++interface(`ifplugd_read_pid_files',`
++ gen_require(`
++ type ifplugd_var_run_t;
++ ')
++
++ files_search_pids($1)
++ allow $1 ifplugd_var_run_t:file read_file_perms;
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an ifplugd environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the ifplugd domain.
++## </summary>
++## </param>
++## <rolecap/>
++##
++#
++interface(`ifplugd_admin',`
++ gen_require(`
++ type ifplugd_t, ifplugd_etc_t;
++ type ifplugd_var_run_t, ifplugd_initrc_exec_t;
++ ')
++
++ allow $1 ifplugd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, ifplugd_t)
++
++ init_labeled_script_domtrans($1, ifplugd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 ifplugd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_etc($1)
++ admin_pattern($1, ifplugd_etc_t)
++
++ files_list_pids($1)
++ admin_pattern($1, ifplugd_var_run_t)
++
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ifplugd.te serefpolicy-3.6.1/policy/modules/services/ifplugd.te
+--- nsaserefpolicy/policy/modules/services/ifplugd.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ifplugd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,89 @@
++policy_module(ifplugd,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ifplugd_t;
++type ifplugd_exec_t;
++init_daemon_domain(ifplugd_t, ifplugd_exec_t)
++
++type ifplugd_initrc_exec_t;
++init_script_file(ifplugd_initrc_exec_t)
++
++# config files
++type ifplugd_etc_t;
++files_type(ifplugd_etc_t)
++
++# pid files
++type ifplugd_var_run_t;
++files_pid_file(ifplugd_var_run_t)
++
++########################################
++#
++# ifplugd local policy
++#
++
++allow ifplugd_t self:capability { net_admin sys_nice net_bind_service };
++dontaudit ifplugd_t self:capability { sys_tty_config sys_ptrace };
++allow ifplugd_t self:process { signal signull };
++
++allow ifplugd_t self:fifo_file rw_fifo_file_perms;
++allow ifplugd_t self:tcp_socket create_stream_socket_perms;
++allow ifplugd_t self:udp_socket create_socket_perms;
++allow ifplugd_t self:netlink_route_socket create_netlink_socket_perms;
++allow ifplugd_t self:packet_socket create_socket_perms;
++
++# pid file
++manage_files_pattern(ifplugd_t, ifplugd_var_run_t,ifplugd_var_run_t)
++manage_sock_files_pattern(ifplugd_t, ifplugd_var_run_t,ifplugd_var_run_t)
++files_pid_filetrans(ifplugd_t,ifplugd_var_run_t, { file sock_file })
++
++# config files
++read_files_pattern(ifplugd_t,ifplugd_etc_t,ifplugd_etc_t)
++exec_files_pattern(ifplugd_t,ifplugd_etc_t,ifplugd_etc_t)
++
++kernel_read_system_state(ifplugd_t)
++kernel_read_network_state(ifplugd_t)
++kernel_search_network_sysctl(ifplugd_t)
++kernel_rw_net_sysctls(ifplugd_t)
++kernel_read_kernel_sysctls(ifplugd_t)
++
++# reading of hardware information
++dev_read_sysfs(ifplugd_t)
++
++corecmd_exec_shell(ifplugd_t)
++corecmd_exec_bin(ifplugd_t)
++
++domain_read_confined_domains_state(ifplugd_t)
++domain_dontaudit_read_all_domains_state(ifplugd_t)
++
++auth_use_nsswitch(ifplugd_t)
++
++libs_use_ld_so(ifplugd_t)
++libs_use_shared_libs(ifplugd_t)
++miscfiles_read_localization(ifplugd_t)
++
++logging_send_syslog_msg(ifplugd_t)
++
++netutils_domtrans(ifplugd_t)
++# transition to ifconfig & dhcpc
++sysnet_domtrans_ifconfig(ifplugd_t)
++sysnet_domtrans_dhcpc(ifplugd_t)
++
++sysnet_delete_dhcpc_pid(ifplugd_t)
++sysnet_read_dhcpc_pid(ifplugd_t)
++sysnet_signal_dhcpc(ifplugd_t)
++#sysnet_kill_dhcpc(ifplugd_t)
++#sysnet_manage_config(ifplugd_t)
++#sysnet_read_dhcp_config(ifplugd_t)
++#sysnet_search_dhcp_state(ifplugd_t)
++
++optional_policy(`
++ consoletype_exec(ifplugd_t)
++')
++
++permissive ifplugd_t;
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.6.1/policy/modules/services/kerberos.fc
+--- nsaserefpolicy/policy/modules/services/kerberos.fc 2008-10-10 15:53:03.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/kerberos.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -21,6 +21,7 @@
+ /var/kerberos/krb5kdc/from_master.* gen_context(system_u:object_r:krb5kdc_lock_t,s0)
+ /var/kerberos/krb5kdc/principal.* gen_context(system_u:object_r:krb5kdc_principal_t,s0)
+ /var/kerberos/krb5kdc/principal\.ok gen_context(system_u:object_r:krb5kdc_lock_t,s0)
++/var/kerberos/krb5kdc/kadm5\.keytab -- gen_context(system_u:object_r:krb5_keytab_t,s0)
+
+ /var/log/krb5kdc\.log gen_context(system_u:object_r:krb5kdc_log_t,s0)
+ /var/log/kadmin(d)?\.log gen_context(system_u:object_r:kadmind_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.6.1/policy/modules/services/kerberos.te
+--- nsaserefpolicy/policy/modules/services/kerberos.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/kerberos.te 2008-11-25 09:45:43.000000000 -0500
+@@ -290,6 +290,7 @@
+ corenet_tcp_sendrecv_all_nodes(kpropd_t)
+ corenet_tcp_sendrecv_all_ports(kpropd_t)
+ corenet_tcp_bind_all_nodes(kpropd_t)
++corenet_tcp_bind_kprop_port(kpropd_t)
+
+ dev_read_urand(kpropd_t)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.6.1/policy/modules/services/kerneloops.if
+--- nsaserefpolicy/policy/modules/services/kerneloops.if 2008-10-14 11:58:09.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/kerneloops.if 2008-11-25 09:45:43.000000000 -0500
+@@ -63,6 +63,25 @@
+
+ ########################################
+ ## <summary>
++## Allow domain to manage kerneloops tmp files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`kerneloops_manage_tmp_files',`
++ gen_require(`
++ type kerneloops_tmp_t;
++ ')
++
++ manage_files_pattern($1, kerneloops_tmp_t, kerneloops_tmp_t)
++ files_search_tmp($1)
++')
++
++########################################
++## <summary>
+ ## All of the rules required to administrate
+ ## an kerneloops environment
+ ## </summary>
+@@ -81,6 +100,7 @@
+ interface(`kerneloops_admin',`
+ gen_require(`
+ type kerneloops_t, kerneloops_initrc_exec_t;
++ type kerneloops_tmp_t;
+ ')
+
+ allow $1 kerneloops_t:process { ptrace signal_perms };
+@@ -90,4 +110,7 @@
+ domain_system_change_exemption($1)
+ role_transition $2 kerneloops_initrc_exec_t system_r;
+ allow $2 system_r;
++
++ admin_pattern($1, kerneloops_tmp_t)
+ ')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.6.1/policy/modules/services/kerneloops.te
+--- nsaserefpolicy/policy/modules/services/kerneloops.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/kerneloops.te 2008-11-25 09:45:43.000000000 -0500
+@@ -13,6 +13,9 @@
+ type kerneloops_initrc_exec_t;
+ init_script_file(kerneloops_initrc_exec_t)
+
++type kerneloops_tmp_t;
++files_tmp_file(kerneloops_tmp_t)
++
+ ########################################
+ #
+ # kerneloops local policy
+@@ -23,6 +26,9 @@
+ allow kerneloops_t self:fifo_file rw_file_perms;
+ allow kerneloops_t self:netlink_route_socket r_netlink_socket_perms;
+
++manage_files_pattern(kerneloops_t, kerneloops_tmp_t, kerneloops_tmp_t)
++files_tmp_filetrans(kerneloops_t,kerneloops_tmp_t,file)
++
+ kernel_read_ring_buffer(kerneloops_t)
+
+ # Init script handling
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.6.1/policy/modules/services/ldap.te
+--- nsaserefpolicy/policy/modules/services/ldap.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ldap.te 2008-11-25 09:45:43.000000000 -0500
+@@ -117,7 +117,7 @@
+ userdom_dontaudit_search_user_home_dirs(slapd_t)
+
+ optional_policy(`
+- kerberos_use(slapd_t)
++ kerberos_keytab_template(slapd, slapd_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-3.6.1/policy/modules/services/lpd.fc
+--- nsaserefpolicy/policy/modules/services/lpd.fc 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/lpd.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -3,6 +3,8 @@
+ #
+ /dev/printer -s gen_context(system_u:object_r:printer_t,s0)
+
++/opt/gutenprint/s?bin(/.*)? gen_context(system_u:object_r:lpr_exec_t,s0)
++
+ #
+ # /usr
+ #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.te serefpolicy-3.6.1/policy/modules/services/lpd.te
+--- nsaserefpolicy/policy/modules/services/lpd.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/lpd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -233,7 +233,6 @@
+ allow lpr_t self:unix_stream_socket create_stream_socket_perms;
+ allow lpr_t self:tcp_socket create_socket_perms;
+ allow lpr_t self:udp_socket create_socket_perms;
+-allow lpr_t self:netlink_route_socket r_netlink_socket_perms;
+
+ can_exec(lpr_t, lpr_exec_t)
+
+@@ -273,9 +272,9 @@
+ term_use_controlling_term(lpr_t)
+ term_use_generic_ptys(lpr_t)
+
+-miscfiles_read_localization(lpr_t)
++auth_use_nsswitch(lpr_t)
+
+-sysnet_read_config(lpr_t)
++miscfiles_read_localization(lpr_t)
+
+ userdom_read_user_tmp_symlinks(lpr_t)
+ # Write to the user domain tty.
+@@ -339,10 +338,3 @@
+ logging_send_syslog_msg(lpr_t)
+ ')
+
+-optional_policy(`
+- nscd_socket_use(lpr_t)
+-')
+-
+-optional_policy(`
+- nis_use_ypbind(lpr_t)
+-')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.6.1/policy/modules/services/mailman.fc
+--- nsaserefpolicy/policy/modules/services/mailman.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/mailman.fc 2008-11-25 09:45:43.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)
+ ')
++/usr/lib/mailman/mail/mailman -- gen_context(system_u:object_r:mailman_mail_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.6.1/policy/modules/services/mailman.if
+--- nsaserefpolicy/policy/modules/services/mailman.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/mailman.if 2008-11-25 09:45:43.000000000 -0500
+@@ -31,6 +31,12 @@
+ allow mailman_$1_t self:tcp_socket create_stream_socket_perms;
+ allow mailman_$1_t self:udp_socket create_socket_perms;
+
++ files_search_spool(mailman_$1_t)
++
++ manage_dirs_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++ manage_files_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++ manage_lnk_files_pattern(mailman_$1_t, mailman_archive_t, mailman_archive_t)
++
+ manage_dirs_pattern(mailman_$1_t, mailman_data_t, mailman_data_t)
+ manage_files_pattern(mailman_$1_t, mailman_data_t, mailman_data_t)
+ manage_lnk_files_pattern(mailman_$1_t, mailman_data_t, mailman_data_t)
+@@ -209,6 +215,7 @@
+ type mailman_data_t;
+ ')
+
++ manage_dirs_pattern($1, mailman_data_t, mailman_data_t)
+ manage_files_pattern($1, mailman_data_t, mailman_data_t)
+ ')
+
+@@ -250,6 +257,25 @@
+
+ #######################################
+ ## <summary>
++## read
++## mailman logs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`mailman_read_log',`
++ gen_require(`
++ type mailman_log_t;
++ ')
++
++ read_files_pattern($1, mailman_log_t, mailman_log_t)
++')
++
++#######################################
++## <summary>
+ ## Append to mailman logs.
+ ## </summary>
+ ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.6.1/policy/modules/services/mailman.te
+--- nsaserefpolicy/policy/modules/services/mailman.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/mailman.te 2008-11-25 09:45:43.000000000 -0500
+@@ -53,10 +53,8 @@
+ apache_use_fds(mailman_cgi_t)
+ apache_dontaudit_append_log(mailman_cgi_t)
+ apache_search_sys_script_state(mailman_cgi_t)
+-
+- optional_policy(`
+- nscd_socket_use(mailman_cgi_t)
+- ')
++ apache_read_config(mailman_cgi_t)
++ apache_dontaudit_rw_stream_sockets(mailman_cgi_t)
+ ')
+
+ ########################################
+@@ -65,15 +63,22 @@
+ #
+
+ allow mailman_mail_t self:unix_dgram_socket create_socket_perms;
++allow mailman_mail_t initrc_t:process signal;
++allow mailman_mail_t self:process { signal signull };
++allow mailman_mail_t self:capability { kill dac_override setuid setgid sys_tty_config };
++
++files_search_spool(mailman_mail_t)
++fs_rw_anon_inodefs_files(mailman_mail_t)
++
++manage_dirs_pattern(mailman_mail_t, mailman_archive_t, mailman_archive_t)
++manage_files_pattern(mailman_mail_t, mailman_archive_t, mailman_archive_t)
++manage_lnk_files_pattern(mailman_mail_t, mailman_archive_t, mailman_archive_t)
+
+ mta_dontaudit_rw_delivery_tcp_sockets(mailman_mail_t)
++mta_dontaudit_rw_queue(mailman_mail_t)
+
+-ifdef(`TODO',`
+ optional_policy(`
+- allow mailman_mail_t qmail_spool_t:file { read ioctl getattr };
+- # do we really need this?
+- allow mailman_mail_t qmail_lspawn_t:fifo_file write;
+-')
++ postfix_search_spool(mailman_mail_t)
+ ')
+
+ ########################################
+@@ -99,11 +104,15 @@
+ # for su
+ seutil_dontaudit_search_config(mailman_queue_t)
+
++su_exec(mailman_queue_t)
++
+ # some of the following could probably be changed to dontaudit, someone who
+ # knows mailman well should test this out and send the changes
+ userdom_search_user_home_dirs(mailman_queue_t)
+
+-su_exec(mailman_queue_t)
++optional_policy(`
++ apache_read_config(mailman_queue_t)
++')
+
+ optional_policy(`
+ cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.6.1/policy/modules/services/mailscanner.fc
+--- nsaserefpolicy/policy/modules/services/mailscanner.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/mailscanner.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,2 @@
++/var/spool/MailScanner(/.*)? gen_context(system_u:object_r:mailscanner_spool_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.if serefpolicy-3.6.1/policy/modules/services/mailscanner.if
+--- nsaserefpolicy/policy/modules/services/mailscanner.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/mailscanner.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,59 @@
++## <summary>Anti-Virus and Anti-Spam Filter</summary>
++
++########################################
++## <summary>
++## Search mailscanner spool directories.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`mailscanner_search_spool',`
++ gen_require(`
++ type mailscanner_spool_t;
++ ')
++
++ files_search_spool($1)
++ allow $1 mailscanner_spool_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++## read mailscanner spool files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`mailscanner_read_spool',`
++ gen_require(`
++ type mailscanner_spool_t;
++ ')
++
++ files_search_spool($1)
++ read_files_pattern($1, mailscanner_spool_t, mailscanner_spool_t)
++')
++
++########################################
++## <summary>
++## Create, read, write, and delete
++## mailscanner spool files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`mailscanner_manage_spool',`
++ gen_require(`
++ type mailscanner_spool_t;
++ ')
++
++ files_search_spool($1)
++ manage_files_pattern($1, mailscanner_spool_t, mailscanner_spool_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.te serefpolicy-3.6.1/policy/modules/services/mailscanner.te
+--- nsaserefpolicy/policy/modules/services/mailscanner.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/mailscanner.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,5 @@
++
++policy_module(mailscanner, 1.0.0)
++
++type mailscanner_spool_t;
++files_type(mailscanner_spool_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.1/policy/modules/services/mta.fc
+--- nsaserefpolicy/policy/modules/services/mta.fc 2008-09-12 10:48:05.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/mta.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,4 +1,4 @@
+-/bin/mail -- gen_context(system_u:object_r:sendmail_exec_t,s0)
++/bin/mail(x)? -- gen_context(system_u:object_r:sendmail_exec_t,s0)
+
+ /etc/aliases -- gen_context(system_u:object_r:etc_aliases_t,s0)
+ /etc/aliases\.db -- gen_context(system_u:object_r:etc_aliases_t,s0)
+@@ -22,7 +22,3 @@
+ /var/spool/imap(/.*)? gen_context(system_u:object_r:mail_spool_t,s0)
+ /var/spool/(client)?mqueue(/.*)? gen_context(system_u:object_r:mqueue_spool_t,s0)
+ /var/spool/mail(/.*)? gen_context(system_u:object_r:mail_spool_t,s0)
+-
+-#ifdef(`postfix.te', `', `
+-#/var/spool/postfix(/.*)? gen_context(system_u:object_r:mail_spool_t,s0)
+-#')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.6.1/policy/modules/services/mta.if
+--- nsaserefpolicy/policy/modules/services/mta.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/mta.if 2008-11-25 14:26:16.000000000 -0500
+@@ -130,6 +130,15 @@
+ sendmail_create_log($1_mail_t)
+ ')
+
++ optional_policy(`
++ exim_read_log($1_mail_t)
++ exim_append_log($1_mail_t)
++ exim_manage_spool_files($1_mail_t)
++')
++
++ optional_policy(`
++ uucp_manage_spool($1_mail_t)
++ ')
+ ')
+
+ ########################################
+@@ -302,11 +311,13 @@
+ allow $1 mail_spool_t:dir list_dir_perms;
+ create_files_pattern($1, mail_spool_t, mail_spool_t)
+ read_files_pattern($1, mail_spool_t, mail_spool_t)
++ append_files_pattern($1, mail_spool_t, mail_spool_t)
+ create_lnk_files_pattern($1, mail_spool_t, mail_spool_t)
+ read_lnk_files_pattern($1, mail_spool_t, mail_spool_t)
+
+ optional_policy(`
+ dovecot_manage_spool($1)
++ dovecot_domtrans_deliver($1)
+ ')
+
+ optional_policy(`
+@@ -341,6 +352,7 @@
+ # apache should set close-on-exec
+ apache_dontaudit_rw_stream_sockets($1)
+ apache_dontaudit_rw_sys_script_stream_sockets($1)
++ apache_append_log($1)
+ ')
+ ')
+
+@@ -665,7 +677,7 @@
+ files_search_spool($1)
+ allow $1 mail_spool_t:dir list_dir_perms;
+ allow $1 mail_spool_t:file setattr;
+- rw_files_pattern($1, mail_spool_t, mail_spool_t)
++ manage_files_pattern($1, mail_spool_t, mail_spool_t)
+ read_lnk_files_pattern($1, mail_spool_t, mail_spool_t)
+ ')
+
+@@ -772,6 +784,25 @@
+
+ ########################################
+ ## <summary>
++## read mail queue files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`mta_read_queue',`
++ gen_require(`
++ type mqueue_spool_t;
++ ')
++
++ files_search_spool($1)
++ read_files_pattern($1, mqueue_spool_t, mqueue_spool_t)
++')
++
++########################################
++## <summary>
+ ## Create, read, write, and delete
+ ## mail queue files.
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.6.1/policy/modules/services/mta.te
+--- nsaserefpolicy/policy/modules/services/mta.te 2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/mta.te 2008-11-25 09:45:43.000000000 -0500
+@@ -1,5 +1,5 @@
+
+-policy_module(mta, 2.0.1)
++policy_module(mta, 2.0.0)
+
+ ########################################
+ #
+@@ -47,34 +47,48 @@
+ #
+
+ # newalias required this, not sure if it is needed in 'if' file
+-allow system_mail_t self:capability { dac_override };
++allow system_mail_t self:capability { dac_override fowner };
++allow system_mail_t self:fifo_file rw_fifo_file_perms;
+
+ read_files_pattern(system_mail_t, etc_mail_t, etc_mail_t)
++read_files_pattern(system_mail_t, mailcontent_type, mailcontent_type)
+
+ allow system_mail_t mta_exec_type:file entrypoint;
+
+-allow system_mail_t mailcontent_type:file read_file_perms;
++can_exec(system_mail_t, mta_exec_type)
++
++files_read_all_tmp_files(system_mail_t)
+
+ kernel_read_system_state(system_mail_t)
+ kernel_read_network_state(system_mail_t)
+
++dev_read_sysfs(system_mail_t)
+ dev_read_rand(system_mail_t)
+ dev_read_urand(system_mail_t)
+
++fs_rw_anon_inodefs_files(system_mail_t)
++fs_list_inotifyfs(system_mail_t)
++
++selinux_getattr_fs(system_mail_t)
++
+ init_use_script_ptys(system_mail_t)
+
+ userdom_use_user_terminals(system_mail_t)
+ userdom_dontaudit_search_user_home_dirs(system_mail_t)
+
++logging_append_all_logs(system_mail_t)
++
+ optional_policy(`
+ apache_read_squirrelmail_data(system_mail_t)
+ apache_append_squirrelmail_data(system_mail_t)
++ apache_search_bugzilla_dirs(system_mail_t)
+
+ # apache should set close-on-exec
+ apache_dontaudit_append_log(system_mail_t)
+ apache_dontaudit_rw_stream_sockets(system_mail_t)
+ apache_dontaudit_rw_tcp_sockets(system_mail_t)
+ apache_dontaudit_rw_sys_script_stream_sockets(system_mail_t)
++ apache_dontaudit_rw_bugzilla_script_stream_sockets(system_mail_t)
+ ')
+
+ optional_policy(`
+@@ -88,6 +102,13 @@
+ optional_policy(`
+ cron_read_system_job_tmp_files(system_mail_t)
+ cron_dontaudit_write_pipes(system_mail_t)
++ cron_rw_system_stream_sockets(system_mail_t)
++')
++
++optional_policy(`
++ courier_manage_spool_dirs(system_mail_t)
++ courier_manage_spool_files(system_mail_t)
++ courier_rw_spool_pipes(system_mail_t)
+ ')
+
+ optional_policy(`
+@@ -95,16 +116,16 @@
+ ')
+
+ optional_policy(`
+- logrotate_read_tmp_files(system_mail_t)
++ exim_domtrans(system_mail_t)
++ exim_manage_log(system_mail_t)
+ ')
+
+ optional_policy(`
+- logwatch_read_tmp_files(system_mail_t)
++ logrotate_read_tmp_files(system_mail_t)
+ ')
+
+ optional_policy(`
+- # newaliases runs as system_mail_t when the sendmail initscript does a restart
+- milter_getattr_all_sockets(system_mail_t)
++ logwatch_read_tmp_files(system_mail_t)
+ ')
+
+ optional_policy(`
+@@ -132,10 +153,6 @@
+ # compatability for old default main.cf
+ postfix_config_filetrans(system_mail_t, etc_aliases_t, { dir file lnk_file sock_file fifo_file })
+ ')
+-
+- optional_policy(`
+- cron_rw_tcp_sockets(system_mail_t)
+- ')
+ ')
+
+ optional_policy(`
+@@ -155,6 +172,19 @@
+ ')
+
+ optional_policy(`
++ clamav_stream_connect(system_mail_t)
++ clamav_append_log(system_mail_t)
++')
++
++optional_policy(`
++ fail2ban_append_log(system_mail_t)
++ ')
++
++ optional_policy(`
++ spamd_stream_connect(system_mail_t)
++')
++
++optional_policy(`
+ smartmon_read_tmp_files(system_mail_t)
+ ')
+
+@@ -174,6 +204,23 @@
+ ')
+ ')
+
++read_files_pattern(mailserver_delivery, system_mail_tmp_t, system_mail_tmp_t)
++
++init_stream_connect_script(mailserver_delivery)
++init_rw_script_stream_sockets(mailserver_delivery)
++
++tunable_policy(`use_samba_home_dirs',`
++ fs_manage_cifs_dirs(mailserver_delivery)
++ fs_manage_cifs_files(mailserver_delivery)
++ fs_manage_cifs_symlinks(mailserver_delivery)
++')
++
++tunable_policy(`use_nfs_home_dirs',`
++ fs_manage_nfs_dirs(mailserver_delivery)
++ fs_manage_nfs_files(mailserver_delivery)
++ fs_manage_nfs_symlinks(mailserver_delivery)
++')
++
+ ########################################
+ #
+ # User send mail local policy
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.6.1/policy/modules/services/munin.fc
+--- nsaserefpolicy/policy/modules/services/munin.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/munin.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,4 +1,5 @@
+ /etc/munin(/.*)? gen_context(system_u:object_r:munin_etc_t,s0)
++/etc/rc\.d/init\.d/munin-node -- gen_context(system_u:object_r:munin_initrc_exec_t,s0)
+
+ /usr/bin/munin-.* -- gen_context(system_u:object_r:munin_exec_t,s0)
+ /usr/sbin/munin-.* -- gen_context(system_u:object_r:munin_exec_t,s0)
+@@ -6,6 +7,8 @@
+ /usr/share/munin/plugins/.* -- gen_context(system_u:object_r:munin_exec_t,s0)
+
+ /var/lib/munin(/.*)? gen_context(system_u:object_r:munin_var_lib_t,s0)
+-/var/log/munin.* -- gen_context(system_u:object_r:munin_log_t,s0)
++/var/log/munin.* gen_context(system_u:object_r:munin_log_t,s0)
+ /var/run/munin(/.*)? gen_context(system_u:object_r:munin_var_run_t,s0)
+-/var/www/munin(/.*)? gen_context(system_u:object_r:munin_var_lib_t,s0)
++/var/www/html/munin(/.*)? gen_context(system_u:object_r:httpd_munin_content_t,s0)
++/var/www/html/munin/cgi(/.*)? gen_context(system_u:object_r:httpd_munin_script_exec_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.if serefpolicy-3.6.1/policy/modules/services/munin.if
+--- nsaserefpolicy/policy/modules/services/munin.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/munin.if 2008-11-25 09:45:43.000000000 -0500
+@@ -80,3 +80,76 @@
+
+ dontaudit $1 munin_var_lib_t:dir search_dir_perms;
+ ')
++
++########################################
++## <summary>
++## Allow the specified domain to append
++## to munin log files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`munin_append_log',`
++ gen_require(`
++ type munin_log_t;
++ ')
++
++ logging_search_logs($1)
++ allow $1 munin_log_t:dir list_dir_perms;
++ append_files_pattern($1, munin_log_t, munin_log_t)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an munin environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the munin domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`munin_admin',`
++ gen_require(`
++ type munin_t, munin_etc_t, munin_tmp_t;
++ type munin_log_t, munin_var_lib_t, munin_var_run_t;
++ type httpd_munin_content_t;
++ type munin_initrc_exec_t;
++ ')
++
++ allow $1 munin_t:process { ptrace signal_perms };
++ ps_process_pattern($1, munin_t)
++
++ init_labeled_script_domtrans($1, munin_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 munin_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, munin_tmp_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, munin_log_t)
++
++ files_list_etc($1)
++ admin_pattern($1, munin_etc_t)
++
++ files_list_var_lib($1)
++ admin_pattern($1, munin_var_lib_t)
++
++ files_list_pids($1)
++ admin_pattern($1, munin_var_run_t)
++
++ admin_pattern($1, httpd_munin_content_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.6.1/policy/modules/services/munin.te
+--- nsaserefpolicy/policy/modules/services/munin.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/munin.te 2008-11-25 09:45:43.000000000 -0500
+@@ -13,6 +13,9 @@
+ type munin_etc_t alias lrrd_etc_t;
+ files_config_file(munin_etc_t)
+
++type munin_initrc_exec_t;
++init_script_file(munin_initrc_exec_t)
++
+ type munin_log_t alias lrrd_log_t;
+ logging_log_file(munin_log_t)
+
+@@ -30,21 +33,25 @@
+ # Local policy
+ #
+
+-allow munin_t self:capability { setgid setuid };
++allow munin_t self:capability { chown dac_override setgid setuid sys_rawio };
+ dontaudit munin_t self:capability sys_tty_config;
+ allow munin_t self:process { getsched setsched signal_perms };
+ allow munin_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow munin_t self:unix_dgram_socket { create_socket_perms sendto };
+ allow munin_t self:tcp_socket create_stream_socket_perms;
+ allow munin_t self:udp_socket create_socket_perms;
++allow munin_t self:fifo_file manage_fifo_file_perms;
++
++can_exec(munin_t, munin_exec_t)
+
+ allow munin_t munin_etc_t:dir list_dir_perms;
+ read_files_pattern(munin_t, munin_etc_t, munin_etc_t)
+ read_lnk_files_pattern(munin_t, munin_etc_t, munin_etc_t)
+ files_search_etc(munin_t)
+
+-allow munin_t munin_log_t:file manage_file_perms;
+-logging_log_filetrans(munin_t, munin_log_t, file)
++manage_dirs_pattern(munin_t, munin_log_t, munin_log_t)
++manage_files_pattern(munin_t, munin_log_t, munin_log_t)
++logging_log_filetrans(munin_t, munin_log_t, { file dir })
+
+ manage_dirs_pattern(munin_t, munin_tmp_t, munin_tmp_t)
+ manage_files_pattern(munin_t, munin_tmp_t, munin_tmp_t)
+@@ -61,9 +68,11 @@
+ files_pid_filetrans(munin_t, munin_var_run_t, file)
+
+ kernel_read_system_state(munin_t)
+-kernel_read_kernel_sysctls(munin_t)
++kernel_read_network_state(munin_t)
++kernel_read_all_sysctls(munin_t)
+
+ corecmd_exec_bin(munin_t)
++corecmd_exec_shell(munin_t)
+
+ corenet_all_recvfrom_unlabeled(munin_t)
+ corenet_all_recvfrom_netlabel(munin_t)
+@@ -73,24 +82,34 @@
+ corenet_udp_sendrecv_all_nodes(munin_t)
+ corenet_tcp_sendrecv_all_ports(munin_t)
+ corenet_udp_sendrecv_all_ports(munin_t)
++corenet_tcp_bind_munin_port(munin_t)
++corenet_tcp_connect_munin_port(munin_t)
++corenet_tcp_connect_http_port(munin_t)
++corenet_tcp_bind_all_nodes(munin_t)
+
+ dev_read_sysfs(munin_t)
+ dev_read_urand(munin_t)
+
+ domain_use_interactive_fds(munin_t)
++domain_read_all_domains_state(munin_t)
+
+ files_read_etc_files(munin_t)
+ files_read_etc_runtime_files(munin_t)
+ files_read_usr_files(munin_t)
++files_list_spool(munin_t)
+
+ fs_getattr_all_fs(munin_t)
+ fs_search_auto_mountpoints(munin_t)
+
++auth_use_nsswitch(munin_t)
++
+ logging_send_syslog_msg(munin_t)
+
++miscfiles_read_fonts(munin_t)
+ miscfiles_read_localization(munin_t)
+
+-sysnet_read_config(munin_t)
++sysnet_exec_ifconfig(munin_t)
++netutils_domtrans_ping(munin_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(munin_t)
+ userdom_dontaudit_search_user_home_dirs(munin_t)
+@@ -105,7 +124,21 @@
+ ')
+
+ optional_policy(`
+- nis_use_ypbind(munin_t)
++ fstools_domtrans(munin_t)
++')
++
++optional_policy(`
++ mta_read_config(munin_t)
++ mta_send_mail(munin_t)
++')
++
++optional_policy(`
++ mysql_read_config(munin_t)
++ mysql_stream_connect(munin_t)
++')
++
++optional_policy(`
++ sendmail_read_log(munin_t)
+ ')
+
+ optional_policy(`
+@@ -115,3 +148,9 @@
+ optional_policy(`
+ udev_read_db(munin_t)
+ ')
++
++#============= http munin policy ==============
++apache_content_template(munin)
++
++manage_dirs_pattern(munin_t, httpd_munin_content_t, httpd_munin_content_t)
++manage_files_pattern(munin_t, httpd_munin_content_t, httpd_munin_content_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.6.1/policy/modules/services/nagios.fc
+--- nsaserefpolicy/policy/modules/services/nagios.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/nagios.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,16 +1,19 @@
+ /etc/nagios(/.*)? gen_context(system_u:object_r:nagios_etc_t,s0)
+ /etc/nagios/nrpe\.cfg -- gen_context(system_u:object_r:nrpe_etc_t,s0)
++/etc/rc\.d/init\.d/nagios -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/nrpe -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
+
+ /usr/bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0)
+ /usr/bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0)
+
+-/usr/lib(64)?/cgi-bin/netsaint/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
+-/usr/lib(64)?/nagios/cgi/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
++/usr/lib(64)?/nagios/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
+
+ /var/log/nagios(/.*)? gen_context(system_u:object_r:nagios_log_t,s0)
+-/var/log/netsaint(/.*)? gen_context(system_u:object_r:nagios_log_t,s0)
++
++/var/spool/nagios(/.*)? gen_context(system_u:object_r:nagios_spool_t,s0)
+
+ ifdef(`distro_debian',`
+ /usr/sbin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0)
+-/usr/lib/cgi-bin/nagios/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
+ ')
++/usr/lib(64)?/cgi-bin/nagios(/.+)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.6.1/policy/modules/services/nagios.if
+--- nsaserefpolicy/policy/modules/services/nagios.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/nagios.if 2008-11-25 09:45:43.000000000 -0500
+@@ -44,7 +44,7 @@
+
+ ########################################
+ ## <summary>
+-## Execute the nagios CGI with
++## Execute the nagios NRPE with
+ ## a domain transition.
+ ## </summary>
+ ## <param name="domain">
+@@ -53,18 +53,37 @@
+ ## </summary>
+ ## </param>
+ #
+-interface(`nagios_domtrans_cgi',`
++interface(`nagios_domtrans_nrpe',`
+ gen_require(`
+- type nagios_cgi_t, nagios_cgi_exec_t;
++ type nrpe_t, nrpe_exec_t;
+ ')
+
+- domtrans_pattern($1, nagios_cgi_exec_t, nagios_cgi_t)
++ domtrans_pattern($1, nrpe_exec_t, nrpe_t)
+ ')
+
+ ########################################
+ ## <summary>
+-## Execute the nagios NRPE with
+-## a domain transition.
++## Do not audit attempts to read and write
++## NAGIOS unnamed pipes.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`nagios_dontaudit_rw_pipes',`
++
++ gen_require(`
++ type nagios_t;
++ ')
++
++ dontaudit $1 nagios_t:fifo_file rw_fifo_file_perms;
++')
++
++########################################
++## <summary>
++## Search nagios spool directories.
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+@@ -72,10 +91,63 @@
+ ## </summary>
+ ## </param>
+ #
+-interface(`nagios_domtrans_nrpe',`
++interface(`nagios_search_spool',`
+ gen_require(`
+- type nrpe_t, nrpe_exec_t;
++ type nagios_spool_t;
+ ')
+
+- domtrans_pattern($1, nrpe_exec_t, nrpe_t)
++ allow $1 nagios_spool_t:dir search_dir_perms;
++ files_search_spool($1)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an nagios environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the nagios domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`nagios_admin',`
++ gen_require(`
++ type nagios_t, nrpe_t;
++ type nagios_tmp_t, nagios_log_t;
++ type nagios_etc_t, nrpe_etc_t;
++ type nagios_spool_t, nagios_var_run_t;
++ type nagios_initrc_exec_t;
++ ')
++
++ allow $1 nagios_t:process { ptrace signal_perms };
++ ps_process_pattern($1, nagios_t)
++
++ init_labeled_script_domtrans($1, nagios_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 nagios_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, nagios_tmp_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, nagios_log_t)
++
++ files_list_etc($1)
++ admin_pattern($1, nagios_etc_t)
++
++ files_list_spool($1)
++ admin_pattern($1, nagios_spool_t)
++
++ files_list_pids($1)
++ admin_pattern($1, nagios_var_run_t)
++
++ admin_pattern($1, nrpe_etc_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.6.1/policy/modules/services/nagios.te
+--- nsaserefpolicy/policy/modules/services/nagios.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/nagios.te 2008-11-25 09:45:43.000000000 -0500
+@@ -10,13 +10,12 @@
+ type nagios_exec_t;
+ init_daemon_domain(nagios_t, nagios_exec_t)
+
+-type nagios_cgi_t;
+-type nagios_cgi_exec_t;
+-init_system_domain(nagios_cgi_t, nagios_cgi_exec_t)
+-
+ type nagios_etc_t;
+ files_config_file(nagios_etc_t)
+
++type nagios_initrc_exec_t;
++init_script_file(nagios_initrc_exec_t)
++
+ type nagios_log_t;
+ logging_log_file(nagios_log_t)
+
+@@ -26,6 +25,9 @@
+ type nagios_var_run_t;
+ files_pid_file(nagios_var_run_t)
+
++type nagios_spool_t;
++files_type(nagios_spool_t)
++
+ type nrpe_t;
+ type nrpe_exec_t;
+ init_daemon_domain(nrpe_t, nrpe_exec_t)
+@@ -60,6 +62,8 @@
+ manage_files_pattern(nagios_t, nagios_var_run_t, nagios_var_run_t)
+ files_pid_filetrans(nagios_t, nagios_var_run_t, file)
+
++rw_fifo_files_pattern(nagios_t, nagios_spool_t, nagios_spool_t)
++
+ kernel_read_system_state(nagios_t)
+ kernel_read_kernel_sysctls(nagios_t)
+
+@@ -127,39 +131,34 @@
+ #
+ # Nagios CGI local policy
+ #
++apache_content_template(nagios)
++typealias httpd_nagios_script_t alias nagios_cgi_t;
++typealias httpd_nagios_script_exec_t alias nagios_cgi_exec_t;
+
+-allow nagios_cgi_t self:process signal_perms;
+-allow nagios_cgi_t self:fifo_file rw_fifo_file_perms;
++allow httpd_nagios_script_t self:process signal_perms;
+
+-read_files_pattern(nagios_cgi_t, nagios_t, nagios_t)
+-read_lnk_files_pattern(nagios_cgi_t, nagios_t, nagios_t)
++read_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
++read_lnk_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
+
+-allow nagios_cgi_t nagios_etc_t:dir list_dir_perms;
+-read_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_etc_t)
+-read_lnk_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_etc_t)
++files_search_spool(httpd_nagios_script_t)
++rw_fifo_files_pattern(httpd_nagios_script_t, nagios_spool_t, nagios_spool_t)
+
+-allow nagios_cgi_t nagios_log_t:dir list_dir_perms;
+-read_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t)
+-read_lnk_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t)
++allow httpd_nagios_script_t nagios_etc_t:dir list_dir_perms;
++read_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_etc_t)
++read_lnk_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_etc_t)
+
+-kernel_read_system_state(nagios_cgi_t)
++allow httpd_nagios_script_t nagios_log_t:dir list_dir_perms;
++read_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_log_t)
++read_lnk_files_pattern(httpd_nagios_script_t, nagios_etc_t, nagios_log_t)
+
+-corecmd_exec_bin(nagios_cgi_t)
++kernel_read_system_state(httpd_nagios_script_t)
+
+-domain_dontaudit_read_all_domains_state(nagios_cgi_t)
++domain_dontaudit_read_all_domains_state(httpd_nagios_script_t)
+
+-files_read_etc_files(nagios_cgi_t)
+-files_read_etc_runtime_files(nagios_cgi_t)
+-files_read_kernel_symbol_table(nagios_cgi_t)
++files_read_etc_runtime_files(httpd_nagios_script_t)
++files_read_kernel_symbol_table(httpd_nagios_script_t)
+
+-logging_send_syslog_msg(nagios_cgi_t)
+-logging_search_logs(nagios_cgi_t)
+-
+-miscfiles_read_localization(nagios_cgi_t)
+-
+-optional_policy(`
+- apache_append_log(nagios_cgi_t)
+-')
++logging_send_syslog_msg(httpd_nagios_script_t)
+
+ ########################################
+ #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.6.1/policy/modules/services/networkmanager.fc
+--- nsaserefpolicy/policy/modules/services/networkmanager.fc 2008-09-24 09:07:28.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/networkmanager.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,8 +1,12 @@
++/etc/NetworkManager/dispatcher\.d(/.*) gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
++
+ /sbin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0)
+ /sbin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
+
+ /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)
++/usr/sbin/NetworkManagerDispatcher -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
++/usr/sbin/nm-system-settings -- gen_context(system_u:object_r:NetworkManager_exec_t,s0)
+
+ /var/log/wpa_supplicant.* -- gen_context(system_u:object_r:NetworkManager_log_t,s0)
+
+@@ -10,3 +14,6 @@
+ /var/run/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
+ /var/run/wpa_supplicant(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
+ /var/run/wpa_supplicant-global -s gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
++/var/run/nm-dhclient.* gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
++
++/usr/libexec/nm-openconnect-service -- gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.6.1/policy/modules/services/networkmanager.if
+--- nsaserefpolicy/policy/modules/services/networkmanager.if 2008-09-11 11:28:34.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/networkmanager.if 2008-11-25 09:45:43.000000000 -0500
+@@ -118,6 +118,24 @@
+
+ ########################################
+ ## <summary>
++## Execute NetworkManager scripts with an automatic domain transition to initrc.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`networkmanager_initrc_domtrans',`
++ gen_require(`
++ type NetworkManager_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, NetworkManager_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## Read NetworkManager PID files.
+ ## </summary>
+ ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.1/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/networkmanager.te 2008-12-02 11:38:08.000000000 -0500
+@@ -33,9 +33,9 @@
+
+ # networkmanager will ptrace itself if gdb is installed
+ # and it receives a unexpected signal (rh bug #204161)
+-allow NetworkManager_t self:capability { kill setgid setuid dac_override net_admin net_raw net_bind_service ipc_lock };
++allow NetworkManager_t self:capability { chown fsetid kill setgid setuid sys_admin sys_nice sys_ptrace dac_override net_admin net_raw net_bind_service ipc_lock };
+ dontaudit NetworkManager_t self:capability { sys_tty_config sys_ptrace };
+-allow NetworkManager_t self:process { ptrace setcap setpgid getsched signal_perms };
++allow NetworkManager_t self:process { ptrace getcap setcap setpgid getsched setsched signal_perms };
+ allow NetworkManager_t self:fifo_file rw_fifo_file_perms;
+ allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
+ allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
+@@ -51,8 +51,8 @@
+ manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t)
+ logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file)
+
+-rw_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
+-files_search_tmp(NetworkManager_t)
++manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
++files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, sock_file)
+
+ manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
+ manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
+@@ -63,6 +63,8 @@
+ kernel_read_network_state(NetworkManager_t)
+ kernel_read_kernel_sysctls(NetworkManager_t)
+ kernel_load_module(NetworkManager_t)
++kernel_read_debugfs(NetworkManager_t)
++kernel_rw_net_sysctls(NetworkManager_t)
+
+ corenet_all_recvfrom_unlabeled(NetworkManager_t)
+ corenet_all_recvfrom_netlabel(NetworkManager_t)
+@@ -81,13 +83,18 @@
+ corenet_sendrecv_isakmp_server_packets(NetworkManager_t)
+ corenet_sendrecv_dhcpc_server_packets(NetworkManager_t)
+ corenet_sendrecv_all_client_packets(NetworkManager_t)
++corenet_rw_tun_tap_dev(NetworkManager_t)
++corenet_getattr_ppp_dev(NetworkManager_t)
+
+ dev_read_sysfs(NetworkManager_t)
+ dev_read_rand(NetworkManager_t)
+ dev_read_urand(NetworkManager_t)
++dev_dontaudit_getattr_generic_blk_files(NetworkManager_t)
++dev_getattr_all_chr_files(NetworkManager_t)
+
+ fs_getattr_all_fs(NetworkManager_t)
+ fs_search_auto_mountpoints(NetworkManager_t)
++fs_list_inotifyfs(NetworkManager_t)
+
+ mls_file_read_all_levels(NetworkManager_t)
+
+@@ -104,9 +111,14 @@
+ files_read_etc_runtime_files(NetworkManager_t)
+ files_read_usr_files(NetworkManager_t)
+
++storage_getattr_fixed_disk_dev(NetworkManager_t)
++
+ init_read_utmp(NetworkManager_t)
++init_dontaudit_write_utmp(NetworkManager_t)
+ init_domtrans_script(NetworkManager_t)
+
++auth_use_nsswitch(NetworkManager_t)
++
+ logging_send_syslog_msg(NetworkManager_t)
+
+ miscfiles_read_localization(NetworkManager_t)
+@@ -116,25 +128,40 @@
+
+ seutil_read_config(NetworkManager_t)
+
+-sysnet_domtrans_ifconfig(NetworkManager_t)
+-sysnet_domtrans_dhcpc(NetworkManager_t)
+-sysnet_signal_dhcpc(NetworkManager_t)
+-sysnet_read_dhcpc_pid(NetworkManager_t)
++sysnet_etc_filetrans_config(NetworkManager_t)
+ sysnet_delete_dhcpc_pid(NetworkManager_t)
+-sysnet_search_dhcp_state(NetworkManager_t)
+-# in /etc created by NetworkManager will be labelled net_conf_t.
++sysnet_domtrans_dhcpc(NetworkManager_t)
++sysnet_domtrans_ifconfig(NetworkManager_t)
++sysnet_kill_dhcpc(NetworkManager_t)
+ sysnet_manage_config(NetworkManager_t)
+-sysnet_etc_filetrans_config(NetworkManager_t)
++sysnet_read_dhcp_config(NetworkManager_t)
++sysnet_read_dhcpc_pid(NetworkManager_t)
++sysnet_delete_dhcpc_state(NetworkManager_t)
++sysnet_read_dhcpc_state(NetworkManager_t)
++sysnet_signal_dhcpc(NetworkManager_t)
+
++userdom_stream_connect(NetworkManager_t)
+ userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
+ userdom_dontaudit_use_user_ttys(NetworkManager_t)
+ # Read gnome-keyring
+ userdom_read_user_home_content_files(NetworkManager_t)
++userdom_dgram_send(NetworkManager_t)
++
++cron_read_system_job_lib_files(NetworkManager_t)
++
++optional_policy(`
++ avahi_domtrans(NetworkManager_t)
++ avahi_kill(NetworkManager_t)
++ avahi_signal(NetworkManager_t)
++ avahi_signull(NetworkManager_t)
++')
+
+ optional_policy(`
+ bind_domtrans(NetworkManager_t)
+ bind_manage_cache(NetworkManager_t)
++ bind_kill(NetworkManager_t)
+ bind_signal(NetworkManager_t)
++ bind_signull(NetworkManager_t)
+ ')
+
+ optional_policy(`
+@@ -146,8 +173,25 @@
+ ')
+
+ optional_policy(`
+- dbus_system_bus_client(NetworkManager_t)
+- dbus_connect_system_bus(NetworkManager_t)
++ dbus_system_domain(NetworkManager_t, NetworkManager_exec_t)
++
++ optional_policy(`
++ consolekit_dbus_chat(NetworkManager_t)
++ ')
++')
++
++optional_policy(`
++ dnsmasq_read_pid_files(NetworkManager_t)
++ dnsmasq_delete_pid_files(NetworkManager_t)
++ dnsmasq_domtrans(NetworkManager_t)
++ dnsmasq_initrc_domtrans(NetworkManager_t)
++ dnsmasq_kill(NetworkManager_t)
++ dnsmasq_signal(NetworkManager_t)
++ dnsmasq_signull(NetworkManager_t)
++')
++
++optional_policy(`
++ hal_write_log(NetworkManager_t)
+ ')
+
+ optional_policy(`
+@@ -155,23 +199,48 @@
+ ')
+
+ optional_policy(`
+- nis_use_ypbind(NetworkManager_t)
++ iptables_domtrans(NetworkManager_t)
+ ')
+
+ optional_policy(`
+- nscd_socket_use(NetworkManager_t)
++ nscd_domtrans(NetworkManager_t)
+ nscd_signal(NetworkManager_t)
++ nscd_signull(NetworkManager_t)
++ nscd_kill(NetworkManager_t)
++ nscd_initrc_domtrans(NetworkManager_t)
++')
++
++optional_policy(`
++ # Dispatcher starting and stoping ntp
++ ntp_initrc_domtrans(NetworkManager_t)
+ ')
+
+ optional_policy(`
+ openvpn_domtrans(NetworkManager_t)
++ openvpn_kill(NetworkManager_t)
+ openvpn_signal(NetworkManager_t)
++ openvpn_signull(NetworkManager_t)
++')
++
++optional_policy(`
++ polkit_domtrans_auth(NetworkManager_t)
++ polkit_read_lib(NetworkManager_t)
+ ')
+
+ optional_policy(`
++ ppp_initrc_domtrans(NetworkManager_t)
+ ppp_domtrans(NetworkManager_t)
+ ppp_read_pid_files(NetworkManager_t)
++ ppp_kill(NetworkManager_t)
+ ppp_signal(NetworkManager_t)
++ ppp_signull(NetworkManager_t)
++ ppp_read_config(NetworkManager_t)
++')
++
++optional_policy(`
++ rpm_exec(NetworkManager_t)
++ rpm_read_db(NetworkManager_t)
++ rpm_dontaudit_manage_db(NetworkManager_t)
+ ')
+
+ optional_policy(`
+@@ -184,7 +253,9 @@
+
+ optional_policy(`
+ vpn_domtrans(NetworkManager_t)
++ vpn_kill(NetworkManager_t)
+ vpn_signal(NetworkManager_t)
++ vpn_signull(NetworkManager_t)
+ ')
+
+ ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.6.1/policy/modules/services/nis.fc
+--- nsaserefpolicy/policy/modules/services/nis.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/nis.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,9 +1,13 @@
+-
++/etc/rc\.d/init\.d/ypbind -- gen_context(system_u:object_r:ypbind_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/yppasswd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/ypserv -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/ypxfrd -- gen_context(system_u:object_r:nis_initrc_exec_t,s0)
+ /etc/ypserv\.conf -- gen_context(system_u:object_r:ypserv_conf_t,s0)
+
+ /sbin/ypbind -- gen_context(system_u:object_r:ypbind_exec_t,s0)
+
+ /usr/lib/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0)
++/usr/lib64/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0)
+
+ /usr/sbin/rpc\.yppasswdd -- gen_context(system_u:object_r:yppasswdd_exec_t,s0)
+ /usr/sbin/rpc\.ypxfrd -- gen_context(system_u:object_r:ypxfr_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.6.1/policy/modules/services/nis.if
+--- nsaserefpolicy/policy/modules/services/nis.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/nis.if 2008-11-25 13:29:15.000000000 -0500
+@@ -28,7 +28,7 @@
+ type var_yp_t;
+ ')
+
+- dontaudit $1 self:capability net_bind_service;
++ allow $1 self:capability net_bind_service;
+
+ allow $1 self:tcp_socket create_stream_socket_perms;
+ allow $1 self:udp_socket create_socket_perms;
+@@ -49,8 +49,8 @@
+ corenet_udp_bind_all_nodes($1)
+ corenet_tcp_bind_generic_port($1)
+ corenet_udp_bind_generic_port($1)
+- corenet_tcp_bind_reserved_port($1)
+- corenet_udp_bind_reserved_port($1)
++ corenet_dontaudit_tcp_bind_all_reserved_ports($1)
++ corenet_dontaudit_udp_bind_all_reserved_ports($1)
+ corenet_dontaudit_tcp_bind_all_ports($1)
+ corenet_dontaudit_udp_bind_all_ports($1)
+ corenet_tcp_connect_portmap_port($1)
+@@ -87,6 +87,25 @@
+
+ ########################################
+ ## <summary>
++## Use the nis to authenticate passwords
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`nis_authenticate',`
++ tunable_policy(`allow_ypbind',`
++ nis_use_ypbind_uncond($1)
++ corenet_tcp_bind_all_rpc_ports($1)
++ corenet_udp_bind_all_rpc_ports($1)
++ ')
++')
++
++########################################
++## <summary>
+ ## Execute ypbind in the ypbind domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -244,3 +263,104 @@
+ corecmd_search_bin($1)
+ domtrans_pattern($1, ypxfr_exec_t, ypxfr_t)
+ ')
++
++########################################
++## <summary>
++## Execute nis server in the nis domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++#
++interface(`nis_initrc_domtrans',`
++ gen_require(`
++ type nis_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, nis_initrc_exec_t)
++')
++
++########################################
++## <summary>
++## Execute nis server in the nis domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`nis_ypbind_initrc_domtrans',`
++ gen_require(`
++ type ypbind_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, ypbind_initrc_exec_t)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an nis environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the nis domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`nis_admin',`
++ gen_require(`
++ type ypbind_t, yppasswdd_t;
++ type ypserv_t, ypxfr_t;
++ type ypbind_tmp_t, ypserv_tmp_t, ypserv_conf_t;
++ type ypbind_var_run_t, yppasswdd_var_run_t, ypserv_var_run_t;
++ type ypbind_initrc_exec_t;
++ type nis_initrc_exec_t;
++ ')
++
++ allow $1 ypbind_t:process { ptrace signal_perms };
++ ps_process_pattern($1, ypbind_t)
++
++ allow $1 yppasswdd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, yppasswdd_t)
++
++ allow $1 ypserv_t:process { ptrace signal_perms };
++ ps_process_pattern($1, ypserv_t)
++
++ allow $1 ypxfr_t:process { ptrace signal_perms };
++ ps_process_pattern($1, ypxfr_t)
++
++ nis_initrc_domtrans($1)
++ nis_ypbind_initrc_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 nis_initrc_exec_t system_r;
++ role_transition $2 ypbind_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, ypbind_tmp_t)
++
++ files_list_pids($1)
++ admin_pattern($1, ypbind_var_run_t)
++
++ admin_pattern($1, yppasswdd_var_run_t)
++
++ files_list_etc($1)
++ admin_pattern($1, ypserv_conf_t)
++
++ admin_pattern($1, ypserv_tmp_t)
++
++ admin_pattern($1, ypserv_var_run_t)
++')
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.6.1/policy/modules/services/nis.te
+--- nsaserefpolicy/policy/modules/services/nis.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/nis.te 2008-11-25 09:45:43.000000000 -0500
+@@ -13,6 +13,9 @@
+ type ypbind_exec_t;
+ init_daemon_domain(ypbind_t, ypbind_exec_t)
+
++type ypbind_initrc_exec_t;
++init_script_file(ypbind_initrc_exec_t)
++
+ type ypbind_tmp_t;
+ files_tmp_file(ypbind_tmp_t)
+
+@@ -44,6 +47,9 @@
+ type ypxfr_exec_t;
+ init_daemon_domain(ypxfr_t, ypxfr_exec_t)
+
++type nis_initrc_exec_t;
++init_script_file(nis_initrc_exec_t)
++
+ ########################################
+ #
+ # ypbind local policy
+@@ -111,6 +117,16 @@
+ userdom_dontaudit_search_user_home_dirs(ypbind_t)
+
+ optional_policy(`
++ dbus_system_bus_client(ypbind_t)
++ dbus_connect_system_bus(ypbind_t)
++ init_dbus_chat_script(ypbind_t)
++
++ optional_policy(`
++ networkmanager_dbus_chat(ypbind_t)
++ ')
++')
++
++optional_policy(`
+ seutil_sigchld_newrole(ypbind_t)
+ ')
+
+@@ -123,6 +139,7 @@
+ # yppasswdd local policy
+ #
+
++allow yppasswdd_t self:capability dac_override;
+ dontaudit yppasswdd_t self:capability sys_tty_config;
+ allow yppasswdd_t self:fifo_file rw_fifo_file_perms;
+ allow yppasswdd_t self:process { setfscreate signal_perms };
+@@ -153,8 +170,8 @@
+ corenet_udp_sendrecv_all_ports(yppasswdd_t)
+ corenet_tcp_bind_all_nodes(yppasswdd_t)
+ corenet_udp_bind_all_nodes(yppasswdd_t)
+-corenet_tcp_bind_reserved_port(yppasswdd_t)
+-corenet_udp_bind_reserved_port(yppasswdd_t)
++corenet_tcp_bind_all_rpc_ports(yppasswdd_t)
++corenet_udp_bind_all_rpc_ports(yppasswdd_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(yppasswdd_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(yppasswdd_t)
+ corenet_sendrecv_generic_server_packets(yppasswdd_t)
+@@ -241,6 +258,8 @@
+ corenet_udp_bind_all_nodes(ypserv_t)
+ corenet_tcp_bind_reserved_port(ypserv_t)
+ corenet_udp_bind_reserved_port(ypserv_t)
++corenet_tcp_bind_all_rpc_ports(ypserv_t)
++corenet_udp_bind_all_rpc_ports(ypserv_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(ypserv_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(ypserv_t)
+ corenet_sendrecv_generic_server_packets(ypserv_t)
+@@ -306,6 +325,8 @@
+ corenet_udp_bind_all_nodes(ypxfr_t)
+ corenet_tcp_bind_reserved_port(ypxfr_t)
+ corenet_udp_bind_reserved_port(ypxfr_t)
++corenet_tcp_bind_all_rpc_ports(ypxfr_t)
++corenet_udp_bind_all_rpc_ports(ypxfr_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t)
+ corenet_tcp_connect_all_ports(ypxfr_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.fc serefpolicy-3.6.1/policy/modules/services/nscd.fc
+--- nsaserefpolicy/policy/modules/services/nscd.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/nscd.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,3 +1,4 @@
++/etc/rc\.d/init\.d/nscd -- gen_context(system_u:object_r:nscd_initrc_exec_t,s0)
+
+ /usr/sbin/nscd -- gen_context(system_u:object_r:nscd_exec_t,s0)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.6.1/policy/modules/services/nscd.if
+--- nsaserefpolicy/policy/modules/services/nscd.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/nscd.if 2008-11-25 09:45:43.000000000 -0500
+@@ -58,6 +58,42 @@
+
+ ########################################
+ ## <summary>
++## Send NSCD the kill signal.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nscd_kill',`
++ gen_require(`
++ type nscd_t;
++ ')
++
++ allow $1 nscd_t:process sigkill;
++')
++
++########################################
++## <summary>
++## Send signulls to NSCD.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`nscd_signull',`
++ gen_require(`
++ type nscd_t;
++ ')
++
++ allow $1 nscd_t:process signull;
++')
++
++########################################
++## <summary>
+ ## Use NSCD services by connecting using
+ ## a unix stream socket.
+ ## </summary>
+@@ -70,15 +106,14 @@
+ interface(`nscd_socket_use',`
+ gen_require(`
+ type nscd_t, nscd_var_run_t;
+- class nscd { getpwd getgrp gethost shmempwd shmemgrp shmemhost };
++ class nscd { getserv getpwd getgrp gethost shmempwd shmemgrp shmemhost shmemserv };
+ ')
+
+ allow $1 self:unix_stream_socket create_socket_perms;
+
+ allow $1 nscd_t:nscd { getpwd getgrp gethost };
+ dontaudit $1 nscd_t:fd use;
+- dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost };
+-
++ dontaudit $1 nscd_t:nscd { getserv shmempwd shmemgrp shmemhost shmemserv };
+ files_search_pids($1)
+ stream_connect_pattern($1, nscd_var_run_t, nscd_var_run_t, nscd_t)
+ dontaudit $1 nscd_var_run_t:file { getattr read };
+@@ -198,3 +233,60 @@
+ nscd_domtrans($1)
+ role $2 types nscd_t;
+ ')
++
++########################################
++## <summary>
++## Execute nscd server in the nscd domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`nscd_initrc_domtrans',`
++ gen_require(`
++ type nscd_initrc_exec_t;
++')
++
++ init_labeled_script_domtrans($1, nscd_initrc_exec_t)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an nscd environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the nscd domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`nscd_admin',`
++ gen_require(`
++ type nscd_t, nscd_log_t, nscd_var_run_t;
++ type nscd_initrc_exec_t;
++ ')
++
++ allow $1 nscd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, nscd_t)
++
++ nscd_initrc_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 nscd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ logging_list_logs($1)
++ admin_pattern($1, nscd_log_t)
++
++ files_list_pids($1)
++ admin_pattern($1, nscd_var_run_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.6.1/policy/modules/services/nscd.te
+--- nsaserefpolicy/policy/modules/services/nscd.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/nscd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -20,6 +20,9 @@
+ type nscd_exec_t;
+ init_daemon_domain(nscd_t, nscd_exec_t)
+
++type nscd_initrc_exec_t;
++init_script_file(nscd_initrc_exec_t)
++
+ type nscd_log_t;
+ logging_log_file(nscd_log_t)
+
+@@ -28,14 +31,14 @@
+ # Local policy
+ #
+
+-allow nscd_t self:capability { kill setgid setuid audit_write };
++allow nscd_t self:capability { kill setgid setuid };
+ dontaudit nscd_t self:capability sys_tty_config;
+-allow nscd_t self:process { getattr setsched signal_perms };
++allow nscd_t self:process { getattr getcap setcap setsched signal_perms };
+ allow nscd_t self:fifo_file read_fifo_file_perms;
+ allow nscd_t self:unix_stream_socket create_stream_socket_perms;
+ allow nscd_t self:unix_dgram_socket create_socket_perms;
+ allow nscd_t self:netlink_selinux_socket create_socket_perms;
+-allow nscd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++
+ allow nscd_t self:tcp_socket create_socket_perms;
+ allow nscd_t self:udp_socket create_socket_perms;
+
+@@ -50,6 +53,8 @@
+ manage_sock_files_pattern(nscd_t, nscd_var_run_t, nscd_var_run_t)
+ files_pid_filetrans(nscd_t, nscd_var_run_t, { file sock_file })
+
++can_exec(nscd_t, nscd_exec_t)
++
+ kernel_read_kernel_sysctls(nscd_t)
+ kernel_list_proc(nscd_t)
+ kernel_read_proc_symlinks(nscd_t)
+@@ -60,6 +65,7 @@
+
+ fs_getattr_all_fs(nscd_t)
+ fs_search_auto_mountpoints(nscd_t)
++fs_list_inotifyfs(nscd_t)
+
+ # for when /etc/passwd has just been updated and has the wrong type
+ auth_getattr_shadow(nscd_t)
+@@ -73,6 +79,7 @@
+ corenet_udp_sendrecv_all_nodes(nscd_t)
+ corenet_tcp_sendrecv_all_ports(nscd_t)
+ corenet_udp_sendrecv_all_ports(nscd_t)
++corenet_udp_bind_all_nodes(nscd_t)
+ corenet_tcp_connect_all_ports(nscd_t)
+ corenet_sendrecv_all_client_packets(nscd_t)
+ corenet_rw_tun_tap_dev(nscd_t)
+@@ -84,12 +91,14 @@
+ selinux_compute_relabel_context(nscd_t)
+ selinux_compute_user_contexts(nscd_t)
+ domain_use_interactive_fds(nscd_t)
++domain_search_all_domains_state(nscd_t)
+
+ files_read_etc_files(nscd_t)
+ files_read_generic_tmp_symlinks(nscd_t)
+ # Needed to read files created by firstboot "/etc/hesiod.conf"
+ files_read_etc_runtime_files(nscd_t)
+
++logging_send_audit_msgs(nscd_t)
+ logging_send_syslog_msg(nscd_t)
+
+ miscfiles_read_localization(nscd_t)
+@@ -105,6 +114,14 @@
+ userdom_dontaudit_search_user_home_dirs(nscd_t)
+
+ optional_policy(`
++ cron_read_system_job_tmp_files(nscd_t)
++')
++
++optional_policy(`
++ kerberos_use(nscd_t)
++')
++
++optional_policy(`
+ udev_read_db(nscd_t)
+ ')
+
+@@ -112,3 +129,12 @@
+ xen_dontaudit_rw_unix_stream_sockets(nscd_t)
+ xen_append_log(nscd_t)
+ ')
++
++optional_policy(`
++ tunable_policy(`samba_domain_controller',`
++ samba_append_log(nscd_t)
++ samba_dontaudit_use_fds(nscd_t)
++ ')
++ samba_read_config(nscd_t)
++ samba_read_var_files(nscd_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.6.1/policy/modules/services/ntp.if
+--- nsaserefpolicy/policy/modules/services/ntp.if 2008-10-14 11:58:09.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/ntp.if 2008-11-25 09:45:43.000000000 -0500
+@@ -56,6 +56,24 @@
+
+ ########################################
+ ## <summary>
++## Execute ntp server in the ntpd domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`ntp_initrc_domtrans',`
++ gen_require(`
++ type ntpd_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, ntpd_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## All of the rules required to administrate
+ ## an ntp environment
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.6.1/policy/modules/services/ntp.te
+--- nsaserefpolicy/policy/modules/services/ntp.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ntp.te 2008-11-25 09:45:43.000000000 -0500
+@@ -42,6 +42,7 @@
+ dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
+ allow ntpd_t self:process { signal_perms getcap setcap setsched setrlimit };
+ allow ntpd_t self:fifo_file rw_fifo_file_perms;
++allow ntpd_t self:shm create_shm_perms;
+ allow ntpd_t self:unix_dgram_socket create_socket_perms;
+ allow ntpd_t self:unix_stream_socket create_socket_perms;
+ allow ntpd_t self:tcp_socket create_stream_socket_perms;
+@@ -90,6 +91,8 @@
+
+ fs_getattr_all_fs(ntpd_t)
+ fs_search_auto_mountpoints(ntpd_t)
++# Necessary to communicate with gpsd devices
++fs_rw_tmpfs_files(ntpd_t)
+
+ term_use_ptmx(ntpd_t)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.6.1/policy/modules/services/oddjob.fc
+--- nsaserefpolicy/policy/modules/services/oddjob.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/oddjob.fc 2008-11-25 09:45:43.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)
+
+ /usr/sbin/oddjobd -- gen_context(system_u:object_r:oddjob_exec_t,s0)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.6.1/policy/modules/services/oddjob.if
+--- nsaserefpolicy/policy/modules/services/oddjob.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/oddjob.if 2008-11-25 09:45:43.000000000 -0500
+@@ -44,6 +44,7 @@
+ ')
+
+ domtrans_pattern(oddjob_t, $2, $1)
++ domain_user_exemption_target($1)
+ ')
+
+ ########################################
+@@ -84,3 +85,28 @@
+
+ domtrans_pattern($1, oddjob_mkhomedir_exec_t, oddjob_mkhomedir_t)
+ ')
++
++########################################
++## <summary>
++## Execute the oddjob_mkhomedir program in the oddjob_mkhomedir domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to allow the oddjob_mkhomedir domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`oddjob_run_mkhomedir',`
++ gen_require(`
++ type oddjob_mkhomedir_t;
++ ')
++
++ oddjob_domtrans_mkhomedir($1)
++ role $2 types oddjob_mkhomedir_t;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.6.1/policy/modules/services/oddjob.te
+--- nsaserefpolicy/policy/modules/services/oddjob.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/oddjob.te 2008-11-25 09:45:43.000000000 -0500
+@@ -10,14 +10,21 @@
+ type oddjob_exec_t;
+ domain_type(oddjob_t)
+ init_daemon_domain(oddjob_t, oddjob_exec_t)
++domain_obj_id_change_exemption(oddjob_t)
++domain_role_change_exemption(oddjob_t)
+ domain_subj_id_change_exemption(oddjob_t)
+
+ type oddjob_mkhomedir_t;
+ type oddjob_mkhomedir_exec_t;
+ domain_type(oddjob_mkhomedir_t)
+-init_daemon_domain(oddjob_mkhomedir_t, oddjob_mkhomedir_exec_t)
++domain_obj_id_change_exemption(oddjob_mkhomedir_t)
++init_system_domain(oddjob_mkhomedir_t, oddjob_mkhomedir_exec_t)
+ oddjob_system_entry(oddjob_mkhomedir_t, oddjob_mkhomedir_exec_t)
+
++ifdef(`enable_mcs',`
++ init_ranged_daemon_domain(oddjob_t, oddjob_exec_t,s0 - mcs_systemhigh)
++')
++
+ # pid files
+ type oddjob_var_run_t;
+ files_pid_file(oddjob_var_run_t)
+@@ -65,13 +72,32 @@
+ # oddjob_mkhomedir local policy
+ #
+
++allow oddjob_mkhomedir_t self:capability { chown fowner fsetid dac_override };
++allow oddjob_mkhomedir_t self:process setfscreate;
+ allow oddjob_mkhomedir_t self:fifo_file rw_fifo_file_perms;
+ allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
+
+ files_read_etc_files(oddjob_mkhomedir_t)
+
++kernel_read_system_state(oddjob_mkhomedir_t)
++
++auth_use_nsswitch(oddjob_mkhomedir_t)
++
++logging_send_syslog_msg(oddjob_mkhomedir_t)
++
+ miscfiles_read_localization(oddjob_mkhomedir_t)
+
++selinux_get_fs_mount(oddjob_mkhomedir_t)
++selinux_validate_context(oddjob_mkhomedir_t)
++selinux_compute_access_vector(oddjob_mkhomedir_t)
++selinux_compute_create_context(oddjob_mkhomedir_t)
++selinux_compute_relabel_context(oddjob_mkhomedir_t)
++selinux_compute_user_contexts(oddjob_mkhomedir_t)
++
++seutil_read_config(oddjob_mkhomedir_t)
++seutil_read_file_contexts(oddjob_mkhomedir_t)
++seutil_read_default_contexts(oddjob_mkhomedir_t)
++
+ # Add/remove user home directories
+ userdom_home_filetrans_user_home_dir(oddjob_mkhomedir_t)
+ userdom_manage_user_home_content_dirs(oddjob_mkhomedir_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-3.6.1/policy/modules/services/openvpn.fc
+--- nsaserefpolicy/policy/modules/services/openvpn.fc 2008-10-08 19:00:27.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/openvpn.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,6 +2,7 @@
+ # /etc
+ #
+ /etc/openvpn(/.*)? gen_context(system_u:object_r:openvpn_etc_t,s0)
++/etc/openvpn/ipp.txt -- gen_context(system_u:object_r:openvpn_etc_rw_t,s0)
+ /etc/rc\.d/init\.d/openvpn -- gen_context(system_u:object_r:openvpn_initrc_exec_t,s0)
+
+ #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.6.1/policy/modules/services/openvpn.if
+--- nsaserefpolicy/policy/modules/services/openvpn.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/openvpn.if 2008-11-25 09:45:43.000000000 -0500
+@@ -46,6 +46,24 @@
+
+ ########################################
+ ## <summary>
++## Send OPENVPN clients the kill signal.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`openvpn_kill',`
++ gen_require(`
++ type openvpn_t;
++ ')
++
++ allow $1 openvpn_t:process sigkill;
++')
++
++########################################
++## <summary>
+ ## Send generic signals to OPENVPN clients.
+ ## </summary>
+ ## <param name="domain">
+@@ -64,6 +82,24 @@
+
+ ########################################
+ ## <summary>
++## Send signulls to OPENVPN clients.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`openvpn_signull',`
++ gen_require(`
++ type openvpn_t;
++ ')
++
++ allow $1 openvpn_t:process signull;
++')
++
++########################################
++## <summary>
+ ## Allow the specified domain to read
+ ## OpenVPN configuration files.
+ ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.6.1/policy/modules/services/openvpn.te
+--- nsaserefpolicy/policy/modules/services/openvpn.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/openvpn.te 2008-11-25 09:45:43.000000000 -0500
+@@ -22,6 +22,9 @@
+ type openvpn_etc_t;
+ files_config_file(openvpn_etc_t)
+
++type openvpn_etc_rw_t;
++files_config_file(openvpn_etc_rw_t)
++
+ type openvpn_initrc_exec_t;
+ init_script_file(openvpn_initrc_exec_t)
+
+@@ -47,10 +50,11 @@
+ allow openvpn_t self:tcp_socket server_stream_socket_perms;
+ allow openvpn_t self:netlink_route_socket rw_netlink_socket_perms;
+
+-allow openvpn_t openvpn_etc_t:dir list_dir_perms;
+-can_exec(openvpn_t, openvpn_etc_t)
++manage_files_pattern(openvpn_t,openvpn_etc_rw_t,openvpn_etc_rw_t)
+ read_files_pattern(openvpn_t, openvpn_etc_t, openvpn_etc_t)
+ read_lnk_files_pattern(openvpn_t, openvpn_etc_t, openvpn_etc_t)
++filetrans_pattern(openvpn_t,openvpn_etc_t,openvpn_etc_rw_t, file)
++can_exec(openvpn_t,openvpn_etc_t)
+
+ allow openvpn_t openvpn_var_log_t:file manage_file_perms;
+ logging_log_filetrans(openvpn_t, openvpn_var_log_t, file)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.fc serefpolicy-3.6.1/policy/modules/services/pads.fc
+--- nsaserefpolicy/policy/modules/services/pads.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pads.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,12 @@
++
++/etc/pads-ether-codes -- gen_context(system_u:object_r:pads_config_t, s0)
++/etc/pads-signature-list -- gen_context(system_u:object_r:pads_config_t, s0)
++/etc/pads.conf -- gen_context(system_u:object_r:pads_config_t, s0)
++/etc/pads-assets.csv -- gen_context(system_u:object_r:pads_config_t, s0)
++
++/etc/rc\.d/init\.d/pads -- gen_context(system_u:object_r:pads_initrc_exec_t, s0)
++
++/usr/bin/pads -- gen_context(system_u:object_r:pads_exec_t, s0)
++
++/var/run/pads.pid -- gen_context(system_u:object_r:pads_var_run_t, s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.if serefpolicy-3.6.1/policy/modules/services/pads.if
+--- nsaserefpolicy/policy/modules/services/pads.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pads.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,10 @@
++## <summary>SELinux policy for PADS daemon.</summary>
++## <desc>
++## <p>
++## PADS is a libpcap based detection engine used to
++## passively detect network assets. It is designed to
++## complement IDS technology by providing context to IDS
++## alerts.
++## </p>
++## </desc>
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.te serefpolicy-3.6.1/policy/modules/services/pads.te
+--- nsaserefpolicy/policy/modules/services/pads.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pads.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,65 @@
++
++policy_module(pads, 0.0.1)
++
++########################################
++#
++# Declarations
++#
++
++type pads_t;
++type pads_exec_t;
++init_daemon_domain(pads_t, pads_exec_t)
++role system_r types pads_t;
++
++type pads_initrc_exec_t;
++init_script_file(pads_initrc_exec_t)
++
++type pads_config_t;
++files_config_file(pads_config_t)
++
++type pads_var_run_t;
++files_pid_file(pads_var_run_t)
++
++########################################
++#
++# Declarations
++#
++
++allow pads_t self:capability { dac_override net_raw };
++allow pads_t self:netlink_route_socket { write getattr read bind create nlmsg_read };
++allow pads_t self:packet_socket { ioctl setopt getopt read bind create };
++allow pads_t self:udp_socket { create ioctl };
++allow pads_t self:unix_dgram_socket { write create connect };
++
++allow pads_t pads_config_t:file manage_file_perms;
++files_etc_filetrans(pads_t, pads_config_t, file)
++
++allow pads_t pads_var_run_t:file manage_file_perms;
++files_pid_filetrans(pads_t, pads_var_run_t, file)
++
++corecmd_search_bin(pads_t)
++
++corenet_all_recvfrom_unlabeled(pads_t)
++corenet_all_recvfrom_netlabel(pads_t)
++corenet_tcp_sendrecv_all_if(pads_t)
++corenet_tcp_sendrecv_all_nodes(pads_t)
++
++corenet_tcp_connect_prelude_port(pads_t)
++
++dev_read_rand(pads_t)
++dev_read_urand(pads_t)
++
++kernel_read_sysctl(pads_t)
++
++files_read_etc_files(pads_t)
++files_search_spool(pads_t)
++
++miscfiles_read_localization(pads_t)
++
++logging_send_syslog_msg(pads_t)
++
++sysnet_dns_name_resolve(pads_t)
++
++optional_policy(`
++ prelude_manage_spool(pads_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.6.1/policy/modules/services/pcscd.te
+--- nsaserefpolicy/policy/modules/services/pcscd.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pcscd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -57,6 +57,14 @@
+ sysnet_dns_name_resolve(pcscd_t)
+
+ optional_policy(`
++ dbus_system_bus_client(pcscd_t)
++
++ optional_policy(`
++ hal_dbus_chat(pcscd_t)
++ ')
++')
++
++optional_policy(`
+ openct_stream_connect(pcscd_t)
+ openct_read_pid_files(pcscd_t)
+ openct_signull(pcscd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.6.1/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pegasus.te 2008-11-25 09:45:43.000000000 -0500
+@@ -30,7 +30,7 @@
+ # Local policy
+ #
+
+-allow pegasus_t self:capability { chown sys_nice setuid setgid dac_override net_bind_service };
++allow pegasus_t self:capability { chown ipc_lock sys_nice setuid setgid dac_override net_bind_service };
+ dontaudit pegasus_t self:capability sys_tty_config;
+ allow pegasus_t self:process signal;
+ allow pegasus_t self:fifo_file rw_fifo_file_perms;
+@@ -66,6 +66,8 @@
+ kernel_read_system_state(pegasus_t)
+ kernel_search_vm_sysctl(pegasus_t)
+ kernel_read_net_sysctls(pegasus_t)
++kernel_read_xen_state(pegasus_t)
++kernel_write_xen_state(pegasus_t)
+
+ corenet_all_recvfrom_unlabeled(pegasus_t)
+ corenet_all_recvfrom_netlabel(pegasus_t)
+@@ -96,13 +98,12 @@
+
+ auth_use_nsswitch(pegasus_t)
+ auth_domtrans_chk_passwd(pegasus_t)
++auth_read_shadow(pegasus_t)
+
+ domain_use_interactive_fds(pegasus_t)
+ domain_read_all_domains_state(pegasus_t)
+
+-files_read_etc_files(pegasus_t)
+-files_list_var_lib(pegasus_t)
+-files_read_var_lib_files(pegasus_t)
++files_read_all_files(pegasus_t)
+ files_read_var_lib_symlinks(pegasus_t)
+
+ hostname_exec(pegasus_t)
+@@ -115,7 +116,6 @@
+
+ miscfiles_read_localization(pegasus_t)
+
+-sysnet_read_config(pegasus_t)
+ sysnet_domtrans_ifconfig(pegasus_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
+@@ -126,6 +126,14 @@
+ ')
+
+ optional_policy(`
++ samba_manage_config(pegasus_t)
++')
++
++optional_policy(`
++ ssh_exec(pegasus_t)
++')
++
++optional_policy(`
+ seutil_sigchld_newrole(pegasus_t)
+ seutil_dontaudit_read_config(pegasus_t)
+ ')
+@@ -137,3 +145,13 @@
+ optional_policy(`
+ unconfined_signull(pegasus_t)
+ ')
++
++optional_policy(`
++ virt_domtrans(pegasus_t)
++ virt_manage_config(pegasus_t)
++')
++
++optional_policy(`
++ xen_stream_connect(pegasus_t)
++ xen_stream_connect_xenstore(pegasus_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pingd.fc serefpolicy-3.6.1/policy/modules/services/pingd.fc
+--- nsaserefpolicy/policy/modules/services/pingd.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pingd.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,11 @@
++
++/etc/pingd.conf -- gen_context(system_u:object_r:pingd_etc_t,s0)
++
++/etc/rc\.d/init\.d/whatsup-pingd -- gen_context(system_u:object_r:pingd_initrc_exec_t,s0)
++
++/usr/lib/pingd(/.*)? gen_context(system_u:object_r:pingd_modules_t,s0)
++
++/usr/sbin/pingd -- gen_context(system_u:object_r:pingd_exec_t,s0)
++
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pingd.if serefpolicy-3.6.1/policy/modules/services/pingd.if
+--- nsaserefpolicy/policy/modules/services/pingd.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pingd.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,99 @@
++## <summary>policy for pingd</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run pingd.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`pingd_domtrans',`
++ gen_require(`
++ type pingd_t, pingd_exec_t;
++ ')
++
++ domtrans_pattern($1,pingd_exec_t,pingd_t)
++')
++
++#######################################
++## <summary>
++## Read pingd etc configuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`pingd_read_etc',`
++ gen_require(`
++ type pingd_etc_t;
++ ')
++
++ files_search_etc($1)
++ read_files_pattern($1, pingd_etc_t, pingd_etc_t)
++')
++
++#######################################
++## <summary>
++## Manage pingd etc configuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`pingd_manage_etc',`
++ gen_require(`
++ type pingd_etc_t;
++ ')
++
++ files_search_etc($1)
++ manage_dirs_pattern($1, pingd_etc_t, pingd_etc_t)
++ manage_files_pattern($1, pingd_etc_t, pingd_etc_t)
++
++')
++
++#######################################
++## <summary>
++## All of the rules required to administrate
++## an pingd environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the pingd domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pingd_admin',`
++ gen_require(`
++ type pingd_t, pingd_etc_t;
++ type pingd_initrc_exec_t, pingd_modules_t;
++ ')
++
++ allow $1 pingd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, pingd_t)
++
++ init_labeled_script_domtrans($1, pingd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 pingd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_etc($1)
++ admin_pattern($1, pingd_etc_t)
++
++ files_list_usr($1)
++ admin_pattern($1, pingd_modules_t)
++
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pingd.te serefpolicy-3.6.1/policy/modules/services/pingd.te
+--- nsaserefpolicy/policy/modules/services/pingd.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pingd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,54 @@
++policy_module(pingd,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type pingd_t;
++type pingd_exec_t;
++init_daemon_domain(pingd_t, pingd_exec_t)
++
++type pingd_initrc_exec_t;
++init_script_file(pingd_initrc_exec_t)
++
++# type for config
++type pingd_etc_t;
++files_type(pingd_etc_t);
++
++# type for pingd modules
++type pingd_modules_t;
++files_type(pingd_modules_t)
++
++########################################
++#
++# pingd local policy
++#
++
++allow pingd_t self:capability net_raw;
++allow pingd_t self:tcp_socket create_stream_socket_perms;
++allow pingd_t self:rawip_socket { write read create bind };
++
++read_files_pattern(pingd_t, pingd_etc_t, pingd_etc_t)
++
++read_files_pattern(pingd_t, pingd_modules_t, pingd_modules_t)
++mmap_files_pattern(pingd_t, pingd_modules_t, pingd_modules_t)
++
++corenet_raw_bind_all_nodes(pingd_t)
++corenet_tcp_bind_all_nodes(pingd_t)
++corenet_tcp_bind_pingd_port(pingd_t)
++
++auth_use_nsswitch(pingd_t)
++
++files_search_usr(pingd_t)
++
++libs_use_ld_so(pingd_t)
++libs_use_shared_libs(pingd_t)
++miscfiles_read_localization(pingd_t)
++
++logging_send_syslog_msg(pingd_t)
++
++permissive pingd_t;
++
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pki.fc serefpolicy-3.6.1/policy/modules/services/pki.fc
+--- nsaserefpolicy/policy/modules/services/pki.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pki.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,46 @@
++
++/etc/rc\.d/init\.d/pki-ca -- gen_context(system_u:object_r:pki_ca_script_exec_t,s0)
++/etc/rc\.d/init\.d/pki-kra -- gen_context(system_u:object_r:pki_kra_script_exec_t,s0)
++/etc/rc\.d/init\.d/pki-ocsp -- gen_context(system_u:object_r:pki_ocsp_script_exec_t,s0)
++/etc/rc\.d/init\.d/pki-ra -- gen_context(system_u:object_r:pki_ra_script_exec_t,s0)
++/etc/rc\.d/init\.d/pki-tks -- gen_context(system_u:object_r:pki_tks_script_exec_t,s0)
++/etc/rc\.d/init\.d/pki-tps -- gen_context(system_u:object_r:pki_tps_script_exec_t,s0)
++
++/etc/pki-ca(/.*)? gen_context(system_u:object_r:pki_ca_etc_rw_t,s0)
++/etc/pki-ca/tomcat5\.conf -- gen_context(system_u:object_r:pki_ca_tomcat_exec_t,s0)
++/etc/pki-kra(/.*)? gen_context(system_u:object_r:pki_kra_etc_rw_t,s0)
++/etc/pki-kra/tomcat5\.conf -- gen_context(system_u:object_r:pki_kra_tomcat_exec_t,s0)
++/etc/pki-ocsp(/.*)? gen_context(system_u:object_r:pki_ocsp_etc_rw_t,s0)
++/etc/pki-ocsp/tomcat5\.conf -- gen_context(system_u:object_r:pki_ocsp_tomcat_exec_t,s0)
++/etc/pki-ra(/.*)? gen_context(system_u:object_r:pki_ra_etc_rw_t,s0)
++/etc/pki-tks(/.*)? gen_context(system_u:object_r:pki_tks_etc_rw_t,s0)
++/etc/pki-tks/tomcat5\.conf -- gen_context(system_u:object_r:pki_tks_tomcat_exec_t,s0)
++/etc/pki-tps(/.*)? gen_context(system_u:object_r:pki_tps_etc_rw_t,s0)
++
++/usr/bin/dtomcat5-pki-ca -- gen_context(system_u:object_r:pki_ca_exec_t,s0)
++/usr/bin/dtomcat5-pki-kra -- gen_context(system_u:object_r:pki_kra_exec_t,s0)
++/usr/bin/dtomcat5-pki-ocsp -- gen_context(system_u:object_r:pki_ocsp_exec_t,s0)
++/usr/bin/dtomcat5-pki-tks -- gen_context(system_u:object_r:pki_tks_exec_t,s0)
++
++/usr/sbin/httpd.worker -- gen_context(system_u:object_r:pki_ra_exec_t,s0)
++
++/var/lib/pki-ca(/.*)? gen_context(system_u:object_r:pki_ca_var_lib_t,s0)
++/var/lib/pki-kra(/.*)? gen_context(system_u:object_r:pki_kra_var_lib_t,s0)
++/var/lib/pki-ocsp(/.*)? gen_context(system_u:object_r:pki_ocsp_var_lib_t,s0)
++/var/lib/pki-ra(/.*)? gen_context(system_u:object_r:pki_ra_var_lib_t,s0)
++/var/lib/pki-tks(/.*)? gen_context(system_u:object_r:pki_tks_var_lib_t,s0)
++/var/lib/pki-tps(/.*)? gen_context(system_u:object_r:pki_tps_var_lib_t,s0)
++
++/var/log/pki-ca(/.*)? gen_context(system_u:object_r:pki_ca_log_t,s0)
++/var/log/pki-kra(/.*)? gen_context(system_u:object_r:pki_kra_log_t,s0)
++/var/log/pki-ocsp(/.*)? gen_context(system_u:object_r:pki_ocsp_log_t,s0)
++/var/log/pki-ra(/.*)? gen_context(system_u:object_r:pki_ra_log_t,s0)
++/var/log/pki-tks(/.*)? gen_context(system_u:object_r:pki_tks_log_t,s0)
++/var/log/pki-tps(/.*)? gen_context(system_u:object_r:pki_tps_log_t,s0)
++
++/var/run/pki-ca\.pid -- gen_context(system_u:object_r:pki_ca_var_run_t,s0)
++/var/run/pki-kra\.pid -- gen_context(system_u:object_r:pki_kra_var_run_t,s0)
++/var/run/pki-ocsp\.pid -- gen_context(system_u:object_r:pki_ocsp_var_run_t,s0)
++/var/run/pki-ra\.pid -- gen_context(system_u:object_r:pki_ocsp_var_run_t,s0)
++/var/run/pki-tks\.pid -- gen_context(system_u:object_r:pki_tks_var_run_t,s0)
++/var/run/pki-tps\.pid -- gen_context(system_u:object_r:pki_tks_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pki.if serefpolicy-3.6.1/policy/modules/services/pki.if
+--- nsaserefpolicy/policy/modules/services/pki.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pki.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,643 @@
++
++## <summary>policy for pki</summary>
++
++########################################
++## <summary>
++## Execute pki_ca server in the pki_ca domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`pki_ca_script_domtrans',`
++ gen_require(`
++ attribute pki_ca_script;
++ ')
++
++ init_script_domtrans_spec($1,pki_ca_script)
++')
++
++########################################
++## <summary>
++## Create a set of derived types for apache
++## web content.
++## </summary>
++## <param name="prefix">
++## <summary>
++## The prefix to be used for deriving type names.
++## </summary>
++## </param>
++#
++template(`pki_ca_template',`
++ gen_require(`
++ attribute pki_ca_process;
++ attribute pki_ca_config, pki_ca_var_lib, pki_ca_var_run;
++ attribute pki_ca_executable, pki_ca_script, pki_ca_var_log;
++ type pki_ca_tomcat_exec_t;
++ type $1_port_t;
++ ')
++ ########################################
++ #
++ # Declarations
++ #
++
++ type $1_t, pki_ca_process;
++ type $1_exec_t, pki_ca_executable;
++ domain_type($1_t)
++ init_daemon_domain($1_t, $1_exec_t)
++
++ type $1_script_exec_t, pki_ca_script;
++ init_script_file($1_script_exec_t)
++
++ type $1_etc_rw_t, pki_ca_config;
++ files_type($1_etc_rw_t)
++
++ type $1_var_run_t, pki_ca_var_run;
++ files_pid_file($1_var_run_t)
++
++ type $1_var_lib_t, pki_ca_var_lib;
++ files_type($1_var_lib_t)
++
++ type $1_log_t, pki_ca_var_log;
++ logging_log_file($1_log_t)
++
++ ########################################
++ #
++ # $1 local policy
++ #
++
++ # Execstack/execmem caused by java app.
++ allow $1_t self:process { execstack execmem getsched setsched };
++
++ ## internal communication is often done using fifo and unix sockets.
++ allow $1_t self:fifo_file rw_file_perms;
++ allow $1_t self:unix_stream_socket create_stream_socket_perms;
++ allow $1_t self:tcp_socket create_stream_socket_perms;
++ allow $1_t self:process signull;
++
++ allow $1_t $1_port_t:tcp_socket {name_bind name_connect};
++
++ corenet_all_recvfrom_unlabeled($1_t)
++ corenet_tcp_sendrecv_all_if($1_t)
++ corenet_tcp_sendrecv_all_nodes($1_t)
++ corenet_tcp_sendrecv_all_ports($1_t)
++
++ corenet_tcp_bind_all_nodes($1_t)
++ corenet_tcp_bind_ocsp_port($1_t)
++ corenet_tcp_connect_ocsp_port($1_t)
++
++ # This is for /etc/$1/tomcat.conf:
++ can_exec($1_t, pki_ca_tomcat_exec_t)
++
++ # Init script handling
++ domain_use_interactive_fds($1_t)
++
++ files_read_etc_files($1_t)
++
++ manage_dirs_pattern($1_t, $1_etc_rw_t, $1_etc_rw_t)
++ manage_files_pattern($1_t, $1_etc_rw_t, $1_etc_rw_t)
++ files_etc_filetrans($1_t,$1_etc_rw_t, { file dir })
++
++ manage_dirs_pattern($1_t, $1_var_run_t, $1_var_run_t)
++ manage_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
++ files_pid_filetrans($1_t,$1_var_run_t, { file dir })
++
++ manage_dirs_pattern($1_t, $1_var_lib_t, $1_var_lib_t)
++ manage_files_pattern($1_t, $1_var_lib_t, $1_var_lib_t)
++ read_lnk_files_pattern($1_t, $1_var_lib_t, $1_var_lib_t)
++ files_var_lib_filetrans($1_t, $1_var_lib_t, { file dir } )
++
++ manage_dirs_pattern($1_t, $1_log_t, $1_log_t)
++ manage_files_pattern($1_t, $1_log_t, $1_log_t)
++ logging_log_filetrans($1_t, $1_log_t, { file dir } )
++
++ corecmd_exec_bin($1_t)
++ corecmd_read_bin_symlinks($1_t)
++ corecmd_exec_shell($1_t)
++
++ dev_list_sysfs($1_t)
++ dev_read_rand($1_t)
++ dev_read_urand($1_t)
++
++ # Java is looking in /tmp for some reason...:
++ files_manage_generic_tmp_dirs($1_t)
++ files_manage_generic_tmp_files($1_t)
++ files_read_usr_files($1_t)
++ files_read_usr_symlinks($1_t)
++ # These are used to read tomcat class files in /var/lib/tomcat
++ files_read_var_lib_files($1_t)
++ files_read_var_lib_symlinks($1_t)
++
++ kernel_read_network_state($1_t)
++ kernel_read_system_state($1_t)
++ kernel_search_network_state($1_t)
++ # audit2allow
++ kernel_signull_unlabeled($1_t)
++
++ auth_use_nsswitch($1_t)
++
++ init_dontaudit_write_utmp($1_t)
++
++ libs_use_ld_so($1_t)
++ libs_use_shared_libs($1_t)
++
++ miscfiles_read_localization($1_t)
++
++ ifdef(`targeted_policy',`
++ term_dontaudit_use_unallocated_ttys($1_t)
++ term_dontaudit_use_generic_ptys($1_t)
++ ')
++
++#This is broken in selinux-policy we need java_exec defined, Will add to policy
++ gen_require(`
++ type java_exec_t;
++ ')
++ can_exec($1_t, java_exec_t)
++
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an pki_ca environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <param name="terminal">
++## <summary>
++## The type of the user terminal.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pki_ca_admin',`
++ gen_require(`
++ type pki_ca_tomcat_exec_t;
++ attribute pki_ca_process;
++ attribute pki_ca_config;
++ attribute pki_ca_executable;
++ attribute pki_ca_var_lib;
++ attribute pki_ca_var_log;
++ attribute pki_ca_var_run;
++ attribute pki_ca_pidfiles;
++ attribute pki_ca_script;
++ ')
++
++ allow $1 pki_ca_process:process { ptrace signal_perms };
++ ps_process_pattern($1, pki_ca_t)
++
++ # Allow pki_ca_t to restart the service
++ pki_ca_script_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 pki_ca_script system_r;
++ allow $2 system_r;
++
++ manage_all_pattern($1, pki_ca_config)
++ manage_all_pattern($1, pki_ca_var_run)
++ manage_all_pattern($1, pki_ca_var_lib)
++ manage_all_pattern($1, pki_ca_var_log)
++ manage_all_pattern($1, pki_ca_config)
++ manage_all_pattern($1, pki_ca_tomcat_exec_t)
++')
++
++########################################
++## <summary>
++## Execute pki_kra server in the pki_kra domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`pki_kra_script_domtrans',`
++ gen_require(`
++ attribute pki_kra_script;
++ ')
++
++ init_script_domtrans_spec($1,pki_kra_script)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an pki_kra environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <param name="terminal">
++## <summary>
++## The type of the user terminal.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pki_kra_admin',`
++ gen_require(`
++ type pki_kra_tomcat_exec_t;
++ attribute pki_kra_process;
++ attribute pki_kra_config;
++ attribute pki_kra_executable;
++ attribute pki_kra_var_lib;
++ attribute pki_kra_var_log;
++ attribute pki_kra_var_run;
++ attribute pki_kra_pidfiles;
++ attribute pki_kra_script;
++ ')
++
++ allow $1 pki_kra_process:process { ptrace signal_perms };
++ ps_process_pattern($1, pki_kra_t)
++
++ # Allow pki_kra_t to restart the service
++ pki_kra_script_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 pki_kra_script system_r;
++ allow $2 system_r;
++
++ manage_all_pattern($1, pki_kra_config)
++ manage_all_pattern($1, pki_kra_var_run)
++ manage_all_pattern($1, pki_kra_var_lib)
++ manage_all_pattern($1, pki_kra_var_log)
++ manage_all_pattern($1, pki_kra_config)
++ manage_all_pattern($1, pki_kra_tomcat_exec_t)
++')
++
++########################################
++## <summary>
++## Execute pki_ocsp server in the pki_ocsp domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`pki_ocsp_script_domtrans',`
++ gen_require(`
++ attribute pki_ocsp_script;
++ ')
++
++ init_script_domtrans_spec($1,pki_ocsp_script)
++')
++
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an pki_ocsp environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <param name="terminal">
++## <summary>
++## The type of the user terminal.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pki_ocsp_admin',`
++ gen_require(`
++ type pki_ocsp_tomcat_exec_t;
++ attribute pki_ocsp_process;
++ attribute pki_ocsp_config;
++ attribute pki_ocsp_executable;
++ attribute pki_ocsp_var_lib;
++ attribute pki_ocsp_var_log;
++ attribute pki_ocsp_var_run;
++ attribute pki_ocsp_pidfiles;
++ attribute pki_ocsp_script;
++ ')
++
++ allow $1 pki_ocsp_process:process { ptrace signal_perms };
++ ps_process_pattern($1, pki_ocsp_t)
++
++ # Allow pki_ocsp_t to restart the service
++ pki_ocsp_script_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 pki_ocsp_script system_r;
++ allow $2 system_r;
++
++ manage_all_pattern($1, pki_ocsp_config)
++ manage_all_pattern($1, pki_ocsp_var_run)
++ manage_all_pattern($1, pki_ocsp_var_lib)
++ manage_all_pattern($1, pki_ocsp_var_log)
++ manage_all_pattern($1, pki_ocsp_config)
++ manage_all_pattern($1, pki_ocsp_tomcat_exec_t)
++')
++
++########################################
++## <summary>
++## Execute pki_ra server in the pki_ra domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`pki_ra_script_domtrans',`
++ gen_require(`
++ attribute pki_ra_script;
++ ')
++
++ init_script_domtrans_spec($1,pki_ra_script)
++')
++
++########################################
++## <summary>
++## Create a set of derived types for apache
++## web content.
++## </summary>
++## <param name="prefix">
++## <summary>
++## The prefix to be used for deriving type names.
++## </summary>
++## </param>
++#
++template(`pki_ra_template',`
++ gen_require(`
++ attribute pki_ra_process;
++ attribute pki_ra_config, pki_ra_var_lib;
++ attribute pki_ra_executable, pki_ra_script, pki_ra_var_log;
++ ')
++ ########################################
++ #
++ # Declarations
++ #
++
++ type $1_t, pki_ra_process;
++ type $1_exec_t, pki_ra_executable;
++ domain_type($1_t)
++ init_daemon_domain($1_t, $1_exec_t)
++
++ type $1_script_exec_t, pki_ra_script;
++ init_script_file($1_script_exec_t)
++
++ type $1_etc_rw_t, pki_ra_config;
++ files_type($1_etc_rw_t)
++
++ type $1_var_lib_t, pki_ra_var_lib;
++ files_type($1_var_lib_t)
++
++ type $1_log_t, pki_ra_var_log;
++ logging_log_file($1_log_t)
++
++ ########################################
++ #
++ # $1 local policy
++ #
++
++ ## internal communication is often done using fifo and unix sockets.
++ allow $1_t self:fifo_file rw_file_perms;
++ allow $1_t self:unix_stream_socket create_stream_socket_perms;
++
++ # Init script handling
++ domain_use_interactive_fds($1_t)
++
++ files_read_etc_files($1_t)
++
++ manage_dirs_pattern($1_t, $1_etc_rw_t, $1_etc_rw_t)
++ manage_files_pattern($1_t, $1_etc_rw_t, $1_etc_rw_t)
++ files_etc_filetrans($1_t,$1_etc_rw_t, { file dir })
++
++ manage_dirs_pattern($1_t, $1_var_lib_t, $1_var_lib_t)
++ manage_files_pattern($1_t, $1_var_lib_t, $1_var_lib_t)
++ read_lnk_files_pattern($1_t, $1_var_lib_t, $1_var_lib_t)
++ files_var_lib_filetrans($1_t, $1_var_lib_t, { file dir } )
++
++ manage_dirs_pattern($1_t, $1_log_t, $1_log_t)
++ manage_files_pattern($1_t, $1_log_t, $1_log_t)
++ logging_log_filetrans($1_t, $1_log_t, { file dir } )
++
++ init_dontaudit_write_utmp($1_t)
++
++ libs_use_ld_so($1_t)
++ libs_use_shared_libs($1_t)
++
++ miscfiles_read_localization($1_t)
++
++ ifdef(`targeted_policy',`
++ term_dontaudit_use_unallocated_ttys($1_t)
++ term_dontaudit_use_generic_ptys($1_t)
++ ')
++
++ gen_require(`
++ type httpd_t;
++ ')
++
++ allow httpd_t pki_ra_etc_rw_t:file { read getattr };
++ allow httpd_t pki_ra_log_t:file read;
++ allow httpd_t pki_ra_var_lib_t:lnk_file read;
++
++
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an pki_ra environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <param name="terminal">
++## <summary>
++## The type of the user terminal.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pki_ra_admin',`
++ gen_require(`
++ attribute pki_ra_process;
++ attribute pki_ra_config;
++ attribute pki_ra_executable;
++ attribute pki_ra_var_lib;
++ attribute pki_ra_var_log;
++ attribute pki_ra_script;
++ ')
++
++ allow $1 pki_ra_process:process { ptrace signal_perms };
++ ps_process_pattern($1, pki_ra_t)
++
++ # Allow pki_ra_t to restart the service
++ pki_ra_script_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 pki_ra_script system_r;
++ allow $2 system_r;
++
++ manage_all_pattern($1, pki_ra_config)
++ manage_all_pattern($1, pki_ra_var_lib)
++ manage_all_pattern($1, pki_ra_var_log)
++ manage_all_pattern($1, pki_ra_config)
++')
++
++########################################
++## <summary>
++## Execute pki_tks server in the pki_tks domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`pki_tks_script_domtrans',`
++ gen_require(`
++ attribute pki_tks_script;
++ ')
++
++ init_script_domtrans_spec($1,pki_tks_script)
++')
++
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an pki_tks environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <param name="terminal">
++## <summary>
++## The type of the user terminal.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pki_tks_admin',`
++ gen_require(`
++ type pki_tks_tomcat_exec_t;
++ attribute pki_tks_process;
++ attribute pki_tks_config;
++ attribute pki_tks_executable;
++ attribute pki_tks_var_lib;
++ attribute pki_tks_var_log;
++ attribute pki_tks_var_run;
++ attribute pki_tks_pidfiles;
++ attribute pki_tks_script;
++ ')
++
++ allow $1 pki_tks_process:process { ptrace signal_perms };
++ ps_process_pattern($1, pki_tks_t)
++
++ # Allow pki_tks_t to restart the service
++ pki_tks_script_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 pki_tks_script system_r;
++ allow $2 system_r;
++
++ manage_all_pattern($1, pki_tks_config)
++ manage_all_pattern($1, pki_tks_var_run)
++ manage_all_pattern($1, pki_tks_var_lib)
++ manage_all_pattern($1, pki_tks_var_log)
++ manage_all_pattern($1, pki_tks_config)
++ manage_all_pattern($1, pki_tks_tomcat_exec_t)
++')
++
++########################################
++## <summary>
++## Execute pki_tps server in the pki_tps domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`pki_tps_script_domtrans',`
++ gen_require(`
++ attribute pki_tps_script;
++ ')
++
++ init_script_domtrans_spec($1,pki_tps_script)
++')
++
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an pki_tps environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <param name="terminal">
++## <summary>
++## The type of the user terminal.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pki_tps_admin',`
++ gen_require(`
++ attribute pki_tps_process;
++ attribute pki_tps_config;
++ attribute pki_tps_executable;
++ attribute pki_tps_var_lib;
++ attribute pki_tps_var_log;
++ attribute pki_tps_script;
++ ')
++
++ allow $1 pki_tps_process:process { ptrace signal_perms };
++ ps_process_pattern($1, pki_tps_t)
++
++ # Allow pki_tps_t to restart the service
++ pki_tps_script_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 pki_tps_script system_r;
++ allow $2 system_r;
++
++ manage_all_pattern($1, pki_tps_config)
++ manage_all_pattern($1, pki_tps_var_lib)
++ manage_all_pattern($1, pki_tps_var_log)
++ manage_all_pattern($1, pki_tps_config)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pki.te serefpolicy-3.6.1/policy/modules/services/pki.te
+--- nsaserefpolicy/policy/modules/services/pki.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pki.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,91 @@
++policy_module(pki,1.0.0)
++
++attribute pki_ca_config;
++attribute pki_ca_executable;
++attribute pki_ca_var_lib;
++attribute pki_ca_var_log;
++attribute pki_ca_var_run;
++attribute pki_ca_pidfiles;
++attribute pki_ca_script;
++attribute pki_ca_process;
++
++type pki_ca_tomcat_exec_t;
++files_type(pki_ca_tomcat_exec_t)
++
++pki_ca_template(pki_ca)
++
++attribute pki_kra_config;
++attribute pki_kra_executable;
++attribute pki_kra_var_lib;
++attribute pki_kra_var_log;
++attribute pki_kra_var_run;
++attribute pki_kra_pidfiles;
++attribute pki_kra_script;
++attribute pki_kra_process;
++
++type pki_kra_tomcat_exec_t;
++files_type(pki_kra_tomcat_exec_t)
++
++pki_ca_template(pki_kra)
++
++
++attribute pki_ocsp_config;
++attribute pki_ocsp_executable;
++attribute pki_ocsp_var_lib;
++attribute pki_ocsp_var_log;
++attribute pki_ocsp_var_run;
++attribute pki_ocsp_pidfiles;
++attribute pki_ocsp_script;
++attribute pki_ocsp_process;
++
++type pki_ocsp_tomcat_exec_t;
++files_type(pki_ocsp_tomcat_exec_t)
++
++pki_ca_template(pki_ocsp)
++
++
++attribute pki_ra_config;
++attribute pki_ra_executable;
++attribute pki_ra_var_lib;
++attribute pki_ra_var_log;
++attribute pki_ra_var_run;
++attribute pki_ra_pidfiles;
++attribute pki_ra_script;
++attribute pki_ra_process;
++
++type pki_ra_tomcat_exec_t;
++files_type(pki_ra_tomcat_exec_t)
++
++pki_ra_template(pki_ra)
++
++
++attribute pki_tks_config;
++attribute pki_tks_executable;
++attribute pki_tks_var_lib;
++attribute pki_tks_var_log;
++attribute pki_tks_var_run;
++attribute pki_tks_pidfiles;
++attribute pki_tks_script;
++attribute pki_tks_process;
++
++type pki_tks_tomcat_exec_t;
++files_type(pki_tks_tomcat_exec_t)
++
++pki_ca_template(pki_tks)
++
++
++attribute pki_tps_config;
++attribute pki_tps_executable;
++attribute pki_tps_var_lib;
++attribute pki_tps_var_log;
++attribute pki_tps_var_run;
++attribute pki_tps_pidfiles;
++attribute pki_tps_script;
++attribute pki_tps_process;
++
++type pki_tps_tomcat_exec_t;
++files_type(pki_tps_tomcat_exec_t)
++
++pki_ra_template(pki_tps)
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.fc serefpolicy-3.6.1/policy/modules/services/polkit.fc
+--- nsaserefpolicy/policy/modules/services/polkit.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/polkit.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,9 @@
++
++/usr/libexec/polkit-read-auth-helper -- gen_context(system_u:object_r:polkit_auth_exec_t,s0)
++/usr/libexec/polkit-grant-helper.* -- gen_context(system_u:object_r:polkit_grant_exec_t,s0)
++/usr/libexec/polkit-resolve-exe-helper.* -- gen_context(system_u:object_r:polkit_resolve_exec_t,s0)
++/usr/libexec/polkitd -- gen_context(system_u:object_r:polkit_exec_t,s0)
++
++/var/lib/PolicyKit(/.*)? gen_context(system_u:object_r:polkit_var_lib_t,s0)
++/var/run/PolicyKit(/.*)? gen_context(system_u:object_r:polkit_var_run_t,s0)
++/var/lib/PolicyKit-public(/.*)? gen_context(system_u:object_r:polkit_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.6.1/policy/modules/services/polkit.if
+--- nsaserefpolicy/policy/modules/services/polkit.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/polkit.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,202 @@
++
++## <summary>policy for polkit_auth</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run polkit_auth.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`polkit_domtrans_auth',`
++ gen_require(`
++ type polkit_auth_t;
++ type polkit_auth_exec_t;
++ ')
++
++ domtrans_pattern($1, polkit_auth_exec_t, polkit_auth_t)
++')
++
++########################################
++## <summary>
++## Search polkit lib directories.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`polkit_search_lib',`
++ gen_require(`
++ type polkit_var_lib_t;
++ ')
++
++ allow $1 polkit_var_lib_t:dir search_dir_perms;
++ files_search_var_lib($1)
++')
++
++########################################
++## <summary>
++## read polkit lib files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`polkit_read_lib',`
++ gen_require(`
++ type polkit_var_lib_t;
++ ')
++
++ files_search_var_lib($1)
++ read_files_pattern($1, polkit_var_lib_t, polkit_var_lib_t)
++
++ # Broken placement
++ cron_read_system_job_lib_files($1)
++')
++
++########################################
++## <summary>
++## Execute a domain transition to run polkit_grant.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`polkit_domtrans_grant',`
++ gen_require(`
++ type polkit_grant_t;
++ type polkit_grant_exec_t;
++ ')
++
++ domtrans_pattern($1, polkit_grant_exec_t, polkit_grant_t)
++')
++
++########################################
++## <summary>
++## Execute a domain transition to run polkit_resolve.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`polkit_domtrans_resolve',`
++ gen_require(`
++ type polkit_resolve_t;
++ type polkit_resolve_exec_t;
++ ')
++
++ domtrans_pattern($1, polkit_resolve_exec_t, polkit_resolve_t)
++
++ allow polkit_resolve_t $1:dir list_dir_perms;
++ read_files_pattern(polkit_resolve_t, $1, $1)
++ read_lnk_files_pattern(polkit_resolve_t, $1, $1)
++ allow polkit_resolve_t $1:process getattr;
++')
++
++########################################
++## <summary>
++## Execute a policy_grant in the policy_grant domain, and
++## allow the specified role the policy_grant domain,
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the load_policy domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`polkit_run_grant',`
++ gen_require(`
++ type polkit_grant_t;
++ ')
++
++ polkit_domtrans_grant($1)
++ role $2 types polkit_grant_t;
++ allow $1 polkit_grant_t:process signal;
++ read_files_pattern(polkit_grant_t, $1, $1)
++ allow polkit_grant_t $1:process getattr;
++')
++
++########################################
++## <summary>
++## Execute a policy_auth in the policy_auth domain, and
++## allow the specified role the policy_auth domain,
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the load_policy domain.
++## </summary>
++## </param>
++#
++interface(`polkit_run_auth',`
++ gen_require(`
++ type polkit_auth_t;
++ ')
++
++ polkit_domtrans_auth($1)
++ role $2 types polkit_auth_t;
++')
++
++#######################################
++## <summary>
++## The per role template for the nsplugin module.
++## </summary>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++template(`polkit_role',`
++ polkit_run_auth($2, $1)
++ polkit_run_grant($2, $1)
++ polkit_read_lib($2)
++')
++
++########################################
++## <summary>
++## Send and receive messages from
++## polkit over dbus.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`polkit_dbus_chat',`
++ gen_require(`
++ type polkit_t;
++ class dbus send_msg;
++ ')
++
++ allow $1 polkit_t:dbus send_msg;
++ allow polkit_t $1:dbus send_msg;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.6.1/policy/modules/services/polkit.te
+--- nsaserefpolicy/policy/modules/services/polkit.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/polkit.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,218 @@
++policy_module(polkit_auth, 1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type polkit_t;
++type polkit_exec_t;
++init_daemon_domain(polkit_t, polkit_exec_t)
++
++type polkit_grant_t;
++type polkit_grant_exec_t;
++init_system_domain(polkit_grant_t, polkit_grant_exec_t)
++
++type polkit_resolve_t;
++type polkit_resolve_exec_t;
++init_system_domain(polkit_resolve_t, polkit_resolve_exec_t)
++
++type polkit_auth_t;
++type polkit_auth_exec_t;
++init_daemon_domain(polkit_auth_t, polkit_auth_exec_t)
++
++type polkit_var_lib_t;
++files_type(polkit_var_lib_t)
++
++type polkit_var_run_t;
++files_pid_file(polkit_var_run_t)
++
++########################################
++#
++# polkit local policy
++#
++
++allow polkit_t self:capability { setgid setuid };
++allow polkit_t self:process getattr;
++
++allow polkit_t self:unix_dgram_socket create_socket_perms;
++allow polkit_t self:fifo_file rw_file_perms;
++allow polkit_t self:unix_stream_socket create_stream_socket_perms;
++
++polkit_domtrans_auth(polkit_t)
++polkit_domtrans_resolve(polkit_t)
++
++can_exec(polkit_t, polkit_exec_t)
++corecmd_exec_bin(polkit_t)
++
++domain_use_interactive_fds(polkit_t)
++
++files_read_etc_files(polkit_t)
++files_read_usr_files(polkit_t)
++
++fs_list_inotifyfs(polkit_t)
++
++kernel_read_kernel_sysctls(polkit_t)
++
++auth_use_nsswitch(polkit_t)
++
++miscfiles_read_localization(polkit_t)
++
++logging_send_syslog_msg(polkit_t)
++
++manage_files_pattern(polkit_t, polkit_var_lib_t, polkit_var_lib_t)
++
++# pid file
++manage_dirs_pattern(polkit_t, polkit_var_run_t, polkit_var_run_t)
++manage_files_pattern(polkit_t, polkit_var_run_t, polkit_var_run_t)
++files_pid_filetrans(polkit_t, polkit_var_run_t, { file dir })
++
++optional_policy(`
++ dbus_system_domain(polkit_t, polkit_exec_t)
++ optional_policy(`
++ consolekit_dbus_chat(polkit_t)
++ ')
++')
++
++########################################
++#
++# polkit_auth local policy
++#
++
++allow polkit_auth_t self:capability setgid;
++allow polkit_auth_t self:process { getattr };
++
++allow polkit_auth_t self:unix_dgram_socket create_socket_perms;
++allow polkit_auth_t self:fifo_file rw_file_perms;
++allow polkit_auth_t self:unix_stream_socket create_stream_socket_perms;
++
++can_exec(polkit_auth_t, polkit_auth_exec_t)
++corecmd_search_bin(polkit_auth_t)
++
++domain_use_interactive_fds(polkit_auth_t)
++
++files_read_etc_files(polkit_auth_t)
++files_read_usr_files(polkit_auth_t)
++
++auth_use_nsswitch(polkit_auth_t)
++
++miscfiles_read_localization(polkit_auth_t)
++
++logging_send_syslog_msg(polkit_auth_t)
++
++manage_files_pattern(polkit_auth_t, polkit_var_lib_t, polkit_var_lib_t)
++
++# pid file
++manage_dirs_pattern(polkit_auth_t, polkit_var_run_t, polkit_var_run_t)
++manage_files_pattern(polkit_auth_t, polkit_var_run_t, polkit_var_run_t)
++files_pid_filetrans(polkit_auth_t, polkit_var_run_t, { file dir })
++
++userdom_read_all_users_state(polkit_t)
++userdom_dontaudit_read_user_home_content_files(polkit_auth_t)
++
++optional_policy(`
++ cron_read_system_job_lib_files(polkit_t)
++')
++
++optional_policy(`
++ dbus_session_bus_client(polkit_auth_t)
++ consolekit_dbus_chat(polkit_auth_t)
++ dbus_system_domain(polkit_exec_t, polkit_t)
++')
++
++optional_policy(`
++ kernel_search_proc(polkit_auth_t)
++ hal_read_state(polkit_auth_t)
++')
++
++########################################
++#
++# polkit_grant local policy
++#
++
++allow polkit_grant_t self:capability setuid;
++allow polkit_grant_t self:process getattr;
++
++allow polkit_grant_t self:unix_dgram_socket create_socket_perms;
++allow polkit_grant_t self:fifo_file rw_file_perms;
++allow polkit_grant_t self:unix_stream_socket create_stream_socket_perms;
++
++can_exec(polkit_grant_t, polkit_grant_exec_t)
++corecmd_search_bin(polkit_grant_t)
++
++files_read_etc_files(polkit_grant_t)
++files_read_usr_files(polkit_grant_t)
++
++auth_use_nsswitch(polkit_grant_t)
++auth_domtrans_chk_passwd(polkit_grant_t)
++
++miscfiles_read_localization(polkit_grant_t)
++
++logging_send_syslog_msg(polkit_grant_t)
++
++polkit_domtrans_auth(polkit_grant_t)
++polkit_domtrans_resolve(polkit_grant_t)
++
++manage_files_pattern(polkit_grant_t, polkit_var_run_t, polkit_var_run_t)
++
++manage_files_pattern(polkit_grant_t, polkit_var_lib_t, polkit_var_lib_t)
++userdom_read_all_users_state(polkit_grant_t)
++
++optional_policy(`
++ cron_manage_system_job_lib_files(polkit_grant_t)
++')
++
++optional_policy(`
++ dbus_system_bus_client(polkit_grant_t)
++ optional_policy(`
++ consolekit_dbus_chat(polkit_grant_t)
++ ')
++')
++
++########################################
++#
++# polkit_resolve local policy
++#
++
++allow polkit_resolve_t self:capability { setuid sys_nice sys_ptrace };
++allow polkit_resolve_t self:process getattr;
++
++allow polkit_resolve_t self:unix_dgram_socket create_socket_perms;
++allow polkit_resolve_t self:fifo_file rw_file_perms;
++allow polkit_resolve_t self:unix_stream_socket create_stream_socket_perms;
++
++read_files_pattern(polkit_resolve_t, polkit_var_lib_t, polkit_var_lib_t)
++
++can_exec(polkit_resolve_t, polkit_resolve_exec_t)
++corecmd_search_bin(polkit_resolve_t)
++
++polkit_domtrans_auth(polkit_resolve_t)
++
++files_read_etc_files(polkit_resolve_t)
++files_read_usr_files(polkit_resolve_t)
++
++auth_use_nsswitch(polkit_resolve_t)
++
++miscfiles_read_localization(polkit_resolve_t)
++
++logging_send_syslog_msg(polkit_resolve_t)
++
++userdom_read_all_users_state(polkit_resolve_t)
++userdom_ptrace_all_users(polkit_resolve_t)
++mcs_ptrace_all(polkit_resolve_t)
++
++optional_policy(`
++ dbus_system_bus_client(polkit_resolve_t)
++ optional_policy(`
++ consolekit_dbus_chat(polkit_resolve_t)
++ ')
++')
++
++optional_policy(`
++ kernel_search_proc(polkit_resolve_t)
++ hal_read_state(polkit_resolve_t)
++')
++
++optional_policy(`
++ unconfined_ptrace(polkit_resolve_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.fc serefpolicy-3.6.1/policy/modules/services/portreserve.fc
+--- nsaserefpolicy/policy/modules/services/portreserve.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/portreserve.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,12 @@
++# portreserve executable will have:
++# label: system_u:object_r:portreserve_exec_t
++# MLS sensitivity: s0
++# MCS categories: <none>
++
++#exec
++/sbin/portreserve -- gen_context(system_u:object_r:portreserve_exec_t,s0)
++
++/var/run/portreserve(/.*)? gen_context(system_u:object_r:portreserve_var_run_t,s0)
++
++/etc/portreserve(/.*)? gen_context(system_u:object_r:portreserve_etc_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.if serefpolicy-3.6.1/policy/modules/services/portreserve.if
+--- nsaserefpolicy/policy/modules/services/portreserve.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/portreserve.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,66 @@
++## <summary>policy for portreserve</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run portreserve.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`portreserve_domtrans',`
++ gen_require(`
++ type portreserve_t, portreserve_exec_t;
++ ')
++
++ domtrans_pattern($1,portreserve_exec_t,portreserve_t)
++')
++
++#######################################
++## <summary>
++## Allow the specified domain to read
++## portreserve etcuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++##
++#
++interface(`portreserve_read_etc',`
++ gen_require(`
++ type portreserve_etc_t;
++ ')
++
++ files_search_etc($1)
++ allow $1 portreserve_etc_t:dir list_dir_perms;
++ read_files_pattern($1, portreserve_etc_t, portreserve_etc_t)
++ read_lnk_files_pattern($1, portreserve_etc_t, portreserve_etc_t)
++')
++
++#######################################
++## <summary>
++## Allow the specified domain to manage
++## portreserve etcuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++##
++#
++interface(`portreserve_manage_etc',`
++ gen_require(`
++ type portreserve_etc_t;
++ ')
++
++ files_search_etc($1)
++ manage_dirs_pattern($1, portreserve_etc_t, portreserve_etc_t)
++ manage_files_pattern($1, portreserve_etc_t, portreserve_etc_t)
++ read_lnk_files_pattern($1, portreserve_etc_t, portreserve_etc_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.6.1/policy/modules/services/portreserve.te
+--- nsaserefpolicy/policy/modules/services/portreserve.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/portreserve.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,52 @@
++policy_module(portreserve,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type portreserve_t;
++type portreserve_exec_t;
++init_daemon_domain(portreserve_t, portreserve_exec_t)
++
++type portreserve_etc_t;
++files_type(portreserve_etc_t)
++
++type portreserve_var_run_t;
++files_pid_file(portreserve_var_run_t)
++
++########################################
++#
++# Portreserve local policy
++#
++allow portreserve_t self:fifo_file rw_fifo_file_perms;
++allow portreserve_t self:unix_stream_socket create_stream_socket_perms;
++allow portreserve_t self:unix_dgram_socket { create_socket_perms sendto };
++allow portreserve_t self:tcp_socket create_socket_perms;
++allow portreserve_t self:udp_socket create_socket_perms;
++
++# Read etc files
++list_dirs_pattern(portreserve_t, portreserve_etc_t, portreserve_etc_t)
++read_files_pattern(portreserve_t, portreserve_etc_t, portreserve_etc_t)
++
++# Manage /var/run/portreserve/*
++manage_dirs_pattern(portreserve_t, portreserve_var_run_t, portreserve_var_run_t)
++manage_files_pattern(portreserve_t, portreserve_var_run_t, portreserve_var_run_t)
++manage_sock_files_pattern(portreserve_t, portreserve_var_run_t, portreserve_var_run_t)
++files_pid_filetrans(portreserve_t,portreserve_var_run_t, { file sock_file })
++
++corenet_sendrecv_unlabeled_packets(portreserve_t)
++corenet_all_recvfrom_netlabel(portreserve_t)
++corenet_tcp_bind_all_ports(portreserve_t)
++corenet_tcp_bind_all_ports(portreserve_t)
++corenet_udp_bind_all_nodes(portreserve_t)
++corenet_udp_bind_all_ports(portreserve_t)
++corenet_tcp_bind_inaddr_any_node(portreserve_t)
++corenet_udp_bind_inaddr_any_node(portreserve_t)
++
++files_read_etc_files(portreserve_t)
++
++# Init script handling
++#init_use_fds(portreserve_t)
++#init_use_script_ptys(portreserve_t)
++#domain_use_interactive_fds(portreserve_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.6.1/policy/modules/services/postfix.fc
+--- nsaserefpolicy/policy/modules/services/postfix.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/postfix.fc 2008-11-25 09:45:43.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)
+ /usr/lib/postfix/pipe -- gen_context(system_u:object_r:postfix_pipe_exec_t,s0)
+-/usr/lib/postfix/virtual -- gen_context(system_u:object_r:postfix_virtual_exec_t,s0)
+ ')
+ /etc/postfix/postfix-script.* -- gen_context(system_u:object_r:postfix_exec_t,s0)
+ /etc/postfix/prng_exch -- gen_context(system_u:object_r:postfix_prng_t,s0)
+ /usr/sbin/postalias -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
+-/usr/sbin/postcat -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
+ /usr/sbin/postdrop -- gen_context(system_u:object_r:postfix_postdrop_exec_t,s0)
+ /usr/sbin/postfix -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
+ /usr/sbin/postkick -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.1/policy/modules/services/postfix.if
+--- nsaserefpolicy/policy/modules/services/postfix.if 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/postfix.if 2008-11-25 09:45:43.000000000 -0500
+@@ -174,9 +174,8 @@
+ type postfix_etc_t;
+ ')
+
+- allow $1 postfix_etc_t:dir list_dir_perms;
+- allow $1 postfix_etc_t:file read_file_perms;
+- allow $1 postfix_etc_t:lnk_file read_lnk_file_perms;
++ read_files_pattern($1, postfix_etc_t, postfix_etc_t)
++ read_lnk_files_pattern($1, postfix_etc_t, postfix_etc_t)
+ files_search_etc($1)
+ ')
+
+@@ -378,7 +377,7 @@
+ ## </summary>
+ ## </param>
+ #
+-interface(`postfix_create_pivate_sockets',`
++interface(`postfix_create_private_sockets',`
+ gen_require(`
+ type postfix_private_t;
+ ')
+@@ -389,6 +388,25 @@
+
+ ########################################
+ ## <summary>
++## manage named socket in a postfix private directory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`postfix_manage_private_sockets',`
++ gen_require(`
++ type postfix_private_t;
++ ')
++
++ allow $1 postfix_private_t:dir list_dir_perms;
++ manage_sock_files_pattern($1, postfix_private_t, postfix_private_t)
++')
++
++########################################
++## <summary>
+ ## Execute the master postfix program in the
+ ## postfix_master domain.
+ ## </summary>
+@@ -465,6 +483,25 @@
+
+ ########################################
+ ## <summary>
++## Manage postfix mail spool files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`postfix_manage_spool_files',`
++ gen_require(`
++ type postfix_spool_t;
++ ')
++
++ files_search_spool($1)
++ manage_files_pattern($1, postfix_spool_t, postfix_spool_t)
++')
++
++########################################
++## <summary>
+ ## Execute postfix user mail programs
+ ## in their respective domains.
+ ## </summary>
+@@ -481,3 +518,23 @@
+
+ typeattribute $1 postfix_user_domtrans;
+ ')
++
++########################################
++## <summary>
++## Execute the master postdrop in the
++## postfix_postdrop domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`postfix_domtrans_postdrop',`
++ gen_require(`
++ type postfix_postdrop_t, postfix_postdrop_exec_t;
++ ')
++
++ domtrans_pattern($1, postfix_postdrop_exec_t, postfix_postdrop_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.1/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te 2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/postfix.te 2008-11-25 09:45:43.000000000 -0500
+@@ -1,11 +1,19 @@
+
+-policy_module(postfix, 1.9.2)
++policy_module(postfix, 1.9.1)
+
+ ########################################
+ #
+ # Declarations
+ #
+
++## <desc>
++## <p>
++## Allow postfix_local domain full write access to mail_spool directories
++##
++## </p>
++## </desc>
++gen_tunable(allow_postfix_local_write_mail_spool, false)
++
+ attribute postfix_user_domains;
+ # domains that transition to the
+ # postfix user domains
+@@ -19,7 +27,7 @@
+ postfix_server_domain_template(cleanup)
+
+ type postfix_etc_t;
+-files_type(postfix_etc_t)
++files_config_file(postfix_etc_t)
+
+ type postfix_exec_t;
+ application_executable_file(postfix_exec_t)
+@@ -27,6 +35,12 @@
+ postfix_server_domain_template(local)
+ mta_mailserver_delivery(postfix_local_t)
+
++userdom_read_user_home_content_files(postfix_local_t)
++
++tunable_policy(`allow_postfix_local_write_mail_spool',`
++ mta_manage_spool(postfix_local_t)
++')
++
+ type postfix_local_tmp_t;
+ files_tmp_file(postfix_local_tmp_t)
+
+@@ -34,6 +48,7 @@
+ type postfix_map_t;
+ type postfix_map_exec_t;
+ application_domain(postfix_map_t, postfix_map_exec_t)
++role system_r types postfix_map_t;
+
+ type postfix_map_tmp_t;
+ files_tmp_file(postfix_map_tmp_t)
+@@ -103,6 +118,7 @@
+ allow postfix_master_t self:fifo_file rw_fifo_file_perms;
+ allow postfix_master_t self:tcp_socket create_stream_socket_perms;
+ allow postfix_master_t self:udp_socket create_socket_perms;
++allow postfix_master_t self:process setrlimit;
+
+ allow postfix_master_t postfix_etc_t:file rw_file_perms;
+
+@@ -142,6 +158,7 @@
+
+ delete_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
+ rename_files_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
++setattr_dirs_pattern(postfix_master_t, postfix_spool_maildrop_t, postfix_spool_maildrop_t)
+
+ kernel_read_all_sysctls(postfix_master_t)
+
+@@ -170,6 +187,8 @@
+ domain_use_interactive_fds(postfix_master_t)
+
+ files_read_usr_files(postfix_master_t)
++files_search_var_lib(postfix_master_t)
++files_search_tmp(postfix_master_t)
+
+ term_dontaudit_search_ptys(postfix_master_t)
+
+@@ -181,15 +200,14 @@
+
+ mta_rw_aliases(postfix_master_t)
+ mta_read_sendmail_bin(postfix_master_t)
++mta_getattr_spool(postfix_master_t)
+
+-ifdef(`distro_redhat',`
+- # for newer main.cf that uses /etc/aliases
+- mta_manage_aliases(postfix_master_t)
+- mta_etc_filetrans_aliases(postfix_master_t)
++optional_policy(`
++ cyrus_stream_connect(postfix_master_t)
+ ')
+
+ optional_policy(`
+- cyrus_stream_connect(postfix_master_t)
++ kerberos_keytab_template(postfix, postfix_t)
+ ')
+
+ optional_policy(`
+@@ -202,9 +220,29 @@
+ ')
+
+ optional_policy(`
++ postgrey_search_spool(postfix_master_t)
++')
++
++optional_policy(`
+ sendmail_signal(postfix_master_t)
+ ')
+
++###########################################################
++#
++# Partially converted rules. THESE ARE ONLY TEMPORARY
++#
++
++ifdef(`distro_redhat',`
++ # for newer main.cf that uses /etc/aliases
++ allow postfix_master_t etc_aliases_t:dir manage_dir_perms;
++ allow postfix_master_t etc_aliases_t:file manage_file_perms;
++ allow postfix_master_t etc_aliases_t:lnk_file manage_lnk_file_perms;
++ mta_etc_filetrans_aliases(postfix_master_t)
++ filetrans_pattern(postfix_master_t, postfix_etc_t, etc_aliases_t, { dir file lnk_file })
++')
++
++# end partially converted rules
++
+ ########################################
+ #
+ # Postfix bounce local policy
+@@ -245,6 +283,10 @@
+
+ corecmd_exec_bin(postfix_cleanup_t)
+
++optional_policy(`
++ mailman_read_data_files(postfix_cleanup_t)
++')
++
+ ########################################
+ #
+ # Postfix local local policy
+@@ -270,18 +312,29 @@
+
+ files_read_etc_files(postfix_local_t)
+
++logging_dontaudit_search_logs(postfix_local_t)
++
+ mta_read_aliases(postfix_local_t)
+ mta_delete_spool(postfix_local_t)
+ # For reading spamassasin
+ mta_read_config(postfix_local_t)
+
++domtrans_pattern(postfix_local_t, postfix_postdrop_exec_t, postfix_postdrop_t)
++
+ optional_policy(`
+ clamav_search_lib(postfix_local_t)
++ clamav_exec_clamscan(postfix_local_t)
+ ')
+
+ optional_policy(`
+ # for postalias
+ mailman_manage_data_files(postfix_local_t)
++ mailman_append_log(postfix_local_t)
++ mailman_read_log(postfix_local_t)
++')
++
++optional_policy(`
++ nagios_search_spool(postfix_local_t)
+ ')
+
+ optional_policy(`
+@@ -292,8 +345,7 @@
+ #
+ # Postfix map local policy
+ #
+-
+-allow postfix_map_t self:capability setgid;
++allow postfix_map_t self:capability { dac_override setgid setuid };
+ allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
+ allow postfix_map_t self:unix_dgram_socket create_socket_perms;
+ allow postfix_map_t self:tcp_socket create_stream_socket_perms;
+@@ -340,10 +392,6 @@
+
+ miscfiles_read_localization(postfix_map_t)
+
+-seutil_read_config(postfix_map_t)
+-
+-userdom_use_user_terminals(postfix_map_t)
+-
+ tunable_policy(`read_default_t',`
+ files_list_default(postfix_map_t)
+ files_read_default_files(postfix_map_t)
+@@ -356,6 +404,11 @@
+ locallogin_dontaudit_use_fds(postfix_map_t)
+ ')
+
++optional_policy(`
++# for postalias
++ mailman_manage_data_files(postfix_map_t)
++')
++
+ ########################################
+ #
+ # Postfix pickup local policy
+@@ -380,6 +433,7 @@
+ #
+
+ allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
++allow postfix_pipe_t self:process setrlimit;
+
+ write_sock_files_pattern(postfix_pipe_t, postfix_private_t, postfix_private_t)
+
+@@ -387,6 +441,12 @@
+
+ rw_files_pattern(postfix_pipe_t, postfix_spool_t, postfix_spool_t)
+
++domtrans_pattern(postfix_pipe_t, postfix_postdrop_exec_t, postfix_postdrop_t)
++
++optional_policy(`
++ dovecot_domtrans_deliver(postfix_pipe_t)
++')
++
+ optional_policy(`
+ procmail_domtrans(postfix_pipe_t)
+ ')
+@@ -396,6 +456,15 @@
+ ')
+
+ optional_policy(`
++ mta_manage_spool(postfix_pipe_t)
++ mta_send_mail(postfix_pipe_t)
++')
++
++optional_policy(`
++ spamassassin_domtrans_client(postfix_pipe_t)
++')
++
++optional_policy(`
+ uucp_domtrans_uux(postfix_pipe_t)
+ ')
+
+@@ -432,8 +501,11 @@
+ ')
+
+ optional_policy(`
+- ppp_use_fds(postfix_postqueue_t)
+- ppp_sigchld(postfix_postqueue_t)
++ sendmail_rw_unix_stream_sockets(postfix_postdrop_t)
++')
++
++optional_policy(`
++ uucp_manage_spool(postfix_postdrop_t)
+ ')
+
+ #######################################
+@@ -459,6 +531,15 @@
+ init_sigchld_script(postfix_postqueue_t)
+ init_use_script_fds(postfix_postqueue_t)
+
++optional_policy(`
++ cron_system_entry(postfix_postqueue_t, postfix_postqueue_exec_t)
++')
++
++optional_policy(`
++ ppp_use_fds(postfix_postqueue_t)
++ ppp_sigchld(postfix_postqueue_t)
++')
++
+ ########################################
+ #
+ # Postfix qmgr local policy
+@@ -543,9 +624,18 @@
+
+ # for OpenSSL certificates
+ files_read_usr_files(postfix_smtpd_t)
++
++# postfix checks the size of all mounted file systems
++fs_getattr_all_dirs(postfix_smtpd_t)
++fs_getattr_all_fs(postfix_smtpd_t)
++
+ mta_read_aliases(postfix_smtpd_t)
+
+ optional_policy(`
++ dovecot_auth_stream_connect(postfix_smtpd_t)
++')
++
++optional_policy(`
+ mailman_read_data_files(postfix_smtpd_t)
+ ')
+
+@@ -572,7 +662,7 @@
+ files_tmp_filetrans(postfix_virtual_t, postfix_virtual_tmp_t, { file dir })
+
+ # connect to master process
+-stream_connect_pattern(postfix_virtual_t, postfix_public_t, postfix_public_t, postfix_master_t)
++stream_connect_pattern(postfix_virtual_t, { postfix_private_t postfix_public_t }, { postfix_private_t postfix_public_t }, postfix_master_t)
+
+ corecmd_exec_shell(postfix_virtual_t)
+ corecmd_exec_bin(postfix_virtual_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.6.1/policy/modules/services/postgresql.fc
+--- nsaserefpolicy/policy/modules/services/postgresql.fc 2008-08-14 13:08:27.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/postgresql.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,6 +2,7 @@
+ # /etc
+ #
+ /etc/postgresql(/.*)? gen_context(system_u:object_r:postgresql_etc_t,s0)
++/etc/rc\.d/init\.d/postgresql -- gen_context(system_u:object_r:postgresql_initrc_exec_t,s0)
+
+ #
+ # /usr
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.6.1/policy/modules/services/postgresql.if
+--- nsaserefpolicy/policy/modules/services/postgresql.if 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/postgresql.if 2008-11-25 09:45:43.000000000 -0500
+@@ -351,3 +351,46 @@
+
+ typeattribute $1 sepgsql_unconfined_type;
+ ')
++
++########################################
++## <summary>
++## All of the rules required to administrate an postgresql environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the postgresql domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`postgresql_admin',`
++ gen_require(`
++ type postgresql_t, postgresql_var_run_t;
++ type postgresql_tmp_t, postgresql_db_t;
++ type postgresql_etc_t, postgresql_log_t;
++ type postgresql_initrc_exec_t;
++ ')
++
++ allow $1 postgresql_t:process { ptrace signal_perms };
++ ps_process_pattern($1, postgresql_t)
++
++ init_labeled_script_domtrans($1, postgresql_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 postgresql_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ admin_pattern($1, postgresql_var_run_t)
++
++ admin_pattern($1, postgresql_db_t)
++
++ admin_pattern($1, postgresql_etc_t)
++
++ admin_pattern($1, postgresql_log_t)
++
++ admin_pattern($1, postgresql_tmp_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.6.1/policy/modules/services/postgresql.te
+--- nsaserefpolicy/policy/modules/services/postgresql.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/postgresql.te 2008-11-25 09:45:43.000000000 -0500
+@@ -32,6 +32,9 @@
+ type postgresql_etc_t;
+ files_config_file(postgresql_etc_t)
+
++type postgresql_initrc_exec_t;
++init_script_file(postgresql_initrc_exec_t)
++
+ type postgresql_lock_t;
+ files_lock_file(postgresql_lock_t)
+
+@@ -124,6 +127,7 @@
+ dontaudit postgresql_t self:capability { sys_tty_config sys_admin };
+ allow postgresql_t self:process signal_perms;
+ allow postgresql_t self:fifo_file rw_fifo_file_perms;
++allow postgresql_t self:file { getattr read };
+ allow postgresql_t self:sem create_sem_perms;
+ allow postgresql_t self:shm create_shm_perms;
+ allow postgresql_t self:tcp_socket create_stream_socket_perms;
+@@ -178,7 +182,7 @@
+
+ manage_files_pattern(postgresql_t, postgresql_var_run_t, postgresql_var_run_t)
+ manage_sock_files_pattern(postgresql_t, postgresql_var_run_t, postgresql_var_run_t)
+-files_pid_filetrans(postgresql_t, postgresql_var_run_t, file)
++files_pid_filetrans(postgresql_t, postgresql_var_run_t, { file sock_file })
+
+ kernel_read_kernel_sysctls(postgresql_t)
+ kernel_read_system_state(postgresql_t)
+@@ -194,6 +198,7 @@
+ corenet_udp_sendrecv_all_nodes(postgresql_t)
+ corenet_tcp_sendrecv_all_ports(postgresql_t)
+ corenet_udp_sendrecv_all_ports(postgresql_t)
++corenet_udp_bind_all_nodes(postgresql_t)
+ corenet_tcp_bind_all_nodes(postgresql_t)
+ corenet_tcp_bind_postgresql_port(postgresql_t)
+ corenet_tcp_connect_auth_port(postgresql_t)
+@@ -304,7 +309,7 @@
+ allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select };
+
+ allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute };
+-allow sepgsql_client_type sepgsql_trusted_proc_t:db_procedure { getattr execute entrypoint };
++allow sepgsql_client_type sepgsql_trusted_proc_exec_t:db_procedure { getattr execute entrypoint };
+
+ allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write };
+ allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read };
+@@ -345,7 +350,7 @@
+
+ # unconfined domain is not allowed to invoke user defined procedure directly.
+ # They have to confirm and relabel it at first.
+-allow sepgsql_unconfined_type { sepgsql_proc_t sepgsql_trusted_proc_t }:db_procedure *;
++allow sepgsql_unconfined_type { sepgsql_proc_t sepgsql_trusted_proc_exec_t }:db_procedure *;
+ allow sepgsql_unconfined_type sepgsql_procedure_type:db_procedure { create drop getattr setattr relabelfrom relabelto };
+
+ allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.6.1/policy/modules/services/postgrey.te
+--- nsaserefpolicy/policy/modules/services/postgrey.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/postgrey.te 2008-11-25 09:45:43.000000000 -0500
+@@ -95,6 +95,7 @@
+
+ optional_policy(`
+ postfix_read_config(postgrey_t)
++ postfix_manage_spool_files(postgrey_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.6.1/policy/modules/services/ppp.fc
+--- nsaserefpolicy/policy/modules/services/ppp.fc 2008-09-11 11:28:34.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/ppp.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,7 +1,7 @@
+ #
+ # /etc
+ #
+-/etc/rc.d/init.d/ppp -- gen_context(system_u:object_r:pppd_script_exec_t,s0)
++/etc/rc\.d/init\.d/ppp -- gen_context(system_u:object_r:pppd_initrc_exec_t,s0)
+
+ /etc/ppp -d gen_context(system_u:object_r:pppd_etc_t,s0)
+ /etc/ppp(/.*)? -- gen_context(system_u:object_r:pppd_etc_rw_t,s0)
+@@ -8,9 +8,8 @@
+ /etc/ppp/peers(/.*)? gen_context(system_u:object_r:pppd_etc_rw_t,s0)
+ /etc/ppp/.*secrets -- gen_context(system_u:object_r:pppd_secret_t,s0)
+ /etc/ppp/resolv\.conf -- gen_context(system_u:object_r:pppd_etc_rw_t,s0)
+-
+ # Fix /etc/ppp {up,down} family scripts (see man pppd)
+-/etc/ppp/(auth|ip(v6|x)?)-(up|down) -- gen_context(system_u:object_r:pppd_script_exec_t,s0)
++/etc/ppp/(auth|ip(v6|x)?)-(up|down) -- gen_context(system_u:object_r:pppd_initrc_exec_t,s0)
+
+ #
+ # /sbin
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.6.1/policy/modules/services/ppp.if
+--- nsaserefpolicy/policy/modules/services/ppp.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ppp.if 2008-11-25 09:45:43.000000000 -0500
+@@ -58,6 +58,25 @@
+
+ ########################################
+ ## <summary>
++## Send ppp a kill signal
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++#
++interface(`ppp_kill',`
++ gen_require(`
++ type pppd_t;
++ ')
++
++ allow $1 pppd_t:process sigkill;
++')
++
++########################################
++## <summary>
+ ## Send a generic signal to PPP.
+ ## </summary>
+ ## <param name="domain">
+@@ -298,6 +317,24 @@
+
+ ########################################
+ ## <summary>
++## Execute ppp server in the ntpd domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`ppp_initrc_domtrans',`
++ gen_require(`
++ type pppd_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, pppd_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## All of the rules required to administrate
+ ## an ppp environment
+ ## </summary>
+@@ -315,33 +352,39 @@
+ type pppd_etc_rw_t, pppd_var_run_t;
+
+ type pptp_t, pptp_log_t, pptp_var_run_t;
++ type pppd_initrc_exec_t;
+ ')
+
+ allow $1 pppd_t:process { ptrace signal_perms getattr };
+ ps_process_pattern($1, pppd_t)
+
++ ppp_initrc_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 pppd_initrc_exec_t system_r;
++ allow $2 system_r;
++
+ files_list_tmp($1)
+- manage_files_pattern($1, pppd_tmp_t, pppd_tmp_t)
++ admin_pattern($1, pppd_tmp_t)
+
+ logging_list_logs($1)
+- manage_files_pattern($1, pppd_log_t, pppd_log_t)
++ admin_pattern($1, pppd_log_t)
+
+- manage_files_pattern($1, pppd_lock_t, pppd_lock_t)
++ admin_pattern($1, pppd_lock_t)
+
+ files_list_etc($1)
+- manage_files_pattern($1, pppd_etc_t, pppd_etc_t)
++ admin_pattern($1, pppd_etc_t)
+
+- manage_files_pattern($1, pppd_etc_rw_t, pppd_etc_rw_t)
++ admin_pattern($1, pppd_etc_rw_t)
+
+- manage_files_pattern($1, pppd_secret_t, pppd_secret_t)
++ admin_pattern($1, pppd_secret_t)
+
+ files_list_pids($1)
+- manage_files_pattern($1, pppd_var_run_t, pppd_var_run_t)
++ admin_pattern($1, pppd_var_run_t)
+
+ allow $1 pptp_t:process { ptrace signal_perms getattr };
+ ps_process_pattern($1, pptp_t)
+
+- manage_files_pattern($1, pptp_log_t, pptp_log_t)
++ admin_pattern($1, pptp_log_t)
+
+- manage_files_pattern($1, pptp_var_run_t, pptp_var_run_t)
++ admin_pattern($1, pptp_var_run_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.6.1/policy/modules/services/ppp.te
+--- nsaserefpolicy/policy/modules/services/ppp.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ppp.te 2008-11-25 09:45:43.000000000 -0500
+@@ -37,8 +37,8 @@
+ type pppd_etc_rw_t;
+ files_type(pppd_etc_rw_t)
+
+-type pppd_script_exec_t;
+-files_type(pppd_script_exec_t)
++type pppd_initrc_exec_t;
++files_type(pppd_initrc_exec_t)
+
+ # pppd_secret_t is the type of the pap and chap password files
+ type pppd_secret_t;
+@@ -114,6 +114,8 @@
+ # Access secret files
+ allow pppd_t pppd_secret_t:file read_file_perms;
+
++ppp_initrc_domtrans(pppd_t)
++
+ kernel_read_kernel_sysctls(pppd_t)
+ kernel_read_system_state(pppd_t)
+ kernel_rw_net_sysctls(pppd_t)
+@@ -174,7 +176,6 @@
+
+ userdom_use_user_terminals(pppd_t)
+ userdom_dontaudit_use_unpriv_user_fds(pppd_t)
+-# for ~/.ppprc - if it actually exists then you need some policy to read it
+ userdom_search_user_home_dirs(pppd_t)
+
+ ppp_exec(pppd_t)
+@@ -191,6 +192,8 @@
+
+ optional_policy(`
+ mta_send_mail(pppd_t)
++ mta_system_content(pppd_etc_t)
++ mta_system_content(pppd_etc_rw_t)
+ ')
+
+ optional_policy(`
+@@ -214,7 +217,7 @@
+ # PPTP Local policy
+ #
+
+-allow pptp_t self:capability net_raw;
++allow pptp_t self:capability { net_raw net_admin };
+ dontaudit pptp_t self:capability sys_tty_config;
+ allow pptp_t self:process signal;
+ allow pptp_t self:fifo_file rw_fifo_file_perms;
+@@ -222,14 +225,16 @@
+ allow pptp_t self:unix_stream_socket { connectto create_stream_socket_perms };
+ allow pptp_t self:rawip_socket create_socket_perms;
+ allow pptp_t self:tcp_socket create_socket_perms;
++allow pptp_t self:udp_socket create_socket_perms;
++allow pptp_t self:netlink_route_socket rw_netlink_socket_perms;
+
+ allow pptp_t pppd_etc_t:dir list_dir_perms;
+ allow pptp_t pppd_etc_t:file read_file_perms;
+-allow pptp_t pppd_etc_t:lnk_file { getattr read };
++allow pptp_t pppd_etc_t:lnk_file read_lnk_file_perms;
+
+ allow pptp_t pppd_etc_rw_t:dir list_dir_perms;
+ allow pptp_t pppd_etc_rw_t:file read_file_perms;
+-allow pptp_t pppd_etc_rw_t:lnk_file { getattr read };
++allow pptp_t pppd_etc_rw_t:lnk_file read_lnk_file_perms;
+ can_exec(pptp_t, pppd_etc_rw_t)
+
+ # Allow pptp to append to pppd log files
+@@ -245,9 +250,13 @@
+ kernel_list_proc(pptp_t)
+ kernel_read_kernel_sysctls(pptp_t)
+ kernel_read_proc_symlinks(pptp_t)
++kernel_read_system_state(pptp_t)
+
+ dev_read_sysfs(pptp_t)
+
++corecmd_exec_shell(pptp_t)
++corecmd_read_bin_symlinks(pptp_t)
++
+ corenet_all_recvfrom_unlabeled(pptp_t)
+ corenet_all_recvfrom_netlabel(pptp_t)
+ corenet_tcp_sendrecv_all_if(pptp_t)
+@@ -263,17 +272,21 @@
+ fs_getattr_all_fs(pptp_t)
+ fs_search_auto_mountpoints(pptp_t)
+
++files_read_etc_files(pptp_t)
++
+ term_ioctl_generic_ptys(pptp_t)
+ term_search_ptys(pptp_t)
+ term_use_ptmx(pptp_t)
+
+ domain_use_interactive_fds(pptp_t)
+
++auth_use_nsswitch(pptp_t)
++
+ logging_send_syslog_msg(pptp_t)
+
+ miscfiles_read_localization(pptp_t)
+
+-sysnet_read_config(pptp_t)
++sysnet_exec_ifconfig(pptp_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(pptp_t)
+ userdom_dontaudit_search_user_home_dirs(pptp_t)
+@@ -283,11 +296,15 @@
+ ')
+
+ optional_policy(`
+- hostname_exec(pptp_t)
++ dbus_system_domain(pppd_t, pppd_exec_t)
++
++ optional_policy(`
++ networkmanager_dbus_chat(pppd_t)
++ ')
+ ')
+
+ optional_policy(`
+- nscd_socket_use(pptp_t)
++ hostname_exec(pptp_t)
+ ')
+
+ optional_policy(`
+@@ -301,6 +318,3 @@
+ optional_policy(`
+ postfix_read_config(pppd_t)
+ ')
+-
+-# FIXME:
+-domtrans_pattern(pppd_t, pppd_script_exec_t, initrc_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.6.1/policy/modules/services/prelude.fc
+--- nsaserefpolicy/policy/modules/services/prelude.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/prelude.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,3 +1,9 @@
++/etc/prelude-correlator(/.*)? gen_context(system_u:object_r:prelude_correlator_config_t, s0)
++
++/etc/rc\.d/init\.d/prelude-correlator -- gen_context(system_u:object_r:prelude_initrc_exec_t, s0)
++/etc/rc\.d/init\.d/prelude-lml -- gen_context(system_u:object_r:prelude_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/prelude-manager -- gen_context(system_u:object_r:prelude_initrc_exec_t,s0)
++
+ /sbin/audisp-prelude -- gen_context(system_u:object_r:prelude_audisp_exec_t,s0)
+
+ /usr/bin/prelude-manager -- gen_context(system_u:object_r:prelude_exec_t,s0)
+@@ -5,7 +11,15 @@
+
+ /var/lib/prelude-lml(/.*)? gen_context(system_u:object_r:prelude_var_lib_t,s0)
+
++/var/log/prelude.* gen_context(system_u:object_r:prelude_log_t,s0)
++
+ /var/run/prelude-manager(/.*)? gen_context(system_u:object_r:prelude_var_run_t,s0)
+
+ /var/spool/prelude-manager(/.*)? gen_context(system_u:object_r:prelude_spool_t,s0)
+ /var/spool/prelude(/.*)? gen_context(system_u:object_r:prelude_spool_t,s0)
++
++/usr/bin/prelude-lml -- gen_context(system_u:object_r:prelude_lml_exec_t,s0)
++/var/run/prelude-lml.pid -- gen_context(system_u:object_r:prelude_lml_var_run_t,s0)
++
++/usr/bin/prelude-correlator -- gen_context(system_u:object_r:prelude_correlator_exec_t, s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.6.1/policy/modules/services/prelude.if
+--- nsaserefpolicy/policy/modules/services/prelude.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/prelude.if 2008-11-25 09:45:43.000000000 -0500
+@@ -6,7 +6,7 @@
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+-## Domain allowed to transition.
++## Domain allowed access.
+ ## </summary>
+ ## </param>
+ #
+@@ -42,7 +42,7 @@
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+-## Domain allowed acccess.
++## Domain allowed to transition.
+ ## </summary>
+ ## </param>
+ #
+@@ -56,6 +56,45 @@
+
+ ########################################
+ ## <summary>
++## Read the prelude spool files
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`prelude_read_spool',`
++ gen_require(`
++ type prelude_spool_t;
++ ')
++
++ files_search_spool($1)
++ read_files_pattern($1, prelude_spool_t, prelude_spool_t)
++')
++
++########################################
++## <summary>
++## Manage to prelude-manager spool files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`prelude_manage_spool',`
++ gen_require(`
++ type prelude_spool_t;
++ ')
++
++ files_search_spool($1)
++ manage_dirs_pattern($1, prelude_spool_t, prelude_spool_t)
++ manage_files_pattern($1, prelude_spool_t, prelude_spool_t)
++')
++
++########################################
++## <summary>
+ ## All of the rules required to administrate
+ ## an prelude environment
+ ## </summary>
+@@ -64,6 +103,11 @@
+ ## Domain allowed access.
+ ## </summary>
+ ## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
+ ## <rolecap/>
+ #
+ interface(`prelude_admin',`
+@@ -71,6 +115,10 @@
+ type prelude_t, prelude_spool_t;
+ type prelude_var_run_t, prelude_var_lib_t;
+ type prelude_audisp_t, prelude_audisp_var_run_t;
++ type prelude_initrc_exec_t;
++
++ type prelude_lml_t, prelude_lml_tmp_t;
++ type prelude_lml_var_run_t;
+ ')
+
+ allow $1 prelude_t:process { ptrace signal_perms };
+@@ -79,11 +127,18 @@
+ allow $1 prelude_audisp_t:process { ptrace signal_perms };
+ ps_process_pattern($1, prelude_audisp_t)
+
+- manage_files_pattern($1, prelude_spool_t, prelude_spool_t)
+-
+- manage_files_pattern($1, prelude_var_lib_t, prelude_var_lib_t)
+-
+- manage_files_pattern($1, prelude_var_run_t, prelude_var_run_t)
++ allow $1 prelude_lml_t:process { ptrace signal_perms };
++ ps_process_pattern($1, prelude_lml_t)
+
+- manage_files_pattern($1, prelude_audisp_var_run_t, prelude_audisp_var_run_t)
++ init_labeled_script_domtrans($1, prelude_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 prelude_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ admin_pattern($1, prelude_spool_t)
++ admin_pattern($1, prelude_var_lib_t)
++ admin_pattern($1, prelude_var_run_t)
++ admin_pattern($1, prelude_audisp_var_run_t)
++ admin_pattern($1, prelude_lml_tmp_t)
++ admin_pattern($1, prelude_lml_var_run_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.6.1/policy/modules/services/prelude.te
+--- nsaserefpolicy/policy/modules/services/prelude.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/prelude.te 2008-11-25 09:45:43.000000000 -0500
+@@ -13,25 +13,57 @@
+ type prelude_spool_t;
+ files_type(prelude_spool_t)
+
++type prelude_log_t;
++logging_log_file(prelude_log_t)
++
+ type prelude_var_run_t;
+ files_pid_file(prelude_var_run_t)
+
+ type prelude_var_lib_t;
+ files_type(prelude_var_lib_t)
+
++type prelude_initrc_exec_t;
++init_script_file(prelude_initrc_exec_t)
++
+ type prelude_audisp_t;
+ type prelude_audisp_exec_t;
+ init_daemon_domain(prelude_audisp_t, prelude_audisp_exec_t)
++typealias prelude_audisp_t alias audisp_prelude_t;
++typealias prelude_audisp_exec_t alias audisp_prelude_exec_t;
+
+ type prelude_audisp_var_run_t;
+ files_pid_file(prelude_audisp_var_run_t)
++typealias prelude_audisp_var_run_t alias audisp_prelude_var_run_t;
++
++type prelude_lml_t;
++type prelude_lml_exec_t;
++init_daemon_domain(prelude_lml_t, prelude_lml_exec_t)
++
++type prelude_lml_var_run_t;
++files_pid_file(prelude_lml_var_run_t)
++
++type prelude_lml_tmp_t;
++files_tmp_file(prelude_lml_tmp_t)
++
++########################################
++#
++# prelude_correlator declarations
++#
++
++type prelude_correlator_t;
++type prelude_correlator_exec_t;
++init_daemon_domain(prelude_correlator_t, prelude_correlator_exec_t)
++role system_r types prelude_correlator_t;
++
++type prelude_correlator_config_t;
++files_config_file(prelude_correlator_config_t)
+
+ ########################################
+ #
+ # prelude local policy
+ #
+
+-allow prelude_t self:capability sys_tty_config;
++allow prelude_t self:capability { dac_override sys_tty_config };
+ allow prelude_t self:fifo_file rw_file_perms;
+ allow prelude_t self:unix_stream_socket create_stream_socket_perms;
+ allow prelude_t self:netlink_route_socket r_netlink_socket_perms;
+@@ -49,6 +81,9 @@
+ manage_sock_files_pattern(prelude_t, prelude_var_run_t, prelude_var_run_t)
+ files_pid_filetrans(prelude_t, prelude_var_run_t, file)
+
++manage_files_pattern(prelude_t, prelude_log_t, prelude_log_t)
++logging_log_filetrans(prelude_t, prelude_log_t, file)
++
+ corecmd_search_bin(prelude_t)
+
+ corenet_all_recvfrom_unlabeled(prelude_t)
+@@ -56,15 +91,23 @@
+ corenet_tcp_sendrecv_all_if(prelude_t)
+ corenet_tcp_sendrecv_all_nodes(prelude_t)
+ corenet_tcp_bind_all_nodes(prelude_t)
++corenet_tcp_bind_prelude_port(prelude_t)
++corenet_tcp_connect_prelude_port(prelude_t)
++corenet_tcp_connect_postgresql_port(prelude_t)
+
+ dev_read_rand(prelude_t)
+ dev_read_urand(prelude_t)
+
++kernel_read_sysctl(prelude_t)
++
+ # Init script handling
+ domain_use_interactive_fds(prelude_t)
+
+ files_read_etc_files(prelude_t)
+ files_read_usr_files(prelude_t)
++files_search_tmp(prelude_t)
++
++fs_rw_anon_inodefs_files(prelude_t)
+
+ auth_use_nsswitch(prelude_t)
+
+@@ -86,7 +129,7 @@
+ #
+ # prelude_audisp local policy
+ #
+-
++allow prelude_audisp_t self:capability dac_override;
+ allow prelude_audisp_t self:fifo_file rw_file_perms;
+ allow prelude_audisp_t self:unix_stream_socket create_stream_socket_perms;
+ allow prelude_audisp_t self:unix_dgram_socket create_socket_perms;
+@@ -107,6 +150,7 @@
+ corenet_tcp_sendrecv_all_if(prelude_audisp_t)
+ corenet_tcp_sendrecv_all_nodes(prelude_audisp_t)
+ corenet_tcp_bind_all_nodes(prelude_audisp_t)
++corenet_tcp_connect_prelude_port(prelude_audisp_t)
+
+ dev_read_rand(prelude_audisp_t)
+ dev_read_urand(prelude_audisp_t)
+@@ -114,12 +158,134 @@
+ # Init script handling
+ domain_use_interactive_fds(prelude_audisp_t)
+
++kernel_read_sysctl(prelude_audisp_t)
++kernel_read_system_state(prelude_audisp_t)
++
+ files_read_etc_files(prelude_audisp_t)
++files_read_etc_runtime_files(prelude_audisp_t)
++files_search_tmp(prelude_audisp_t)
+
+ logging_send_syslog_msg(prelude_audisp_t)
++logging_dispatcher_domain(prelude_audisp_t, prelude_audisp_exec_t)
+
+ miscfiles_read_localization(prelude_audisp_t)
+
++sysnet_dns_name_resolve(prelude_audisp_t)
++
++########################################
++#
++# prelude_correlator local policy
++#
++
++allow prelude_correlator_t self:capability dac_override;
++allow prelude_correlator_t self:netlink_route_socket r_netlink_socket_perms;
++allow prelude_correlator_t self:tcp_socket create_stream_socket_perms;
++allow prelude_correlator_t self:unix_dgram_socket create_socket_perms;
++
++allow prelude_correlator_t prelude_correlator_config_t:dir list_dir_perms;
++read_files_pattern(prelude_correlator_t, prelude_correlator_config_t, prelude_correlator_config_t)
++
++prelude_manage_spool(prelude_correlator_t)
++
++corecmd_search_bin(prelude_correlator_t)
++
++corenet_all_recvfrom_unlabeled(prelude_correlator_t)
++corenet_all_recvfrom_netlabel(prelude_correlator_t)
++corenet_tcp_sendrecv_all_if(prelude_correlator_t)
++corenet_tcp_sendrecv_all_nodes(prelude_correlator_t)
++corenet_tcp_connect_prelude_port(prelude_correlator_t)
++
++kernel_read_sysctl(prelude_correlator_t)
++
++dev_read_rand(prelude_correlator_t)
++dev_read_urand(prelude_correlator_t)
++
++files_read_etc_files(prelude_correlator_t)
++files_read_usr_files(prelude_correlator_t)
++files_search_spool(prelude_correlator_t)
++
++logging_send_syslog_msg(prelude_correlator_t)
++
++miscfiles_read_localization(prelude_correlator_t)
++
++sysnet_dns_name_resolve(prelude_correlator_t)
++
++########################################
++#
++# prelude_lml local declarations
++#
++
++allow prelude_lml_t self:capability dac_override;
++
++# Init script handling
++domain_use_interactive_fds(prelude_lml_t)
++
++allow prelude_lml_t self:tcp_socket { write getattr setopt read create connect };
++allow prelude_lml_t self:unix_dgram_socket { write create connect };
++allow prelude_lml_t self:fifo_file rw_fifo_file_perms;
++allow prelude_lml_t self:unix_stream_socket connectto;
++
++files_list_tmp(prelude_lml_t)
++manage_dirs_pattern(prelude_lml_t, prelude_lml_tmp_t, prelude_lml_tmp_t)
++manage_files_pattern(prelude_lml_t, prelude_lml_tmp_t, prelude_lml_tmp_t)
++files_tmp_filetrans(prelude_lml_t, prelude_lml_tmp_t, { file dir })
++
++files_search_spool(prelude_lml_t)
++manage_dirs_pattern(prelude_lml_t, prelude_spool_t, prelude_spool_t)
++manage_files_pattern(prelude_lml_t, prelude_spool_t, prelude_spool_t)
++
++files_search_var_lib(prelude_lml_t)
++manage_dirs_pattern(prelude_lml_t, prelude_var_lib_t, prelude_var_lib_t)
++manage_files_pattern(prelude_lml_t, prelude_var_lib_t, prelude_var_lib_t)
++
++manage_files_pattern(prelude_lml_t, prelude_lml_var_run_t, prelude_lml_var_run_t)
++files_pid_filetrans(prelude_lml_t, prelude_lml_var_run_t, file)
++
++corecmd_exec_bin(prelude_lml_t)
++
++corenet_tcp_sendrecv_generic_if(prelude_lml_t)
++corenet_tcp_sendrecv_all_nodes(prelude_lml_t)
++corenet_tcp_recvfrom_netlabel(prelude_lml_t)
++corenet_tcp_recvfrom_unlabeled(prelude_lml_t)
++corenet_sendrecv_unlabeled_packets(prelude_lml_t)
++corenet_tcp_connect_prelude_port(prelude_lml_t)
++
++dev_read_rand(prelude_lml_t)
++dev_read_urand(prelude_lml_t)
++
++kernel_read_sysctl(prelude_lml_t)
++
++files_list_etc(prelude_lml_t)
++files_read_etc_files(prelude_lml_t)
++files_read_etc_runtime_files(prelude_lml_t)
++
++files_search_spool(prelude_lml_t)
++files_search_usr(prelude_lml_t)
++files_search_var_lib(prelude_lml_t)
++
++fs_list_inotifyfs(prelude_lml_t)
++fs_read_anon_inodefs_files(prelude_lml_t)
++fs_rw_anon_inodefs_files(prelude_lml_t)
++
++auth_use_nsswitch(prelude_lml_t)
++
++libs_exec_lib_files(prelude_lml_t)
++libs_read_lib_files(prelude_lml_t)
++
++logging_send_syslog_msg(prelude_lml_t)
++logging_read_generic_logs(prelude_lml_t)
++
++miscfiles_read_localization(prelude_lml_t)
++
++sysnet_dns_name_resolve(prelude_lml_t)
++
++userdom_read_all_users_state(prelude_lml_t)
++
++optional_policy(`
++ apache_search_sys_content(prelude_lml_t)
++ apache_read_log(prelude_lml_t)
++')
++
+ ########################################
+ #
+ # prewikka_cgi Declarations
+@@ -128,6 +294,20 @@
+ optional_policy(`
+ apache_content_template(prewikka)
+ files_read_etc_files(httpd_prewikka_script_t)
++ files_search_tmp(httpd_prewikka_script_t)
++
++ kernel_read_sysctl(httpd_prewikka_script_t)
++ kernel_search_network_sysctl(httpd_prewikka_script_t)
++
++ can_exec(httpd_prewikka_script_t, httpd_prewikka_script_exec_t)
++
++ corenet_tcp_connect_postgresql_port(httpd_prewikka_script_t)
++
++ auth_use_nsswitch(httpd_prewikka_script_t)
++
++ logging_send_syslog_msg(httpd_prewikka_script_t)
++
++ apache_search_sys_content(httpd_prewikka_script_t)
+
+ optional_policy(`
+ mysql_search_db(httpd_prewikka_script_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.6.1/policy/modules/services/procmail.te
+--- nsaserefpolicy/policy/modules/services/procmail.te 2008-11-18 18:57:21.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/procmail.te 2008-11-25 09:45:43.000000000 -0500
+@@ -128,6 +128,10 @@
+ ')
+
+ optional_policy(`
++ nagios_search_spool(procmail_t)
++')
++
++optional_policy(`
+ pyzor_domtrans(procmail_t)
+ pyzor_signal(procmail_t)
+ ')
+@@ -148,3 +152,7 @@
+ spamassassin_domtrans_client(procmail_t)
+ spamassassin_read_lib_files(procmail_t)
+ ')
++
++optional_policy(`
++ mailscanner_read_spool(procmail_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.6.1/policy/modules/services/pyzor.fc
+--- nsaserefpolicy/policy/modules/services/pyzor.fc 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pyzor.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,6 +1,8 @@
+ /etc/pyzor(/.*)? gen_context(system_u:object_r:pyzor_etc_t, s0)
++/etc/rc\.d/init\.d/pyzord -- gen_context(system_u:object_r:pyzord_initrc_exec_t,s0)
+
+ HOME_DIR/\.pyzor(/.*)? gen_context(system_u:object_r:pyzor_home_t,s0)
++HOME_DIR/\.spamd(/.*)? gen_context(system_u:object_r:pyzor_home_t,s0)
+
+ /usr/bin/pyzor -- gen_context(system_u:object_r:pyzor_exec_t,s0)
+ /usr/bin/pyzord -- gen_context(system_u:object_r:pyzord_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.6.1/policy/modules/services/pyzor.if
+--- nsaserefpolicy/policy/modules/services/pyzor.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pyzor.if 2008-11-25 09:45:43.000000000 -0500
+@@ -88,3 +88,50 @@
+ corecmd_search_bin($1)
+ can_exec($1, pyzor_exec_t)
+ ')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an pyzor environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the pyzor domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`pyzor_admin',`
++ gen_require(`
++ type pyzord_t, pyzor_tmp_t, pyzord_log_t;
++ type pyzor_etc_t, pyzor_var_lib_t;
++ type pyzord_initrc_exec_t;
++ ')
++
++ allow $1 pyzord_t:process { ptrace signal_perms };
++ ps_process_pattern($1, pyzord_t)
++
++ init_labeled_script_domtrans($1, pyzord_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 pyzord_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, pyzor_tmp_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, pyzord_log_t)
++
++ files_list_etc($1)
++ admin_pattern($1, pyzor_etc_t)
++
++ files_list_var_lib($1)
++ admin_pattern($1, pyzor_var_lib_t)
++')
++
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.6.1/policy/modules/services/pyzor.te
+--- nsaserefpolicy/policy/modules/services/pyzor.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/pyzor.te 2008-11-25 09:45:43.000000000 -0500
+@@ -6,6 +6,38 @@
+ # Declarations
+ #
+
++
++ifdef(`distro_redhat',`
++
++ gen_require(`
++ type spamc_t;
++ type spamc_exec_t;
++ type spamd_t;
++ type spamd_initrc_exec_t;
++ type spamd_exec_t;
++ type spamc_tmp_t;
++ type spamd_log_t;
++ type spamd_var_lib_t;
++ type spamd_etc_t;
++ type spamc_tmp_t;
++ type spamc_home_t;
++ ')
++
++ typealias spamc_t alias pyzor_t;
++ typealias spamc_exec_t alias pyzor_exec_t;
++ typealias spamd_t alias pyzord_t;
++ typealias spamd_initrc_exec_t alias pyzord_initrc_exec_t;
++ typealias spamd_exec_t alias pyzord_exec_t;
++ typealias spamc_tmp_t alias pyzor_tmp_t;
++ typealias spamd_log_t alias pyzor_log_t;
++ typealias spamd_log_t alias pyzord_log_t;
++ typealias spamd_var_lib_t alias pyzor_var_lib_t;
++ typealias spamd_etc_t alias pyzor_etc_t;
++ typealias spamc_home_t alias pyzor_home_t;
++ typealias spamc_home_t alias user_pyzor_home_t;
++
++',`
++
+ type pyzor_t;
+ type pyzor_exec_t;
+ typealias pyzor_t alias { user_pyzor_t staff_pyzor_t sysadm_pyzor_t };
+@@ -40,6 +72,7 @@
+
+ type pyzord_log_t;
+ logging_log_file(pyzord_log_t)
++')
+
+ ########################################
+ #
+@@ -83,6 +116,8 @@
+
+ miscfiles_read_localization(pyzor_t)
+
++mta_read_queue(pyzor_t)
++
+ userdom_dontaudit_search_user_home_dirs(pyzor_t)
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.6.1/policy/modules/services/razor.if
+--- nsaserefpolicy/policy/modules/services/razor.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/razor.if 2008-11-25 09:45:43.000000000 -0500
+@@ -157,3 +157,45 @@
+
+ domtrans_pattern($1, razor_exec_t, razor_t)
+ ')
++
++########################################
++## <summary>
++## Create, read, write, and delete razor files
++## in a user home subdirectory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++template(`razor_manage_user_home_files',`
++ gen_require(`
++ type razor_home_t;
++ ')
++
++ files_search_home($1)
++ userdom_search_user_home_dirs($1)
++ manage_files_pattern($1, razor_home_t, razor_home_t)
++ read_lnk_files_pattern($1, razor_home_t, razor_home_t)
++')
++
++########################################
++## <summary>
++## read razor lib files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`razor_read_lib_files',`
++ gen_require(`
++ type razor_var_lib_t;
++ ')
++
++ files_search_var_lib($1)
++ read_files_pattern($1, razor_var_lib_t, razor_var_lib_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.6.1/policy/modules/services/razor.te
+--- nsaserefpolicy/policy/modules/services/razor.te 2008-11-19 18:10:07.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/razor.te 2008-11-25 09:45:43.000000000 -0500
+@@ -6,6 +6,32 @@
+ # Declarations
+ #
+
++ifdef(`distro_redhat',`
++
++ gen_require(`
++ type spamc_t;
++ type spamc_exec_t;
++ type spamd_log_t;
++ type spamd_spool_t;
++ type spamd_var_lib_t;
++ type spamd_etc_t;
++ type spamc_home_t;
++ type spamc_tmp_t;
++ ')
++
++ typealias spamc_t alias razor_t;
++ typealias spamc_exec_t alias razor_exec_t;
++ typealias spamd_log_t alias razor_log_t;
++ typealias spamd_var_lib_t alias razor_var_lib_t;
++ typealias spamd_etc_t alias razor_etc_t;
++ typealias spamc_home_t alias razor_home_t;
++ typealias spamc_home_t alias { user_razor_home_t staff_razor_home_t sysadm_razor_home_t };
++ typealias spamc_home_t alias { auditadm_razor_home_t secadm_razor_home_t };
++ typealias spamc_tmp_t alias { user_razor_tmp_t staff_razor_tmp_t sysadm_razor_tmp_t };
++ typealias spamc_tmp_t alias { auditadm_razor_tmp_t secadm_razor_tmp_t };
++
++',`
++
+ type razor_exec_t;
+ corecmd_executable_file(razor_exec_t)
+
+@@ -61,3 +87,4 @@
+ optional_policy(`
+ nscd_socket_use(razor_t)
+ ')
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.1/policy/modules/services/ricci.te
+--- nsaserefpolicy/policy/modules/services/ricci.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ricci.te 2008-12-02 11:15:19.000000000 -0500
+@@ -133,6 +133,8 @@
+
+ dev_read_urand(ricci_t)
+
++domain_read_all_domains_state(ricci_t)
++
+ files_read_etc_files(ricci_t)
+ files_read_etc_runtime_files(ricci_t)
+ files_create_boot_flag(ricci_t)
+@@ -140,7 +142,7 @@
+ auth_domtrans_chk_passwd(ricci_t)
+ auth_append_login_records(ricci_t)
+
+-init_dontaudit_stream_connect_script(ricci_t)
++init_stream_connect_script(ricci_t)
+
+ locallogin_dontaudit_use_fds(ricci_t)
+
+@@ -202,7 +204,7 @@
+ corecmd_exec_shell(ricci_modcluster_t)
+ corecmd_exec_bin(ricci_modcluster_t)
+
+-domain_dontaudit_read_all_domains_state(ricci_modcluster_t)
++domain_read_all_domains_state(ricci_modcluster_t)
+
+ files_search_locks(ricci_modcluster_t)
+ files_read_etc_runtime_files(ricci_modcluster_t)
+@@ -214,6 +216,8 @@
+
+ logging_send_syslog_msg(ricci_modcluster_t)
+
++consoletype_exec(ricci_modcluster_t)
++
+ miscfiles_read_localization(ricci_modcluster_t)
+
+ modutils_domtrans_insmod(ricci_modcluster_t)
+@@ -229,10 +233,6 @@
+ ')
+
+ optional_policy(`
+- consoletype_exec(ricci_modcluster_t)
+-')
+-
+-optional_policy(`
+ lvm_domtrans(ricci_modcluster_t)
+ ')
+
+@@ -287,14 +287,14 @@
+ corenet_tcp_bind_ricci_modcluster_port(ricci_modclusterd_t)
+ corenet_tcp_connect_ricci_modcluster_port(ricci_modclusterd_t)
+
+-domain_dontaudit_read_all_domains_state(ricci_modclusterd_t)
++domain_read_all_domains_state(ricci_modclusterd_t)
+
+ files_read_etc_files(ricci_modclusterd_t)
+ files_read_etc_runtime_files(ricci_modclusterd_t)
+
+ fs_getattr_xattr_fs(ricci_modclusterd_t)
+
+-init_dontaudit_stream_connect_script(ricci_modclusterd_t)
++init_stream_connect_script(ricci_modclusterd_t)
+
+ locallogin_dontaudit_use_fds(ricci_modclusterd_t)
+
+@@ -328,7 +328,7 @@
+
+ corecmd_exec_bin(ricci_modlog_t)
+
+-domain_dontaudit_read_all_domains_state(ricci_modlog_t)
++domain_read_all_domains_state(ricci_modlog_t)
+
+ files_read_etc_files(ricci_modlog_t)
+ files_search_usr(ricci_modlog_t)
+@@ -432,7 +432,7 @@
+ dev_read_urand(ricci_modstorage_t)
+ dev_manage_generic_blk_files(ricci_modstorage_t)
+
+-domain_dontaudit_read_all_domains_state(ricci_modstorage_t)
++domain_read_all_domains_state(ricci_modstorage_t)
+
+ #Needed for editing /etc/fstab
+ files_manage_etc_files(ricci_modstorage_t)
+@@ -440,6 +440,10 @@
+ files_read_usr_files(ricci_modstorage_t)
+ files_read_kernel_modules(ricci_modstorage_t)
+
++files_create_default_dir(ricci_modstorage_t)
++files_mounton_default(ricci_modstorage_t)
++files_manage_default(ricci_modstorage_t)
++
+ storage_raw_read_fixed_disk(ricci_modstorage_t)
+
+ term_dontaudit_use_console(ricci_modstorage_t)
+@@ -452,6 +456,10 @@
+
+ modutils_read_module_deps(ricci_modstorage_t)
+
++consoletype_exec(ricci_modstorage_t)
++
++mount_domtrans(ricci_modstorage_t)
++
+ optional_policy(`
+ ccs_stream_connect(ricci_modstorage_t)
+ ccs_read_config(ricci_modstorage_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.6.1/policy/modules/services/rlogin.te
+--- nsaserefpolicy/policy/modules/services/rlogin.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/rlogin.te 2008-11-25 09:45:43.000000000 -0500
+@@ -91,10 +91,22 @@
+ remotelogin_signal(rlogind_t)
+
+ optional_policy(`
+- kerberos_use(rlogind_t)
+- kerberos_read_keytab(rlogind_t)
++ kerberos_keytab_template(rlogind, rlogind_t)
++ kerberos_manage_host_rcache(rlogind_t)
+ ')
+
+ optional_policy(`
+ tcpd_wrapped_domain(rlogind_t, rlogind_exec_t)
+ ')
++
++tunable_policy(`use_nfs_home_dirs',`
++ fs_list_nfs(rlogind_t)
++ fs_read_nfs_files(rlogind_t)
++ fs_read_nfs_symlinks(rlogind_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++ fs_list_cifs(rlogind_t)
++ fs_read_cifs_files(rlogind_t)
++ fs_read_cifs_symlinks(rlogind_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.fc serefpolicy-3.6.1/policy/modules/services/rpc.fc
+--- nsaserefpolicy/policy/modules/services/rpc.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/rpc.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -13,6 +13,7 @@
+ # /usr
+ #
+ /usr/sbin/rpc\.idmapd -- gen_context(system_u:object_r:rpcd_exec_t,s0)
++/usr/sbin/rpc\.rquotad -- gen_context(system_u:object_r:rpcd_exec_t,s0)
+ /usr/sbin/rpc\.gssd -- gen_context(system_u:object_r:gssd_exec_t,s0)
+ /usr/sbin/rpc\.mountd -- gen_context(system_u:object_r:nfsd_exec_t,s0)
+ /usr/sbin/rpc\.nfsd -- gen_context(system_u:object_r:nfsd_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.6.1/policy/modules/services/rpc.if
+--- nsaserefpolicy/policy/modules/services/rpc.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/rpc.if 2008-11-25 09:45:43.000000000 -0500
+@@ -88,8 +88,11 @@
+ # bind to arbitary unused ports
+ corenet_tcp_bind_generic_port($1_t)
+ corenet_udp_bind_generic_port($1_t)
+- corenet_udp_bind_reserved_port($1_t)
++ corenet_dontaudit_tcp_bind_all_ports($1_t)
++ corenet_dontaudit_udp_bind_all_ports($1_t)
+ corenet_sendrecv_generic_server_packets($1_t)
++ corenet_tcp_bind_all_rpc_ports($1_t)
++ corenet_udp_bind_all_rpc_ports($1_t)
+
+ fs_rw_rpc_named_pipes($1_t)
+ fs_search_auto_mountpoints($1_t)
+@@ -205,6 +208,24 @@
+
+ ########################################
+ ## <summary>
++## Execute domain in nfsd domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`rpc_domtrans_rpcd',`
++ gen_require(`
++ type rpcd_t, rpcd_exec_t;
++ ')
++
++ domtrans_pattern($1, rpcd_exec_t, rpcd_t)
++')
++
++########################################
++## <summary>
+ ## Read NFS exported content.
+ ## </summary>
+ ## <param name="domain">
+@@ -335,3 +356,22 @@
+ files_search_var_lib($1)
+ read_files_pattern($1, var_lib_nfs_t, var_lib_nfs_t)
+ ')
++
++########################################
++## <summary>
++## Manage NFS state data in /var/lib/nfs.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`rpc_manage_nfs_state_data',`
++ gen_require(`
++ type var_lib_nfs_t;
++ ')
++
++ files_search_var_lib($1)
++ manage_files_pattern($1,var_lib_nfs_t,var_lib_nfs_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.6.1/policy/modules/services/rpc.te
+--- nsaserefpolicy/policy/modules/services/rpc.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/rpc.te 2008-11-25 09:45:43.000000000 -0500
+@@ -23,7 +23,7 @@
+ gen_tunable(allow_nfsd_anon_write, false)
+
+ type exports_t;
+-files_type(exports_t)
++files_config_file(exports_t)
+
+ rpc_domain_template(gssd)
+
+@@ -68,6 +68,7 @@
+ # for rpc.rquotad
+ kernel_read_sysctl(rpcd_t)
+ kernel_rw_fs_sysctls(rpcd_t)
++kernel_dontaudit_getattr_core_if(rpcd_t)
+
+ corecmd_exec_bin(rpcd_t)
+
+@@ -101,6 +102,7 @@
+ # for /proc/fs/nfs/exports - should we have a new type?
+ kernel_read_system_state(nfsd_t)
+ kernel_read_network_state(nfsd_t)
++kernel_dontaudit_getattr_core_if(nfsd_t)
+
+ corenet_tcp_bind_all_rpc_ports(nfsd_t)
+ corenet_udp_bind_all_rpc_ports(nfsd_t)
+@@ -135,6 +137,7 @@
+ tunable_policy(`nfs_export_all_rw',`
+ fs_read_noxattr_fs_files(nfsd_t)
+ auth_manage_all_files_except_shadow(nfsd_t)
++ userdom_user_home_dir_filetrans_user_home_content(nfsd_t, { file dir })
+ ')
+
+ tunable_policy(`nfs_export_all_ro',`
+@@ -170,6 +173,7 @@
+ files_read_usr_symlinks(gssd_t)
+
+ auth_use_nsswitch(gssd_t)
++auth_manage_cache(gssd_t)
+
+ miscfiles_read_certs(gssd_t)
+
+@@ -180,8 +184,7 @@
+ ')
+
+ optional_policy(`
+- kerberos_use(gssd_t)
+- kerberos_read_keytab(gssd_t)
++ kerberos_keytab_template(gssd, gssd_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.6.1/policy/modules/services/rshd.te
+--- nsaserefpolicy/policy/modules/services/rshd.te 2008-11-18 18:57:20.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/rshd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -51,7 +51,7 @@
+
+ files_list_home(rshd_t)
+ files_read_etc_files(rshd_t)
+-files_search_tmp(rshd_t)
++files_manage_generic_tmp_dirs(rshd_t)
+
+ auth_login_pgm_domain(rshd_t)
+ auth_write_login_records(rshd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.6.1/policy/modules/services/samba.fc
+--- nsaserefpolicy/policy/modules/services/samba.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/samba.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,6 +2,9 @@
+ #
+ # /etc
+ #
++/etc/rc\.d/init\.d/winbind -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/nmb -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/smb -- gen_context(system_u:object_r:samba_initrc_exec_t,s0)
+ /etc/samba/MACHINE\.SID -- gen_context(system_u:object_r:samba_secrets_t,s0)
+ /etc/samba/passdb\.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0)
+ /etc/samba/secrets\.tdb -- gen_context(system_u:object_r:samba_secrets_t,s0)
+@@ -15,6 +18,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)
+ /usr/bin/smbmnt -- gen_context(system_u:object_r:smbmount_exec_t,s0)
++/usr/bin/smbcontrol -- gen_context(system_u:object_r:smbcontrol_exec_t,s0)
+ /usr/sbin/swat -- gen_context(system_u:object_r:swat_exec_t,s0)
+
+ /usr/sbin/nmbd -- gen_context(system_u:object_r:nmbd_exec_t,s0)
+@@ -47,3 +51,7 @@
+ /var/run/winbindd(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
+
+ /var/spool/samba(/.*)? gen_context(system_u:object_r:samba_var_t,s0)
++
++ifndef(`enable_mls',`
++/var/lib/samba/scripts(/.*)? gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.6.1/policy/modules/services/samba.if
+--- nsaserefpolicy/policy/modules/services/samba.if 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/samba.if 2008-11-25 09:45:43.000000000 -0500
+@@ -4,6 +4,45 @@
+ ## from Windows NT servers.
+ ## </summary>
+
++
++########################################
++## <summary>
++## Execute smbd net in the smbd_t domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`samba_domtrans_smb',`
++ gen_require(`
++ type smbd_t, smbd_exec_t;
++ ')
++
++ corecmd_search_bin($1)
++ domtrans_pattern($1, smbd_exec_t, smbd_t)
++')
++
++########################################
++## <summary>
++## Execute nmbd net in the nmbd_t domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`samba_domtrans_nmb',`
++ gen_require(`
++ type nmbd_t, nmbd_exec_t;
++ ')
++
++ corecmd_search_bin($1)
++ domtrans_pattern($1, nmbd_exec_t, nmbd_t)
++')
++
+ ########################################
+ ## <summary>
+ ## Execute samba net in the samba_net domain.
+@@ -25,6 +64,25 @@
+
+ ########################################
+ ## <summary>
++## Execute samba net in the samba_unconfined_net domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`samba_domtrans_unconfined_net',`
++ gen_require(`
++ type samba_unconfined_net_t, samba_net_exec_t;
++ ')
++
++ corecmd_search_bin($1)
++ domtrans_pattern($1, samba_net_exec_t, samba_unconfined_net_t)
++')
++
++########################################
++## <summary>
+ ## Execute samba net in the samba_net domain, and
+ ## allow the specified role the samba_net domain.
+ ## </summary>
+@@ -49,6 +107,50 @@
+ role $2 types samba_net_t;
+ ')
+
++#######################################
++## <summary>
++## The role for the samba module.
++## </summary>
++## <param name="role">
++## <summary>
++## The role to be allowed the samba_net domain.
++## </summary>
++## </param>
++#
++template(`samba_role_notrans',`
++ gen_require(`
++ type smbd_t;
++ ')
++
++ role $1 types smbd_t;
++')
++
++########################################
++## <summary>
++## Execute samba net in the samba_unconfined_net domain, and
++## allow the specified role the samba_unconfined_net domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the samba_unconfined_net domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`samba_run_unconfined_net',`
++ gen_require(`
++ type samba_unconfined_net_t;
++ ')
++
++ samba_domtrans_unconfined_net($1)
++ role $2 types samba_unconfined_net_t;
++')
++
+ ########################################
+ ## <summary>
+ ## Execute smbmount in the smbmount domain.
+@@ -138,6 +240,28 @@
+
+ ########################################
+ ## <summary>
++## Allow the specified domain to read
++## and write samba configuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`samba_manage_config',`
++ gen_require(`
++ type samba_etc_t;
++ ')
++
++ files_search_etc($1)
++ manage_dirs_pattern($1, samba_etc_t, samba_etc_t)
++ manage_files_pattern($1, samba_etc_t, samba_etc_t)
++')
++
++########################################
++## <summary>
+ ## Allow the specified domain to read samba's log files.
+ ## </summary>
+ ## <param name="domain">
+@@ -281,6 +405,25 @@
+
+ ########################################
+ ## <summary>
++## dontaudit the specified domain to
++## write samba /var files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`samba_dontaudit_write_var_files',`
++ gen_require(`
++ type samba_var_t;
++ ')
++
++ dontaudit $1 samba_var_t:file write;
++')
++
++########################################
++## <summary>
+ ## Allow the specified domain to
+ ## read and write samba /var files.
+ ## </summary>
+@@ -298,6 +441,7 @@
+ files_search_var($1)
+ files_search_var_lib($1)
+ manage_files_pattern($1, samba_var_t, samba_var_t)
++ manage_lnk_files_pattern($1, samba_var_t, samba_var_t)
+ ')
+
+ ########################################
+@@ -370,6 +514,7 @@
+ ')
+
+ domtrans_pattern($1, winbind_helper_exec_t, winbind_helper_t)
++ allow $1 winbind_helper_t:process signal;
+ ')
+
+ ########################################
+@@ -447,3 +592,202 @@
+ stream_connect_pattern($1, winbind_tmp_t, winbind_tmp_t, winbind_t)
+ ')
+ ')
++
++########################################
++## <summary>
++## Create a set of derived types for apache
++## web content.
++## </summary>
++## <param name="prefix">
++## <summary>
++## The prefix to be used for deriving type names.
++## </summary>
++## </param>
++#
++template(`samba_helper_template',`
++ gen_require(`
++ type smbd_t;
++ ')
++ #This type is for samba helper scripts
++ type samba_$1_script_t;
++ domain_type(samba_$1_script_t)
++ role system_r types samba_$1_script_t;
++
++ # This type is used for executable scripts files
++ type samba_$1_script_exec_t;
++ corecmd_shell_entry_type(samba_$1_script_t)
++ domain_entry_file(samba_$1_script_t, samba_$1_script_exec_t)
++
++ domtrans_pattern(smbd_t, samba_$1_script_exec_t, samba_$1_script_t)
++ allow smbd_t samba_$1_script_exec_t:file ioctl;
++
++')
++
++########################################
++## <summary>
++## Allow the specified domain to read samba's shares
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`samba_read_share_files',`
++ gen_require(`
++ type samba_share_t;
++ ')
++
++ allow $1 samba_share_t:filesystem getattr;
++ read_files_pattern($1, samba_share_t, samba_share_t)
++')
++
++########################################
++## <summary>
++## Execute a domain transition to run smbcontrol.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`samba_domtrans_smbcontrol',`
++ gen_require(`
++ type smbcontrol_t;
++ type smbcontrol_exec_t;
++ ')
++
++ domtrans_pattern($1, smbcontrol_exec_t, smbcontrol_t)
++')
++
++
++########################################
++## <summary>
++## Execute smbcontrol in the smbcontrol domain, and
++## allow the specified role the smbcontrol domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the smbcontrol domain.
++## </summary>
++## </param>
++#
++interface(`samba_run_smbcontrol',`
++ gen_require(`
++ type smbcontrol_t;
++ ')
++
++ samba_domtrans_smbcontrol($1)
++ role $2 types smbcontrol_t;
++')
++
++########################################
++## <summary>
++## Execute samba server in the samba domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`samba_initrc_domtrans',`
++ gen_require(`
++ type samba_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, samba_initrc_exec_t)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an samba environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the samba domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`samba_admin',`
++ gen_require(`
++ type nmbd_t, nmbd_var_run_t;
++ type smbd_t, smbd_tmp_t;
++ type smbd_initrc_exec_t;
++ type smbd_spool_t, smbd_var_run_t;
++
++ type samba_log_t, samba_var_t;
++ type samba_etc_t, samba_share_t;
++ type samba_secrets_t;
++
++ type swat_var_run_t, swat_tmp_t;
++
++ type winbind_var_run_t, winbind_tmp_t;
++ type winbind_log_t;
++
++ type samba_unconfined_script_t, samba_unconfined_script_exec_t;
++ type samba_initrc_exec_t;
++ ')
++
++ allow $1 smbd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, smbd_t)
++
++ allow $1 nmbd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, nmbd_t)
++
++ allow $1 samba_unconfined_script_t:process { ptrace signal_perms getattr };
++ read_files_pattern($1, samba_unconfined_script_t, samba_unconfined_script_t)
++
++ samba_run_smbcontrol($1, $2, $3)
++ samba_run_winbind_helper($1, $2, $3)
++ samba_run_smbmount($1, $2, $3)
++ samba_run_net($1, $2, $3)
++
++ init_labeled_script_domtrans($1, samba_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 samba_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, smbd_tmp_t)
++ admin_pattern($1, swat_tmp_t)
++ admin_pattern($1, winbind_tmp_t)
++
++ admin_pattern($1, samba_secrets_t)
++
++ files_list_etc($1)
++ admin_pattern($1, samba_etc_t)
++
++ admin_pattern($1, samba_share_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, samba_log_t)
++ admin_pattern($1, winbind_log_t)
++
++ files_list_spool($1)
++ admin_pattern($1, smbd_spool_t)
++
++ files_list_var($1)
++ admin_pattern($1, samba_var_t)
++
++ files_list_pids($1)
++ admin_pattern($1, smbd_var_run_t)
++ admin_pattern($1, nmbd_var_run_t)
++ admin_pattern($1, swat_var_run_t)
++ admin_pattern($1, winbind_var_run_t)
++ admin_pattern($1, samba_unconfined_script_exec_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.6.1/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/samba.te 2008-11-25 09:45:43.000000000 -0500
+@@ -66,6 +66,13 @@
+ ## </desc>
+ gen_tunable(samba_share_nfs, false)
+
++## <desc>
++## <p>
++## Allow samba to export ntfs/fusefs volumes.
++## </p>
++## </desc>
++gen_tunable(samba_share_fusefs, false)
++
+ type nmbd_t;
+ type nmbd_exec_t;
+ init_daemon_domain(nmbd_t, nmbd_exec_t)
+@@ -73,6 +80,9 @@
+ type nmbd_var_run_t;
+ files_pid_file(nmbd_var_run_t)
+
++type samba_initrc_exec_t;
++init_script_file(samba_initrc_exec_t)
++
+ type samba_etc_t;
+ files_config_file(samba_etc_t)
+
+@@ -80,11 +90,9 @@
+ logging_log_file(samba_log_t)
+
+ type samba_net_t;
+-domain_type(samba_net_t)
+-role system_r types samba_net_t;
+-
+ type samba_net_exec_t;
+-domain_entry_file(samba_net_t, samba_net_exec_t)
++role system_r types samba_net_t;
++application_domain(samba_net_t, samba_net_exec_t)
+
+ type samba_net_tmp_t;
+ files_tmp_file(samba_net_tmp_t)
+@@ -146,11 +154,17 @@
+ type winbind_var_run_t;
+ files_pid_file(winbind_var_run_t)
+
++type smbcontrol_t;
++type smbcontrol_exec_t;
++application_domain(smbcontrol_t, smbcontrol_exec_t)
++role system_r types smbcontrol_t;
++
+ ########################################
+ #
+ # Samba net local policy
+ #
+-
++allow samba_net_t self:capability { dac_read_search dac_override };
++allow samba_net_t self:process getsched;
+ allow samba_net_t self:unix_dgram_socket create_socket_perms;
+ allow samba_net_t self:unix_stream_socket create_stream_socket_perms;
+ allow samba_net_t self:udp_socket create_socket_perms;
+@@ -165,11 +179,12 @@
+ manage_files_pattern(samba_net_t, samba_net_tmp_t, samba_net_tmp_t)
+ files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
+
+-allow samba_net_t samba_var_t:dir rw_dir_perms;
++manage_dirs_pattern(samba_net_t, samba_var_t, samba_var_t)
+ manage_files_pattern(samba_net_t, samba_var_t, samba_var_t)
+ manage_lnk_files_pattern(samba_net_t, samba_var_t, samba_var_t)
+
+ kernel_read_proc_symlinks(samba_net_t)
++kernel_read_system_state(samba_net_t)
+
+ corenet_all_recvfrom_unlabeled(samba_net_t)
+ corenet_all_recvfrom_netlabel(samba_net_t)
+@@ -190,6 +205,7 @@
+ domain_use_interactive_fds(samba_net_t)
+
+ files_read_etc_files(samba_net_t)
++files_read_usr_symlinks(samba_net_t)
+
+ auth_use_nsswitch(samba_net_t)
+
+@@ -197,8 +213,10 @@
+
+ miscfiles_read_localization(samba_net_t)
+
++samba_read_var_files(samba_net_t)
++
+ userdom_use_user_terminals(samba_net_t)
+-userdom_dontaudit_search_user_home_dirs(samba_net_t)
++userdom_list_user_home_dirs(samba_net_t)
+
+ optional_policy(`
+ kerberos_use(samba_net_t)
+@@ -208,7 +226,7 @@
+ #
+ # smbd Local policy
+ #
+-allow smbd_t self:capability { fowner setgid setuid sys_resource lease dac_override dac_read_search };
++allow smbd_t self:capability { chown fowner setgid setuid sys_resource lease dac_override dac_read_search };
+ dontaudit smbd_t self:capability sys_tty_config;
+ allow smbd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow smbd_t self:process setrlimit;
+@@ -226,10 +244,8 @@
+
+ allow smbd_t samba_etc_t:file { rw_file_perms setattr };
+
+-create_dirs_pattern(smbd_t, samba_log_t, samba_log_t)
++manage_dirs_pattern(smbd_t, samba_log_t, samba_log_t)
+ manage_files_pattern(smbd_t, samba_log_t, samba_log_t)
+-allow smbd_t samba_log_t:dir setattr;
+-dontaudit smbd_t samba_log_t:dir remove_name;
+
+ allow smbd_t samba_net_tmp_t:file getattr;
+
+@@ -239,6 +255,7 @@
+ manage_dirs_pattern(smbd_t, samba_share_t, samba_share_t)
+ manage_files_pattern(smbd_t, samba_share_t, samba_share_t)
+ manage_lnk_files_pattern(smbd_t, samba_share_t, samba_share_t)
++allow smbd_t samba_share_t:filesystem getattr;
+
+ manage_dirs_pattern(smbd_t, samba_var_t, samba_var_t)
+ manage_files_pattern(smbd_t, samba_var_t, samba_var_t)
+@@ -256,7 +273,7 @@
+ manage_sock_files_pattern(smbd_t, smbd_var_run_t, smbd_var_run_t)
+ files_pid_filetrans(smbd_t, smbd_var_run_t, file)
+
+-allow smbd_t winbind_var_run_t:sock_file { read write getattr };
++allow smbd_t winbind_var_run_t:sock_file rw_sock_file_perms;
+
+ kernel_getattr_core_if(smbd_t)
+ kernel_getattr_message_if(smbd_t)
+@@ -321,6 +338,10 @@
+ userdom_use_unpriv_users_fds(smbd_t)
+ userdom_dontaudit_search_user_home_dirs(smbd_t)
+
++usermanage_read_crack_db(smbd_t)
++
++term_use_ptmx(smbd_t)
++
+ ifdef(`hide_broken_symptoms', `
+ files_dontaudit_getattr_default_dirs(smbd_t)
+ files_dontaudit_getattr_boot_dirs(smbd_t)
+@@ -350,8 +371,20 @@
+ tunable_policy(`samba_share_nfs',`
+ fs_manage_nfs_dirs(smbd_t)
+ fs_manage_nfs_files(smbd_t)
++ fs_manage_nfs_symlinks(smbd_t)
++ fs_manage_nfs_named_pipes(smbd_t)
++ fs_manage_nfs_named_sockets(smbd_t)
++')
++
++# Support Samba sharing of ntfs/fusefs mount points
++tunable_policy(`samba_share_fusefs',`
++ fs_manage_fusefs_dirs(smbd_t)
++ fs_manage_fusefs_files(smbd_t)
++',`
++ fs_search_fusefs_dirs(smbd_t)
+ ')
+
++
+ optional_policy(`
+ cups_read_rw_config(smbd_t)
+ cups_stream_connect(smbd_t)
+@@ -359,6 +392,16 @@
+
+ optional_policy(`
+ kerberos_use(smbd_t)
++ kerberos_keytab_template(smbd, smbd_t)
++')
++
++optional_policy(`
++ lpd_exec_lpr(smbd_t)
++')
++
++optional_policy(`
++ qemu_manage_tmp_dirs(smbd_t)
++ qemu_manage_tmp_files(smbd_t)
+ ')
+
+ optional_policy(`
+@@ -381,8 +424,10 @@
+
+ tunable_policy(`samba_export_all_ro',`
+ fs_read_noxattr_fs_files(smbd_t)
++ auth_read_all_dirs_except_shadow(smbd_t)
+ auth_read_all_files_except_shadow(smbd_t)
+ fs_read_noxattr_fs_files(nmbd_t)
++ auth_read_all_dirs_except_shadow(nmbd_t)
+ auth_read_all_files_except_shadow(nmbd_t)
+ ')
+
+@@ -454,6 +499,7 @@
+ dev_getattr_mtrr_dev(nmbd_t)
+
+ fs_getattr_all_fs(nmbd_t)
++fs_list_inotifyfs(nmbd_t)
+ fs_search_auto_mountpoints(nmbd_t)
+
+ domain_use_interactive_fds(nmbd_t)
+@@ -553,19 +599,33 @@
+ userdom_use_user_terminals(smbmount_t)
+ userdom_use_all_users_fds(smbmount_t)
+
++optional_policy(`
++ cups_read_rw_config(smbmount_t)
++')
++
+ ########################################
+ #
+ # SWAT Local policy
+ #
+
+-allow swat_t self:capability { setuid setgid };
+-allow swat_t self:process signal_perms;
+-allow swat_t self:fifo_file rw_file_perms;
++allow swat_t self:capability { setuid setgid sys_resource };
++allow swat_t self:process { setrlimit signal_perms };
++allow swat_t self:fifo_file rw_fifo_file_perms;
+ allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
+ allow swat_t self:tcp_socket create_stream_socket_perms;
+ allow swat_t self:udp_socket create_socket_perms;
+
++allow swat_t self:unix_stream_socket connectto;
++can_exec(swat_t, smbd_exec_t)
++allow swat_t smbd_port_t:tcp_socket name_bind;
++allow swat_t smbd_t:process { signal signull };
++allow swat_t smbd_var_run_t:file { lock unlink };
++
+ allow swat_t nmbd_exec_t:file mmap_file_perms;
++can_exec(swat_t, nmbd_exec_t)
++allow swat_t nmbd_port_t:udp_socket name_bind;
++allow swat_t nmbd_t:process { signal signull };
++allow swat_t nmbd_var_run_t:file { lock read unlink };
+
+ rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
+
+@@ -585,6 +645,9 @@
+ files_pid_filetrans(swat_t, swat_var_run_t, file)
+
+ allow swat_t winbind_exec_t:file mmap_file_perms;
++can_exec(swat_t, winbind_exec_t)
++allow swat_t winbind_var_run_t:dir { write add_name remove_name };
++allow swat_t winbind_var_run_t:sock_file { create unlink };
+
+ kernel_read_kernel_sysctls(swat_t)
+ kernel_read_system_state(swat_t)
+@@ -609,15 +672,18 @@
+
+ dev_read_urand(swat_t)
+
++files_list_var_lib(swat_t)
+ files_read_etc_files(swat_t)
+ files_search_home(swat_t)
+ files_read_usr_files(swat_t)
+ fs_getattr_xattr_fs(swat_t)
++fs_list_inotifyfs(swat_t)
+
+ auth_domtrans_chk_passwd(swat_t)
+ auth_use_nsswitch(swat_t)
+
+ logging_send_syslog_msg(swat_t)
++logging_send_audit_msgs(swat_t)
+ logging_search_logs(swat_t)
+
+ miscfiles_read_localization(swat_t)
+@@ -635,6 +701,17 @@
+ kerberos_use(swat_t)
+ ')
+
++init_read_utmp(swat_t)
++init_dontaudit_write_utmp(swat_t)
++
++manage_dirs_pattern(swat_t, samba_log_t, samba_log_t)
++create_files_pattern(swat_t, samba_log_t, samba_log_t)
++
++manage_files_pattern(swat_t, samba_etc_t, samba_secrets_t)
++
++manage_files_pattern(swat_t, samba_var_t, samba_var_t)
++files_list_var_lib(swat_t)
++
+ ########################################
+ #
+ # Winbind local policy
+@@ -683,6 +760,8 @@
+ manage_sock_files_pattern(winbind_t, winbind_var_run_t, winbind_var_run_t)
+ files_pid_filetrans(winbind_t, winbind_var_run_t, file)
+
++corecmd_exec_bin(winbind_t)
++
+ kernel_read_kernel_sysctls(winbind_t)
+ kernel_list_proc(winbind_t)
+ kernel_read_proc_symlinks(winbind_t)
+@@ -768,8 +847,13 @@
+ userdom_use_user_terminals(winbind_helper_t)
+
+ optional_policy(`
++ apache_append_log(winbind_helper_t)
++')
++
++optional_policy(`
+ squid_read_log(winbind_helper_t)
+ squid_append_log(winbind_helper_t)
++ squid_rw_stream_sockets(winbind_helper_t)
+ ')
+
+ ########################################
+@@ -778,6 +862,16 @@
+ #
+
+ optional_policy(`
++ type samba_unconfined_net_t;
++ domain_type(samba_unconfined_net_t)
++ role system_r types samba_unconfined_net_t;
++
++ unconfined_domain(samba_unconfined_net_t)
++
++ manage_files_pattern(samba_unconfined_net_t, samba_etc_t, samba_secrets_t)
++ filetrans_pattern(samba_unconfined_net_t, samba_etc_t, samba_secrets_t, file)
++')
++
+ type samba_unconfined_script_t;
+ type samba_unconfined_script_exec_t;
+ domain_type(samba_unconfined_script_t)
+@@ -788,9 +882,43 @@
+ allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
+ allow smbd_t samba_unconfined_script_exec_t:file ioctl;
+
++optional_policy(`
+ unconfined_domain(samba_unconfined_script_t)
++')
+
+ tunable_policy(`samba_run_unconfined',`
+ domtrans_pattern(smbd_t, samba_unconfined_script_exec_t, samba_unconfined_script_t)
++', `
++ can_exec(smbd_t, samba_unconfined_script_exec_t)
+ ')
+-')
++
++########################################
++#
++# smbcontrol local policy
++#
++
++# internal communication is often done using fifo and unix sockets.
++allow smbcontrol_t self:fifo_file rw_file_perms;
++allow smbcontrol_t self:unix_stream_socket create_stream_socket_perms;
++
++files_read_etc_files(smbcontrol_t)
++
++miscfiles_read_localization(smbcontrol_t)
++
++files_search_var_lib(smbcontrol_t)
++samba_read_config(smbcontrol_t)
++samba_rw_var_files(smbcontrol_t)
++samba_search_var(smbcontrol_t)
++samba_read_winbind_pid(smbcontrol_t)
++
++allow smbcontrol_t smbd_t:process signal;
++domain_use_interactive_fds(smbcontrol_t)
++allow smbd_t smbcontrol_t:process { signal signull };
++
++allow nmbd_t smbcontrol_t:process signal;
++allow smbcontrol_t nmbd_t:process { signal signull };
++
++allow smbcontrol_t winbind_t:process { signal signull };
++allow winbind_t smbcontrol_t:process signal;
++
++allow smbcontrol_t nmbd_var_run_t:file { read lock };
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.6.1/policy/modules/services/sasl.te
+--- nsaserefpolicy/policy/modules/services/sasl.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/sasl.te 2008-11-25 09:45:43.000000000 -0500
+@@ -107,6 +107,10 @@
+ ')
+
+ optional_policy(`
++ nis_authenticate(saslauthd_t)
++')
++
++optional_policy(`
+ seutil_sigchld_newrole(saslauthd_t)
+ ')
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.1/policy/modules/services/sendmail.if
+--- nsaserefpolicy/policy/modules/services/sendmail.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/sendmail.if 2008-11-25 09:45:43.000000000 -0500
+@@ -149,3 +149,92 @@
+
+ logging_log_filetrans($1, sendmail_log_t, file)
+ ')
++
++########################################
++## <summary>
++## Execute the sendmail program in the sendmail domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to allow the sendmail domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`sendmail_run',`
++ gen_require(`
++ type sendmail_t;
++ ')
++
++ sendmail_domtrans($1)
++ role $2 types sendmail_t;
++')
++
++########################################
++## <summary>
++## Execute sendmail in the unconfined sendmail domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`sendmail_domtrans_unconfined',`
++ gen_require(`
++ type unconfined_sendmail_t, sendmail_exec_t;
++ ')
++
++ domtrans_pattern($1, sendmail_exec_t, unconfined_sendmail_t)
++')
++
++########################################
++## <summary>
++## Execute sendmail in the unconfined sendmail domain, and
++## allow the specified role the unconfined sendmail domain,
++## and use the caller's terminal.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the unconfined sendmail domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`sendmail_run_unconfined',`
++ gen_require(`
++ type unconfined_sendmail_t;
++ ')
++
++ sendmail_domtrans_unconfined($1)
++ role $2 types unconfined_sendmail_t;
++')
++
++########################################
++## <summary>
++## Allow attempts to read and write to
++## sendmail unnamed pipes.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit.
++## </summary>
++## </param>
++#
++interface(`sendmail_rw_pipes',`
++ gen_require(`
++ type sendmail_t;
++ ')
++
++ allow $1 sendmail_t:fifo_file rw_fifo_file_perms;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.6.1/policy/modules/services/sendmail.te
+--- nsaserefpolicy/policy/modules/services/sendmail.te 2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/sendmail.te 2008-11-25 10:40:18.000000000 -0500
+@@ -1,5 +1,5 @@
+
+-policy_module(sendmail, 1.8.2)
++policy_module(sendmail, 1.8.1)
+
+ ########################################
+ #
+@@ -20,13 +20,17 @@
+ mta_mailserver_delivery(sendmail_t)
+ mta_mailserver_sender(sendmail_t)
+
++type unconfined_sendmail_t;
++application_domain(unconfined_sendmail_t, sendmail_exec_t)
++role system_r types unconfined_sendmail_t;
++
+ ########################################
+ #
+ # Sendmail local policy
+ #
+
+-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 { 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;
+@@ -47,6 +51,7 @@
+ kernel_read_kernel_sysctls(sendmail_t)
+ # for piping mail to a command
+ kernel_read_system_state(sendmail_t)
++kernel_read_network_state(sendmail_t)
+
+ corenet_all_recvfrom_unlabeled(sendmail_t)
+ corenet_all_recvfrom_netlabel(sendmail_t)
+@@ -64,24 +69,29 @@
+
+ fs_getattr_all_fs(sendmail_t)
+ fs_search_auto_mountpoints(sendmail_t)
++fs_rw_anon_inodefs_files(sendmail_t)
+
+ term_dontaudit_use_console(sendmail_t)
+
+ # for piping mail to a command
+ corecmd_exec_shell(sendmail_t)
++corecmd_exec_bin(sendmail_t)
+
+ domain_use_interactive_fds(sendmail_t)
+
+ files_read_etc_files(sendmail_t)
++files_read_usr_files(sendmail_t)
+ files_search_spool(sendmail_t)
+ # for piping mail to a command
+ files_read_etc_runtime_files(sendmail_t)
++files_read_all_tmp_files(sendmail_t)
+
+ init_use_fds(sendmail_t)
+ init_use_script_ptys(sendmail_t)
+ # 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)
+
+@@ -89,23 +99,38 @@
+ libs_read_lib_files(sendmail_t)
+
+ logging_send_syslog_msg(sendmail_t)
++logging_dontaudit_write_generic_logs(sendmail_t)
+
+ miscfiles_read_certs(sendmail_t)
+ miscfiles_read_localization(sendmail_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(sendmail_t)
+-userdom_dontaudit_search_user_home_dirs(sendmail_t)
++userdom_read_user_home_content_files(sendmail_t)
+
+ mta_read_config(sendmail_t)
+ mta_etc_filetrans_aliases(sendmail_t)
+ # Write to /etc/aliases and /etc/mail.
+-mta_rw_aliases(sendmail_t)
++mta_manage_aliases(sendmail_t)
+ # Write to /var/spool/mail and /var/spool/mqueue.
+ mta_manage_queue(sendmail_t)
+ mta_manage_spool(sendmail_t)
++mta_sendmail_exec(sendmail_t)
++
++optional_policy(`
++ cron_read_pipes(sendmail_t)
++')
+
+ optional_policy(`
+ clamav_search_lib(sendmail_t)
++ clamav_stream_connect(sendmail_t)
++')
++
++optional_policy(`
++ cyrus_stream_connect(sendmail_t)
++')
++
++optional_policy(`
++ kerberos_keytab_template(sendmail, sendmail_t)
+ ')
+
+ optional_policy(`
+@@ -113,13 +138,19 @@
+ ')
+
+ optional_policy(`
+- postfix_exec_master(sendmail_t)
++ munin_dontaudit_search_lib(sendmail_t)
++')
++
++optional_policy(`
++ postfix_domtrans_postdrop(sendmail_t)
++ postfix_domtrans_master(sendmail_t)
+ postfix_read_config(sendmail_t)
+ postfix_search_spool(sendmail_t)
+ ')
+
+ optional_policy(`
+ procmail_domtrans(sendmail_t)
++ procmail_rw_tmp_files(sendmail_t)
+ ')
+
+ optional_policy(`
+@@ -127,24 +158,29 @@
+ ')
+
+ optional_policy(`
++ sasl_connect(sendmail_t)
++')
++
++optional_policy(`
++ spamd_stream_connect(sendmail_t)
++')
++
++optional_policy(`
+ udev_read_db(sendmail_t)
+ ')
+
+-ifdef(`TODO',`
+-allow sendmail_t etc_mail_t:dir rw_dir_perms;
+-allow sendmail_t etc_mail_t:file manage_file_perms;
+-# for the start script to run make -C /etc/mail
+-allow initrc_t etc_mail_t:dir rw_dir_perms;
+-allow initrc_t etc_mail_t:file manage_file_perms;
+-allow system_mail_t initrc_t:fd use;
+-allow system_mail_t initrc_t:fifo_file write;
+-
+-# When sendmail runs as user_mail_domain, it needs some extra permissions
+-# to update /etc/mail/statistics.
+-allow user_mail_domain etc_mail_t:file rw_file_perms;
++optional_policy(`
++ uucp_domtrans_uux(sendmail_t)
++')
+
+-# Silently deny attempts to access /root.
+-dontaudit system_mail_t { staff_home_dir_t sysadm_home_dir_t}:dir { getattr search };
++########################################
++#
++# Unconfined sendmail local policy
++# Allow unconfined domain to run newalias and have transitions work
++#
++
++optional_policy(`
++ mta_etc_filetrans_aliases(unconfined_sendmail_t)
++ unconfined_domain(unconfined_sendmail_t)
++')
+
+-dontaudit sendmail_t admin_tty_type:chr_file { getattr ioctl };
+-') dnl end TODO
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-3.6.1/policy/modules/services/setroubleshoot.fc
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/setroubleshoot.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,3 +1,5 @@
++/etc/rc\.d/init\.d/setroubleshoot -- gen_context(system_u:object_r:setroubleshoot_initrc_exec_t,s0)
++
+ /usr/sbin/setroubleshootd -- gen_context(system_u:object_r:setroubleshootd_exec_t,s0)
+
+ /var/run/setroubleshoot(/.*)? gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.6.1/policy/modules/services/setroubleshoot.if
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.if 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/setroubleshoot.if 2008-11-25 09:45:43.000000000 -0500
+@@ -16,8 +16,8 @@
+ ')
+
+ files_search_pids($1)
+- allow $1 setroubleshoot_var_run_t:sock_file write;
+- allow $1 setroubleshootd_t:unix_stream_socket connectto;
++ stream_connect_pattern($1, setroubleshoot_var_run_t, setroubleshoot_var_run_t, setroubleshootd_t)
++ allow $1 setroubleshoot_var_run_t:sock_file read;
+ ')
+
+ ########################################
+@@ -36,6 +36,48 @@
+ type setroubleshootd_t, setroubleshoot_var_run_t;
+ ')
+
+- dontaudit $1 setroubleshoot_var_run_t:sock_file write;
++ dontaudit $1 setroubleshoot_var_run_t:sock_file rw_sock_file_perms;
+ dontaudit $1 setroubleshootd_t:unix_stream_socket connectto;
+ ')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an setroubleshoot environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the setroubleshoot domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`setroubleshoot_admin',`
++ gen_require(`
++ type setroubleshootd_t, setroubleshoot_log_t;
++ type setroubleshoot_var_lib_t, setroubleshoot_var_run_t;
++ type setroubleshoot_initrc_exec_t;
++ ')
++
++ allow $1 setroubleshootd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, setroubleshootd_t)
++
++ init_labeled_script_domtrans($1, setroubleshoot_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 setroubleshoot_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ logging_list_logs($1)
++ admin_pattern($1, setroubleshoot_log_t)
++
++ files_list_var_lib($1)
++ admin_pattern($1, setroubleshoot_var_lib_t)
++
++ files_list_pids($1)
++ admin_pattern($1, setroubleshoot_var_run_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.1/policy/modules/services/setroubleshoot.te
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/setroubleshoot.te 2008-11-25 09:45:43.000000000 -0500
+@@ -11,6 +11,9 @@
+ domain_type(setroubleshootd_t)
+ init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
+
++type setroubleshoot_initrc_exec_t;
++init_script_file(setroubleshoot_initrc_exec_t)
++
+ type setroubleshoot_var_lib_t;
+ files_type(setroubleshoot_var_lib_t)
+
+@@ -27,8 +30,8 @@
+ # setroubleshootd local policy
+ #
+
+-allow setroubleshootd_t self:capability { dac_override sys_tty_config };
+-allow setroubleshootd_t self:process { signull signal getattr getsched };
++allow setroubleshootd_t self:capability { dac_override sys_nice sys_tty_config };
++allow setroubleshootd_t self:process { getattr getsched setsched sigkill signull signal };
+ allow setroubleshootd_t self:fifo_file rw_fifo_file_perms;
+ allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
+ allow setroubleshootd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+@@ -52,7 +55,10 @@
+
+ kernel_read_kernel_sysctls(setroubleshootd_t)
+ kernel_read_system_state(setroubleshootd_t)
++kernel_read_net_sysctls(setroubleshootd_t)
+ kernel_read_network_state(setroubleshootd_t)
++kernel_dontaudit_list_all_proc(setroubleshootd_t)
++kernel_read_unlabeled_state(setroubleshootd_t)
+
+ corecmd_exec_bin(setroubleshootd_t)
+ corecmd_exec_shell(setroubleshootd_t)
+@@ -68,16 +74,23 @@
+
+ dev_read_urand(setroubleshootd_t)
+ dev_read_sysfs(setroubleshootd_t)
++dev_getattr_all_blk_files(setroubleshootd_t)
++dev_getattr_all_chr_files(setroubleshootd_t)
+
+ domain_dontaudit_search_all_domains_state(setroubleshootd_t)
+
+ files_read_usr_files(setroubleshootd_t)
+ files_read_etc_files(setroubleshootd_t)
+-files_getattr_all_dirs(setroubleshootd_t)
++files_list_all(setroubleshootd_t)
+ files_getattr_all_files(setroubleshootd_t)
++files_getattr_all_pipes(setroubleshootd_t)
++files_getattr_all_sockets(setroubleshootd_t)
+
+ fs_getattr_all_dirs(setroubleshootd_t)
+ fs_getattr_all_files(setroubleshootd_t)
++fs_read_fusefs_symlinks(setroubleshootd_t)
++fs_dontaudit_read_nfs_files(setroubleshootd_t)
++fs_dontaudit_read_cifs_files(setroubleshootd_t)
+
+ selinux_get_enforce_mode(setroubleshootd_t)
+ selinux_validate_context(setroubleshootd_t)
+@@ -94,22 +107,24 @@
+
+ locallogin_dontaudit_use_fds(setroubleshootd_t)
+
++logging_send_audit_msgs(setroubleshootd_t)
+ logging_send_syslog_msg(setroubleshootd_t)
+ logging_stream_connect_dispatcher(setroubleshootd_t)
+
+ seutil_read_config(setroubleshootd_t)
+ seutil_read_file_contexts(setroubleshootd_t)
+-
+-sysnet_read_config(setroubleshootd_t)
++seutil_read_bin_policy(setroubleshootd_t)
+
+ userdom_dontaudit_read_user_home_content_files(setroubleshootd_t)
+
+ optional_policy(`
+ dbus_system_bus_client(setroubleshootd_t)
+ dbus_connect_system_bus(setroubleshootd_t)
++ dbus_system_domain(setroubleshootd_t, setroubleshootd_exec_t)
+ ')
+
+ optional_policy(`
++ rpm_signull(setroubleshootd_t)
+ rpm_read_db(setroubleshootd_t)
+ rpm_dontaudit_manage_db(setroubleshootd_t)
+ rpm_use_script_fds(setroubleshootd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.6.1/policy/modules/services/smartmon.te
+--- nsaserefpolicy/policy/modules/services/smartmon.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/smartmon.te 2008-11-25 09:45:43.000000000 -0500
+@@ -19,6 +19,10 @@
+ type fsdaemon_tmp_t;
+ files_tmp_file(fsdaemon_tmp_t)
+
++ifdef(`enable_mls',`
++ init_ranged_daemon_domain(fsdaemon_t,fsdaemon_exec_t,mls_systemhigh)
++')
++
+ ########################################
+ #
+ # Local policy
+@@ -26,7 +30,7 @@
+
+ allow fsdaemon_t self:capability { setgid sys_rawio sys_admin };
+ dontaudit fsdaemon_t self:capability sys_tty_config;
+-allow fsdaemon_t self:process signal_perms;
++allow fsdaemon_t self:process { signal_perms setfscreate };
+ allow fsdaemon_t self:fifo_file rw_fifo_file_perms;
+ allow fsdaemon_t self:unix_dgram_socket create_socket_perms;
+ allow fsdaemon_t self:unix_stream_socket create_stream_socket_perms;
+@@ -52,6 +56,7 @@
+ corenet_udp_sendrecv_all_nodes(fsdaemon_t)
+ corenet_udp_sendrecv_all_ports(fsdaemon_t)
+
++dev_delete_generic_dirs(fsdaemon_t)
+ dev_read_sysfs(fsdaemon_t)
+ dev_read_urand(fsdaemon_t)
+
+@@ -67,9 +72,11 @@
+
+ mls_file_read_all_levels(fsdaemon_t)
+
++storage_dev_filetrans_fixed_disk(fsdaemon_t)
+ storage_raw_read_fixed_disk(fsdaemon_t)
+ storage_raw_write_fixed_disk(fsdaemon_t)
+ storage_raw_read_removable_device(fsdaemon_t)
++storage_manage_fixed_disk(fsdaemon_t)
+
+ term_dontaudit_search_ptys(fsdaemon_t)
+
+@@ -80,6 +87,8 @@
+
+ miscfiles_read_localization(fsdaemon_t)
+
++selinux_validate_context(fsdaemon_t)
++
+ sysnet_dns_name_resolve(fsdaemon_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(fsdaemon_t)
+@@ -91,6 +100,7 @@
+
+ optional_policy(`
+ seutil_sigchld_newrole(fsdaemon_t)
++ seutil_read_file_contexts(fsdaemon_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.6.1/policy/modules/services/snmp.fc
+--- nsaserefpolicy/policy/modules/services/snmp.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/snmp.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,3 +1,6 @@
++/etc/rc\.d/init\.d/snmpd -- gen_context(system_u:object_r:snmp_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/snmptrapd -- gen_context(system_u:object_r:snmp_initrc_exec_t,s0)
++
+ #
+ # /usr
+ #
+@@ -8,6 +11,7 @@
+ #
+ # /var
+ #
++/var/agentx(/.*)? gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ /var/lib/net-snmp(/.*)? gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+ /var/lib/snmp(/.*)? gen_context(system_u:object_r:snmpd_var_lib_t,s0)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.6.1/policy/modules/services/snmp.if
+--- nsaserefpolicy/policy/modules/services/snmp.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/snmp.if 2008-11-25 09:45:43.000000000 -0500
+@@ -95,23 +95,34 @@
+ ## Domain allowed access.
+ ## </summary>
+ ## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the snmp domain.
++## </summary>
++## </param>
+ ## <rolecap/>
+ #
+ interface(`snmp_admin',`
+ gen_require(`
+ type snmpd_t, snmpd_log_t;
+ type snmpd_var_lib_t, snmpd_var_run_t;
++ type snmpd_initrc_exec_t;
+ ')
+
+ allow $1 snmpd_t:process { ptrace signal_perms getattr };
+ ps_process_pattern($1, snmpd_t)
+
++ init_labeled_script_domtrans($1, snmpd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 snmpd_initrc_exec_t system_r;
++ allow $2 system_r;
++
+ logging_list_logs($1)
+- manage_files_pattern($1, snmpd_log_t, snmpd_log_t)
++ admin_pattern($1, snmpd_log_t)
+
+ files_list_var_lib($1)
+- manage_files_pattern($1, snmpd_var_lib_t, snmpd_var_lib_t)
++ admin_pattern($1, snmpd_var_lib_t)
+
+ files_list_pids($1)
+- manage_files_pattern($1, snmpd_var_run_t, snmpd_var_run_t)
++ admin_pattern($1, snmpd_var_run_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.6.1/policy/modules/services/snmp.te
+--- nsaserefpolicy/policy/modules/services/snmp.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/snmp.te 2008-12-01 15:41:27.000000000 -0500
+@@ -9,6 +9,9 @@
+ type snmpd_exec_t;
+ init_daemon_domain(snmpd_t, snmpd_exec_t)
+
++type snmp_initrc_exec_t;
++init_script_file(snmp_initrc_exec_t)
++
+ type snmpd_log_t;
+ logging_log_file(snmpd_log_t)
+
+@@ -22,8 +25,9 @@
+ #
+ # Local policy
+ #
+-allow snmpd_t self:capability { dac_override kill net_admin sys_nice sys_tty_config };
++allow snmpd_t self:capability { dac_override ipc_lock kill net_admin sys_nice sys_tty_config sys_ptrace };
+ dontaudit snmpd_t self:capability { sys_module sys_tty_config };
++allow snmpd_t self:process { getsched setsched };
+ allow snmpd_t self:fifo_file rw_fifo_file_perms;
+ allow snmpd_t self:unix_dgram_socket create_socket_perms;
+ allow snmpd_t self:unix_stream_socket create_stream_socket_perms;
+@@ -45,10 +49,13 @@
+
+ kernel_read_device_sysctls(snmpd_t)
+ kernel_read_kernel_sysctls(snmpd_t)
++kernel_read_fs_sysctls(snmpd_t)
+ kernel_read_net_sysctls(snmpd_t)
+ kernel_read_proc_symlinks(snmpd_t)
+ kernel_read_system_state(snmpd_t)
+ kernel_read_network_state(snmpd_t)
++kernel_read_xen_state(snmpd_t)
++kernel_write_xen_state(snmpd_t)
+
+ corecmd_exec_bin(snmpd_t)
+ corecmd_exec_shell(snmpd_t)
+@@ -66,6 +73,7 @@
+ corenet_tcp_bind_snmp_port(snmpd_t)
+ corenet_udp_bind_snmp_port(snmpd_t)
+ corenet_sendrecv_snmp_server_packets(snmpd_t)
++corenet_tcp_connect_agentx_port(snmpd_t)
+
+ dev_list_sysfs(snmpd_t)
+ dev_read_sysfs(snmpd_t)
+@@ -76,13 +84,14 @@
+ domain_use_interactive_fds(snmpd_t)
+ domain_signull_all_domains(snmpd_t)
+ domain_read_all_domains_state(snmpd_t)
++domain_dontaudit_ptrace_all_domains(snmpd_t)
++domain_exec_all_entry_files(snmpd_t)
+
+ files_read_etc_files(snmpd_t)
+ files_read_usr_files(snmpd_t)
+ files_read_etc_runtime_files(snmpd_t)
+ files_search_home(snmpd_t)
+-files_getattr_boot_dirs(snmpd_t)
+-files_dontaudit_getattr_home_dir(snmpd_t)
++auth_read_all_dirs_except_shadow(snmpd_t)
+
+ fs_getattr_all_dirs(snmpd_t)
+ fs_getattr_all_fs(snmpd_t)
+@@ -94,6 +103,8 @@
+ init_read_utmp(snmpd_t)
+ init_dontaudit_write_utmp(snmpd_t)
+
++auth_use_nsswitch(snmpd_t)
++
+ logging_send_syslog_msg(snmpd_t)
+
+ miscfiles_read_localization(snmpd_t)
+@@ -117,7 +128,7 @@
+ ')
+
+ optional_policy(`
+- auth_use_nsswitch(snmpd_t)
++ consoletype_exec(snmpd_t)
+ ')
+
+ optional_policy(`
+@@ -148,3 +159,12 @@
+ optional_policy(`
+ udev_read_db(snmpd_t)
+ ')
++
++optional_policy(`
++ virt_stream_connect(snmpd_t)
++')
++
++optional_policy(`
++ xen_stream_connect(snmpd_t)
++ xen_stream_connect_xenstore(snmpd_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.6.1/policy/modules/services/snort.te
+--- nsaserefpolicy/policy/modules/services/snort.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/snort.te 2008-11-25 09:45:43.000000000 -0500
+@@ -56,6 +56,7 @@
+ files_pid_filetrans(snort_t, snort_var_run_t, file)
+
+ kernel_read_kernel_sysctls(snort_t)
++kernel_read_sysctl(snort_t)
+ kernel_list_proc(snort_t)
+ kernel_read_proc_symlinks(snort_t)
+ kernel_dontaudit_read_system_state(snort_t)
+@@ -70,6 +71,7 @@
+ corenet_raw_sendrecv_all_nodes(snort_t)
+ corenet_tcp_sendrecv_all_ports(snort_t)
+ corenet_udp_sendrecv_all_ports(snort_t)
++corenet_tcp_connect_prelude_port(snort_t)
+
+ dev_read_sysfs(snort_t)
+ dev_read_rand(snort_t)
+@@ -94,6 +96,13 @@
+ userdom_dontaudit_use_unpriv_user_fds(snort_t)
+ userdom_dontaudit_search_user_home_dirs(snort_t)
+
++# snorts must be able to resolve dns in case it wants to relay to a remote prelude-manager
++sysnet_dns_name_resolve(snort_t)
++
++optional_policy(`
++ prelude_manage_spool(snort_t)
++')
++
+ optional_policy(`
+ seutil_sigchld_newrole(snort_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.6.1/policy/modules/services/spamassassin.fc
+--- nsaserefpolicy/policy/modules/services/spamassassin.fc 2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/spamassassin.fc 2008-11-25 14:04:31.000000000 -0500
+@@ -1,15 +1,24 @@
+ HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:spamassassin_home_t,s0)
+
++/etc/rc\.d/init\.d/spamd -- gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
++/etc/rc\.d/init\.d/mimedefang.* -- gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
++
+ /usr/bin/sa-learn -- gen_context(system_u:object_r:spamc_exec_t,s0)
+-/usr/bin/spamassassin -- gen_context(system_u:object_r:spamassassin_exec_t,s0)
++/usr/bin/spamassassin -- gen_context(system_u:object_r:spamc_exec_t,s0)
+ /usr/bin/spamc -- gen_context(system_u:object_r:spamc_exec_t,s0)
+-/usr/bin/spamd -- gen_context(system_u:object_r:spamd_exec_t,s0)
++/usr/bin/spamd -- gen_context(system_u:object_r:spamassassin_exec_t,s0)
+
+ /usr/sbin/spamd -- gen_context(system_u:object_r:spamd_exec_t,s0)
++/usr/bin/mimedefang-multiplexor -- gen_context(system_u:object_r:spamd_exec_t,s0)
+
+ /var/lib/spamassassin(/.*)? gen_context(system_u:object_r:spamd_var_lib_t,s0)
+
++/var/log/spamd\.log -- gen_context(system_u:object_r:spamd_log_t,s0)
++/var/log/mimedefang -- gen_context(system_u:object_r:spamd_log_t,s0)
++
+ /var/run/spamassassin(/.*)? gen_context(system_u:object_r:spamd_var_run_t,s0)
+
+ /var/spool/spamassassin(/.*)? gen_context(system_u:object_r:spamd_spool_t,s0)
+ /var/spool/spamd(/.*)? gen_context(system_u:object_r:spamd_spool_t,s0)
++/var/spool/MD-Quarantine(/.*)? gen_context(system_u:object_r:spamd_spool_t,s0)
++/var/spool/MIMEDefang(/.*)? gen_context(system_u:object_r:spamd_spool_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.6.1/policy/modules/services/spamassassin.if
+--- nsaserefpolicy/policy/modules/services/spamassassin.if 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/spamassassin.if 2008-11-25 09:45:43.000000000 -0500
+@@ -111,6 +111,7 @@
+ ')
+
+ domtrans_pattern($1, spamc_exec_t, spamc_t)
++ allow $1 spamc_exec_t:file ioctl;
+ ')
+
+ ########################################
+@@ -166,6 +167,7 @@
+ ')
+
+ files_search_var_lib($1)
++ list_dirs_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
+ read_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
+ ')
+
+@@ -225,3 +227,69 @@
+
+ dontaudit $1 spamd_tmp_t:sock_file getattr;
+ ')
++
++########################################
++## <summary>
++## Connect to run spamd.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to connect.
++## </summary>
++## </param>
++#
++interface(`spamd_stream_connect',`
++ gen_require(`
++ type spamd_t, spamd_var_run_t;
++ ')
++
++ stream_connect_pattern($1, spamd_var_run_t, spamd_var_run_t, spamd_t)
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an spamassassin environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the spamassassin domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`spamassassin_spamd_admin',`
++ gen_require(`
++ type spamd_t, spamd_tmp_t, spamd_log_t;
++ type spamd_spool_t, spamd_var_lib_t, spamd_var_run_t;
++ type spamd_initrc_exec_t;
++ ')
++
++ allow $1 spamd_t:process { ptrace signal_perms getattr };
++ read_files_pattern($1, spamd_t, spamd_t)
++
++ init_labeled_script_domtrans($1, spamd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 spamd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_list_tmp($1)
++ admin_pattern($1, spamd_tmp_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, spamd_log_t)
++
++ files_list_spool($1)
++ admin_pattern($1, spamd_spool_t)
++
++ files_list_var_lib($1)
++ admin_pattern($1, spamd_var_lib_t)
++
++ files_list_pids($1)
++ admin_pattern($1, spamd_var_run_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.1/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te 2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/spamassassin.te 2008-11-25 14:02:44.000000000 -0500
+@@ -1,5 +1,5 @@
+
+-policy_module(spamassassin, 2.0.1)
++policy_module(spamassassin, 2.0.0)
+
+ ########################################
+ #
+@@ -20,6 +20,35 @@
+ ## </desc>
+ gen_tunable(spamd_enable_home_dirs, true)
+
++ifdef(`distro_redhat',`
++# spamassassin client executable
++type spamc_t;
++type spamc_exec_t;
++application_domain(spamc_t, spamc_exec_t)
++role system_r types spamc_t;
++
++type spamd_etc_t;
++files_config_file(spamd_etc_t)
++
++typealias spamc_exec_t alias spamassassin_exec_t;
++typealias spamc_t alias spamassassin_t;
++
++type spamc_home_t;
++userdom_user_home_content(spamc_home_t)
++typealias spamc_home_t alias { spamassassin_home_t user_spamassassin_home_t staff_spamassassin_home_t sysadm_spamassassin_home_t };
++typealias spamc_home_t alias { auditadm_spamassassin_home_t secadm_spamassassin_home_t };
++typealias spamc_home_t alias { user_spamc_home_t staff_spamc_home_t sysadm_spamc_home_t };
++typealias spamc_home_t alias { auditadm_spamc_home_t secadm_spamc_home_t };
++
++type spamc_tmp_t;
++files_tmp_file(spamc_tmp_t)
++typealias spamc_tmp_t alias spamassassin_tmp_t;
++typealias spamc_tmp_t alias { user_spamassassin_tmp_t staff_spamassassin_tmp_t sysadm_spamassassin_tmp_t };
++typealias spamc_tmp_t alias { auditadm_spamassassin_tmp_t secadm_spamassassin_tmp_t };
++
++typealias spamc_tmp_t alias { user_spamc_tmp_t staff_spamc_tmp_t sysadm_spamc_tmp_t };
++typealias spamc_tmp_t alias { auditadm_spamc_tmp_t secadm_spamc_tmp_t };
++', `
+ type spamassassin_t;
+ type spamassassin_exec_t;
+ typealias spamassassin_t alias { user_spamassassin_t staff_spamassassin_t sysadm_spamassassin_t };
+@@ -51,11 +80,18 @@
+ typealias spamc_tmp_t alias { auditadm_spamc_tmp_t secadm_spamc_tmp_t };
+ files_tmp_file(spamc_tmp_t)
+ ubac_constrained(spamc_tmp_t)
++')
+
+ type spamd_t;
+ type spamd_exec_t;
+ init_daemon_domain(spamd_t, spamd_exec_t)
+
++type spamd_initrc_exec_t;
++init_script_file(spamd_initrc_exec_t)
++
++type spamd_log_t;
++logging_log_file(spamd_log_t)
++
+ type spamd_spool_t;
+ files_type(spamd_spool_t)
+
+@@ -221,11 +257,19 @@
+ manage_files_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
+ files_tmp_filetrans(spamc_t, spamc_tmp_t, { file dir })
+
++manage_dirs_pattern(spamc_t, spamc_home_t, spamc_home_t)
++manage_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
++manage_lnk_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
++manage_fifo_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
++manage_sock_files_pattern(spamc_t, spamc_home_t, spamc_home_t)
++userdom_user_home_dir_filetrans(spamc_t, spamc_home_t, { dir file lnk_file sock_file fifo_file })
++
+ # Allow connecting to a local spamd
+ allow spamc_t spamd_t:unix_stream_socket connectto;
+ allow spamc_t spamd_tmp_t:sock_file rw_sock_file_perms;
+
+ kernel_read_kernel_sysctls(spamc_t)
++kernel_read_system_state(spamc_t)
+
+ corenet_all_recvfrom_unlabeled(spamc_t)
+ corenet_all_recvfrom_netlabel(spamc_t)
+@@ -255,9 +299,15 @@
+ files_dontaudit_search_var(spamc_t)
+ # cjp: this may be removable:
+ files_list_home(spamc_t)
++files_list_var_lib(spamc_t)
++read_files_pattern(spamc_t, spamd_var_lib_t, spamd_var_lib_t)
++
++fs_search_auto_mountpoints(spamc_t)
+
+ logging_send_syslog_msg(spamc_t)
+
++auth_use_nsswitch(spamc_t)
++
+ miscfiles_read_localization(spamc_t)
+
+ # cjp: this should probably be removed:
+@@ -265,31 +315,34 @@
+
+ sysnet_read_config(spamc_t)
+
+-# cjp: this should probably be removed:
+-tunable_policy(`read_default_t',`
+- files_list_default(spamc_t)
+- files_read_default_files(spamc_t)
+- files_read_default_symlinks(spamc_t)
+- files_read_default_sockets(spamc_t)
+- files_read_default_pipes(spamc_t)
++tunable_policy(`use_nfs_home_dirs',`
++ fs_manage_nfs_dirs(spamc_t)
++ fs_manage_nfs_files(spamc_t)
++ fs_manage_nfs_symlinks(spamc_t)
+ ')
+
+-optional_policy(`
+- # Allow connection to spamd socket above
+- evolution_stream_connect(spamc_t)
++tunable_policy(`use_samba_home_dirs',`
++ fs_manage_cifs_dirs(spamc_t)
++ fs_manage_cifs_files(spamc_t)
++ fs_manage_cifs_symlinks(spamc_t)
+ ')
+
+ optional_policy(`
+- nis_use_ypbind(spamc_t)
++ # Allow connection to spamd socket above
++ evolution_stream_connect(spamc_t)
+ ')
+
+ optional_policy(`
+- nscd_socket_use(spamc_t)
++ postfix_domtrans_postdrop(spamc_t)
++ postfix_search_spool(spamc_t)
+ ')
+
+ optional_policy(`
++ mta_send_mail(spamc_t)
+ mta_read_config(spamc_t)
++ mta_read_queue(spamc_t)
+ sendmail_stub(spamc_t)
++ sendmail_rw_pipes(spamc_t)
+ ')
+
+ ########################################
+@@ -301,7 +354,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;
+@@ -317,10 +370,13 @@
+ allow spamd_t self:unix_stream_socket connectto;
+ allow spamd_t self:tcp_socket create_stream_socket_perms;
+ allow spamd_t self:udp_socket create_socket_perms;
+-allow spamd_t self:netlink_route_socket r_netlink_socket_perms;
++
++manage_files_pattern(spamd_t, spamd_log_t, spamd_log_t)
++logging_log_filetrans(spamd_t, spamd_log_t, file)
+
+ manage_dirs_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
+ manage_files_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
++manage_sock_files_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
+ files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
+
+ manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
+@@ -329,10 +385,11 @@
+
+ # var/lib files for spamd
+ allow spamd_t spamd_var_lib_t:dir list_dir_perms;
+-read_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
++manage_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
+
+ manage_dirs_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
+ manage_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
++manage_sock_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
+ files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
+
+ kernel_read_all_sysctls(spamd_t)
+@@ -382,22 +439,27 @@
+
+ init_dontaudit_rw_utmp(spamd_t)
+
++auth_use_nsswitch(spamd_t)
++
+ logging_send_syslog_msg(spamd_t)
+
+ miscfiles_read_localization(spamd_t)
+
+-sysnet_read_config(spamd_t)
+-sysnet_use_ldap(spamd_t)
+-sysnet_dns_name_resolve(spamd_t)
+-
+ userdom_use_unpriv_users_fds(spamd_t)
+ userdom_search_user_home_dirs(spamd_t)
+
++optional_policy(`
++ exim_manage_spool_dirs(spamd_t)
++ exim_manage_spool_files(spamd_t)
++')
++
+ tunable_policy(`use_nfs_home_dirs',`
++ fs_manage_nfs_dirs(spamd_t)
+ fs_manage_nfs_files(spamd_t)
+ ')
+
+ tunable_policy(`use_samba_home_dirs',`
++ fs_manage_cifs_dirs(spamd_t)
+ fs_manage_cifs_files(spamd_t)
+ ')
+
+@@ -415,6 +477,7 @@
+
+ optional_policy(`
+ dcc_domtrans_client(spamd_t)
++ dcc_signal_client(spamd_t)
+ dcc_stream_connect_dccifd(spamd_t)
+ ')
+
+@@ -424,10 +487,6 @@
+ ')
+
+ optional_policy(`
+- nis_use_ypbind(spamd_t)
+-')
+-
+-optional_policy(`
+ postfix_read_config(spamd_t)
+ ')
+
+@@ -442,6 +501,10 @@
+
+ optional_policy(`
+ razor_domtrans(spamd_t)
++ razor_read_lib_files(spamd_t)
++ tunable_policy(`spamd_enable_home_dirs',`
++ razor_manage_user_home_files(spamd_t)
++ ')
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.1/policy/modules/services/squid.te
+--- nsaserefpolicy/policy/modules/services/squid.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/squid.te 2008-11-25 09:45:43.000000000 -0500
+@@ -118,6 +118,8 @@
+
+ fs_getattr_all_fs(squid_t)
+ fs_search_auto_mountpoints(squid_t)
++#squid requires the following when run in diskd mode, the recommended setting
++fs_rw_tmpfs_files(squid_t)
+
+ selinux_dontaudit_getattr_dir(squid_t)
+
+@@ -185,8 +187,3 @@
+ optional_policy(`
+ udev_read_db(squid_t)
+ ')
+-
+-ifdef(`TODO',`
+-#squid requires the following when run in diskd mode, the recommended setting
+-allow squid_t tmpfs_t:file { read write };
+-') dnl end TODO
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.1/policy/modules/services/ssh.if
+--- nsaserefpolicy/policy/modules/services/ssh.if 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ssh.if 2008-11-25 09:45:43.000000000 -0500
+@@ -36,6 +36,7 @@
+ gen_require(`
+ attribute ssh_server;
+ type ssh_exec_t, sshd_key_t, sshd_tmp_t;
++ type home_ssh_t;
+ ')
+
+ ##############################
+@@ -47,9 +48,6 @@
+ application_domain($1_ssh_t, ssh_exec_t)
+ role $3 types $1_ssh_t;
+
+- type $1_home_ssh_t;
+- files_type($1_home_ssh_t)
+-
+ ##############################
+ #
+ # Client local policy
+@@ -65,8 +63,7 @@
+ allow $1_ssh_t self:sem create_sem_perms;
+ allow $1_ssh_t self:msgq create_msgq_perms;
+ allow $1_ssh_t self:msg { send receive };
+- allow $1_ssh_t self:tcp_socket create_socket_perms;
+- allow $1_ssh_t self:netlink_route_socket r_netlink_socket_perms;
++ allow $1_ssh_t self:tcp_socket create_stream_socket_perms;
+
+ # for rsync
+ allow $1_ssh_t $2:unix_stream_socket rw_socket_perms;
+@@ -93,20 +90,21 @@
+ ps_process_pattern($2, $1_ssh_t)
+
+ # user can manage the keys and config
+- manage_files_pattern($2, $1_home_ssh_t, $1_home_ssh_t)
+- manage_lnk_files_pattern($2, $1_home_ssh_t, $1_home_ssh_t)
+- manage_sock_files_pattern($2, $1_home_ssh_t, $1_home_ssh_t)
++ manage_files_pattern($2, home_ssh_t, home_ssh_t)
++ manage_lnk_files_pattern($2, home_ssh_t, home_ssh_t)
++ manage_sock_files_pattern($2, home_ssh_t, home_ssh_t)
+
+ # ssh client can manage the keys and config
+- manage_files_pattern($1_ssh_t, $1_home_ssh_t, $1_home_ssh_t)
+- read_lnk_files_pattern($1_ssh_t, $1_home_ssh_t, $1_home_ssh_t)
++ manage_files_pattern($1_ssh_t, home_ssh_t, home_ssh_t)
++ read_lnk_files_pattern($1_ssh_t, home_ssh_t, home_ssh_t)
+
+ # ssh servers can read the user keys and config
+- allow ssh_server $1_home_ssh_t:dir list_dir_perms;
+- read_files_pattern(ssh_server, $1_home_ssh_t, $1_home_ssh_t)
+- read_lnk_files_pattern(ssh_server, $1_home_ssh_t, $1_home_ssh_t)
++ allow ssh_server home_ssh_t:dir list_dir_perms;
++ read_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
++ read_lnk_files_pattern(ssh_server, home_ssh_t, home_ssh_t)
+
+ kernel_read_kernel_sysctls($1_ssh_t)
++ kernel_read_system_state($1_ssh_t)
+
+ corenet_all_recvfrom_unlabeled($1_ssh_t)
+ corenet_all_recvfrom_netlabel($1_ssh_t)
+@@ -115,6 +113,8 @@
+ corenet_tcp_sendrecv_all_ports($1_ssh_t)
+ corenet_tcp_connect_ssh_port($1_ssh_t)
+ corenet_sendrecv_ssh_client_packets($1_ssh_t)
++ corenet_tcp_bind_all_nodes($1_ssh_t)
++ corenet_tcp_bind_all_unreserved_ports($1_ssh_t)
+
+ dev_read_urand($1_ssh_t)
+
+@@ -133,6 +133,8 @@
+ files_read_etc_files($1_ssh_t)
+ files_read_var_files($1_ssh_t)
+
++ auth_use_nsswitch($1_ssh_t)
++
+ logging_send_syslog_msg($1_ssh_t)
+ logging_read_generic_logs($1_ssh_t)
+
+@@ -140,9 +142,6 @@
+
+ seutil_read_config($1_ssh_t)
+
+- sysnet_read_config($1_ssh_t)
+- sysnet_dns_name_resolve($1_ssh_t)
+-
+ tunable_policy(`read_default_t',`
+ files_list_default($1_ssh_t)
+ files_read_default_files($1_ssh_t)
+@@ -154,14 +153,6 @@
+ optional_policy(`
+ kerberos_use($1_ssh_t)
+ ')
+-
+- optional_policy(`
+- nis_use_ypbind($1_ssh_t)
+- ')
+-
+- optional_policy(`
+- nscd_socket_use($1_ssh_t)
+- ')
+ ')
+
+ #######################################
+@@ -194,13 +185,14 @@
+ type $1_var_run_t;
+ files_pid_file($1_var_run_t)
+
+- allow $1_t self:capability { kill sys_chroot sys_resource chown dac_override fowner fsetid setgid setuid sys_tty_config };
++ allow $1_t self:capability { kill sys_chroot sys_resource chown dac_override fowner fsetid net_admin setgid setuid sys_tty_config };
+ allow $1_t self:fifo_file rw_fifo_file_perms;
+ allow $1_t self:process { signal setsched setrlimit setexec };
+ allow $1_t self:tcp_socket create_stream_socket_perms;
+ allow $1_t self:udp_socket create_socket_perms;
+ # ssh agent connections:
+ allow $1_t self:unix_stream_socket create_stream_socket_perms;
++ allow $1_t self:shm create_shm_perms;
+
+ allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
+ term_create_pty($1_t,$1_devpts_t)
+@@ -229,7 +221,12 @@
+ corenet_udp_bind_all_nodes($1_t)
+ corenet_tcp_bind_ssh_port($1_t)
+ corenet_tcp_connect_all_ports($1_t)
++ corenet_tcp_bind_all_unreserved_ports($1_t)
+ corenet_sendrecv_ssh_server_packets($1_t)
++ # -R qualifier
++ corenet_sendrecv_ssh_server_packets($1_t)
++ # tunnel feature and -w (net_admin capability also)
++ corenet_rw_tun_tap_dev($1_t)
+
+ fs_dontaudit_getattr_all_fs($1_t)
+
+@@ -254,9 +251,14 @@
+
+ userdom_dontaudit_relabelfrom_user_ptys($1_t)
+ userdom_search_user_home_dirs($1_t)
++ userdom_read_user_home_content_files($1_t)
++
++ # Allow checking users mail at login
++ mta_getattr_spool($1_t)
+
+ tunable_policy(`use_nfs_home_dirs',`
+ fs_read_nfs_files($1_t)
++ fs_read_nfs_symlinks($1_t)
+ ')
+
+ tunable_policy(`use_samba_home_dirs',`
+@@ -265,11 +267,7 @@
+
+ optional_policy(`
+ kerberos_use($1_t)
+- ')
+-
+- optional_policy(`
+- # Allow checking users mail at login
+- mta_getattr_spool($1_t)
++ kerberos_manage_host_rcache($1_t)
+ ')
+
+ optional_policy(`
+@@ -611,3 +609,42 @@
+
+ dontaudit $1 sshd_key_t:file { getattr read };
+ ')
++
++#######################################
++## <summary>
++## Delete from the ssh temp files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`ssh_delete_tmp',`
++ gen_require(`
++ type sshd_tmp_t;
++ ')
++
++ files_search_tmp($1)
++ delete_files_pattern($1, sshd_tmp_t, sshd_tmp_t)
++')
++
++########################################
++## <summary>
++## Execute the ssh agent client in the caller domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`ssh_agent_exec',`
++ gen_require(`
++ type ssh_agent_exec_t;
++ ')
++
++ corecmd_search_bin($1)
++ can_exec($1, ssh_agent_exec_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.1/policy/modules/services/ssh.te
+--- nsaserefpolicy/policy/modules/services/ssh.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ssh.te 2008-11-25 09:45:43.000000000 -0500
+@@ -75,7 +75,7 @@
+ ubac_constrained(ssh_tmpfs_t)
+
+ type home_ssh_t;
+-typealias home_ssh_t alias { user_home_ssh_t staff_home_ssh_t sysadm_home_ssh_t };
++typealias home_ssh_t alias { ssh_home_t user_home_ssh_t staff_home_ssh_t sysadm_home_ssh_t };
+ typealias home_ssh_t alias { auditadm_home_ssh_t secadm_home_ssh_t };
+ files_type(home_ssh_t)
+ userdom_user_home_content(home_ssh_t)
+@@ -318,6 +318,9 @@
+ corenet_tcp_bind_xserver_port(sshd_t)
+ corenet_sendrecv_xserver_server_packets(sshd_t)
+
++userdom_read_user_home_content_files(sshd_t)
++userdom_read_user_home_content_symlinks(sshd_t)
++
+ tunable_policy(`ssh_sysadm_login',`
+ # Relabel and access ptys created by sshd
+ # ioctl is necessary for logout() processing for utmp entry and for w to
+@@ -331,6 +334,14 @@
+ ')
+
+ optional_policy(`
++ kerberos_keytab_template(sshd, sshd_t)
++')
++
++optional_policy(`
++ xserver_getattr_xauth(sshd_t)
++')
++
++optional_policy(`
+ daemontools_service_domain(sshd_t, sshd_exec_t)
+ ')
+
+@@ -349,7 +360,11 @@
+ ')
+
+ optional_policy(`
+- unconfined_domain(sshd_t)
++ usermanage_domtrans_passwd(sshd_t)
++ usermanage_read_crack_db(sshd_t)
++')
++
++optional_policy(`
+ unconfined_shell_domtrans(sshd_t)
+ ')
+
+@@ -408,6 +423,8 @@
+ init_use_fds(ssh_keygen_t)
+ init_use_script_ptys(ssh_keygen_t)
+
++auth_use_nsswitch(ssh_keygen_t)
++
+ logging_send_syslog_msg(ssh_keygen_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(ssh_keygen_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.fc serefpolicy-3.6.1/policy/modules/services/stunnel.fc
+--- nsaserefpolicy/policy/modules/services/stunnel.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/stunnel.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,5 +2,6 @@
+ /etc/stunnel(/.*)? gen_context(system_u:object_r:stunnel_etc_t,s0)
+
+ /usr/sbin/stunnel -- gen_context(system_u:object_r:stunnel_exec_t,s0)
++/usr/bin/stunnel -- gen_context(system_u:object_r:stunnel_exec_t,s0)
+
+ /var/run/stunnel(/.*)? gen_context(system_u:object_r:stunnel_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-3.6.1/policy/modules/services/stunnel.te
+--- nsaserefpolicy/policy/modules/services/stunnel.te 2008-11-11 16:13:45.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/stunnel.te 2008-11-25 09:45:43.000000000 -0500
+@@ -54,6 +54,8 @@
+ kernel_read_system_state(stunnel_t)
+ kernel_read_network_state(stunnel_t)
+
++corecmd_exec_bin(stunnel_t)
++
+ corenet_all_recvfrom_unlabeled(stunnel_t)
+ corenet_all_recvfrom_netlabel(stunnel_t)
+ corenet_tcp_sendrecv_all_if(stunnel_t)
+@@ -105,6 +107,7 @@
+ dev_read_urand(stunnel_t)
+
+ files_read_etc_files(stunnel_t)
++ files_read_etc_runtime_files(stunnel_t)
+ files_search_home(stunnel_t)
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.6.1/policy/modules/services/telnet.te
+--- nsaserefpolicy/policy/modules/services/telnet.te 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/telnet.te 2008-11-25 09:45:43.000000000 -0500
+@@ -87,8 +87,8 @@
+ userdom_search_user_home_dirs(telnetd_t)
+
+ optional_policy(`
+- kerberos_use(telnetd_t)
+- kerberos_read_keytab(telnetd_t)
++ kerberos_keytab_template(telnetd, telnetd_t)
++ kerberos_manage_host_rcache(telnetd_t)
+ ')
+
+ tunable_policy(`use_nfs_home_dirs',`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.6.1/policy/modules/services/tor.te
+--- nsaserefpolicy/policy/modules/services/tor.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/tor.te 2008-11-25 09:45:43.000000000 -0500
+@@ -34,7 +34,7 @@
+ # tor local policy
+ #
+
+-allow tor_t self:capability { setgid setuid };
++allow tor_t self:capability { setgid setuid sys_tty_config };
+ allow tor_t self:fifo_file rw_fifo_file_perms;
+ allow tor_t self:unix_stream_socket create_stream_socket_perms;
+ allow tor_t self:netlink_route_socket r_netlink_socket_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.fc serefpolicy-3.6.1/policy/modules/services/ulogd.fc
+--- nsaserefpolicy/policy/modules/services/ulogd.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ulogd.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,10 @@
++
++/etc/rc\.d/init\.d/ulogd -- gen_context(system_u:object_r:ulogd_initrc_exec_t,s0)
++
++/etc/ulogd.conf -- gen_context(system_u:object_r:ulogd_etc_t,s0)
++
++/usr/lib/ulogd(/.*)? gen_context(system_u:object_r:ulogd_modules_t,s0)
++
++/usr/sbin/ulogd -- gen_context(system_u:object_r:ulogd_exec_t,s0)
++
++/var/log/ulogd(/.*)? gen_context(system_u:object_r:ulogd_var_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.if serefpolicy-3.6.1/policy/modules/services/ulogd.if
+--- nsaserefpolicy/policy/modules/services/ulogd.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ulogd.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,127 @@
++## <summary>policy for ulogd</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run ulogd.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`ulogd_domtrans',`
++ gen_require(`
++ type ulogd_t, ulogd_exec_t;
++ ')
++
++ domtrans_pattern($1,ulogd_exec_t,ulogd_t)
++')
++
++########################################
++## <summary>
++## Allow the specified domain to read
++## ulogd configuration files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++##
++#
++interface(`ulogd_read_config',`
++ gen_require(`
++ type ulogd_etc_t;
++ ')
++
++ files_search_etc($1)
++ read_files_pattern($1, ulogd_etc_t, ulogd_etc_t)
++')
++
++########################################
++## <summary>
++## Allow the specified domain to read ulogd's log files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++##
++#
++interface(`ulogd_read_log',`
++ gen_require(`
++ type ulogd_var_log_t;
++ ')
++
++ logging_search_logs($1)
++ allow $1 ulogd_var_log_t:dir list_dir_perms;
++ read_files_pattern($1, ulogd_var_log_t, ulogd_var_log_t)
++')
++
++########################################
++## <summary>
++## Allow the specified domain to append to ulogd's log files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++##
++#
++interface(`ulogd_append_log',`
++ gen_require(`
++ type ulogd_var_log_t;
++ ')
++
++ logging_search_logs($1)
++ allow $1 ulogd_var_log_t:dir list_dir_perms;
++ allow $1 ulogd_var_log_t:file append_file_perms;
++')
++
++########################################
++## <summary>
++## All of the rules required to administrate
++## an ulogd environment
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed to manage the syslog domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`ulogd_admin',`
++ gen_require(`
++ type ulogd_t, ulogd_etc_t;
++ type ulogd_var_log_t, ulogd_initrc_exec_t;
++ type ulogd_modules_t;
++ ')
++
++ allow $1 ulogd_t:process { ptrace signal_perms };
++ ps_process_pattern($1, ulogd_t)
++
++ init_labeled_script_domtrans($1, ulogd_initrc_exec_t)
++ domain_system_change_exemption($1)
++ role_transition $2 ulogd_initrc_exec_t system_r;
++ allow $2 system_r;
++
++ files_search_etc($1)
++ admin_pattern($1, ulogd_etc_t)
++
++ logging_list_logs($1)
++ admin_pattern($1, ulogd_var_log_t)
++
++ files_search_usr($1)
++ admin_pattern($1, ulogd_modules_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.te serefpolicy-3.6.1/policy/modules/services/ulogd.te
+--- nsaserefpolicy/policy/modules/services/ulogd.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/ulogd.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,51 @@
++policy_module(ulogd,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type ulogd_t;
++type ulogd_exec_t;
++init_daemon_domain(ulogd_t, ulogd_exec_t)
++
++type ulogd_initrc_exec_t;
++init_script_file(ulogd_initrc_exec_t)
++
++# /usr/lib files
++type ulogd_modules_t;
++files_type(ulogd_modules_t)
++
++# config files
++type ulogd_etc_t;
++files_type(ulogd_etc_t)
++
++# log files
++type ulogd_var_log_t;
++logging_log_file(ulogd_var_log_t)
++
++########################################
++
++#
++# ulogd local policy
++#
++
++allow ulogd_t self:capability net_admin;
++allow ulogd_t self:netlink_nflog_socket create_socket_perms;
++
++# config files
++read_files_pattern(ulogd_t, ulogd_etc_t, ulogd_etc_t)
++
++# modules for ulogd
++list_dirs_pattern(ulogd_t,ulogd_modules_t,ulogd_modules_t)
++mmap_files_pattern(ulogd_t, ulogd_modules_t, ulogd_modules_t)
++
++# log files
++manage_files_pattern(ulogd_t, ulogd_var_log_t, ulogd_var_log_t)
++logging_log_filetrans(ulogd_t,ulogd_var_log_t, file )
++
++files_search_etc(ulogd_t)
++
++miscfiles_read_localization(ulogd_t)
++
++permissive ulogd_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.1/policy/modules/services/uucp.te
+--- nsaserefpolicy/policy/modules/services/uucp.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/uucp.te 2008-11-25 14:33:46.000000000 -0500
+@@ -121,6 +121,7 @@
+
+ optional_policy(`
+ mta_send_mail(uux_t)
++ mta_read_queue(uux_t)
+ ')
+
+ optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.6.1/policy/modules/services/virt.fc
+--- nsaserefpolicy/policy/modules/services/virt.fc 2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/virt.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,6 +2,7 @@
+ /etc/libvirt/[^/]* -- gen_context(system_u:object_r:virt_etc_t,s0)
+ /etc/libvirt/[^/]* -d gen_context(system_u:object_r:virt_etc_rw_t,s0)
+ /etc/libvirt/.*/.* gen_context(system_u:object_r:virt_etc_rw_t,s0)
++/etc/rc\.d/init\.d/libvirtd -- gen_context(system_u:object_r:virtd_initrc_exec_t,s0)
+
+ /usr/sbin/libvirtd -- gen_context(system_u:object_r:virtd_exec_t,s0)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.1/policy/modules/services/virt.if
+--- nsaserefpolicy/policy/modules/services/virt.if 2008-10-14 11:58:09.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/virt.if 2008-11-25 09:45:43.000000000 -0500
+@@ -18,6 +18,25 @@
+ domtrans_pattern($1, virtd_exec_t, virtd_t)
+ ')
+
++#######################################
++## <summary>
++## Connect to virt over an unix domain stream socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`virt_stream_connect',`
++ gen_require(`
++ type virtd_t, virt_var_run_t;
++ ')
++
++ files_search_pids($1)
++ stream_connect_pattern($1,virt_var_run_t,virt_var_run_t,virtd_t)
++')
++
+ ########################################
+ ## <summary>
+ ## Read virt config files.
+@@ -41,6 +60,27 @@
+
+ ########################################
+ ## <summary>
++## manage virt config files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`virt_manage_config',`
++ gen_require(`
++ type virt_etc_t;
++ type virt_etc_rw_t;
++ ')
++
++ files_search_etc($1)
++ manage_files_pattern($1, virt_etc_t, virt_etc_t)
++ manage_files_pattern($1, virt_etc_rw_t, virt_etc_rw_t)
++')
++
++########################################
++## <summary>
+ ## Read virt PID files.
+ ## </summary>
+ ## <param name="domain">
+@@ -78,6 +118,24 @@
+
+ ########################################
+ ## <summary>
++## Execute virt server in the virt domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`virtd_initrc_domtrans',`
++ gen_require(`
++ type virtd_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, virtd_initrc_exec_t)
++')
++
++########################################
++## <summary>
+ ## Search virt lib directories.
+ ## </summary>
+ ## <param name="domain">
+@@ -196,6 +254,35 @@
+
+ ########################################
+ ## <summary>
++## Make the specified type usable as a virt image
++## </summary>
++## <desc>
++## <p>
++## Make the specified type usable as a virt image
++## </p>
++## </desc>
++## <param name="type">
++## <summary>
++## Type to be used as a virtual image
++## </summary>
++## </param>
++#
++#
++interface(`virt_image',`
++ gen_require(`
++ attribute virt_image_type;
++ ')
++
++ typeattribute $1 virt_image_type;
++
++ files_type($1)
++
++ # virt images can be assigned to blk devices
++ dev_node($1)
++')
++
++########################################
++## <summary>
+ ## Allow domain to manage virt image files
+ ## </summary>
+ ## <param name="domain">
+@@ -214,6 +301,7 @@
+ manage_dirs_pattern($1, virt_image_t, virt_image_t)
+ manage_files_pattern($1, virt_image_t, virt_image_t)
+ read_lnk_files_pattern($1, virt_image_t, virt_image_t)
++ rw_blk_files_pattern($1, virt_image_t, virt_image_t)
+
+ tunable_policy(`virt_use_nfs',`
+ fs_manage_nfs_dirs($1)
+@@ -243,11 +331,17 @@
+ interface(`virt_admin',`
+ gen_require(`
+ type virtd_t;
++ type virtd_initrc_exec_t;
+ ')
+
+ allow $1 virtd_t:process { ptrace signal_perms };
+ ps_process_pattern($1, virtd_t)
+
++ virtd_initrc_domtrans($1)
++ domain_system_change_exemption($1)
++ role_transition $2 virtd_initrc_exec_t system_r;
++ allow $2 system_r;
++
+ virt_manage_pid_files($1)
+
+ virt_manage_lib_files($1)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.1/policy/modules/services/virt.te
+--- nsaserefpolicy/policy/modules/services/virt.te 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/virt.te 2008-11-25 09:45:43.000000000 -0500
+@@ -1,10 +1,11 @@
+
+-policy_module(virt, 1.0.1)
++policy_module(virt, 1.0.0)
+
+ ########################################
+ #
+ # Declarations
+ #
++attribute virt_image_type;
+
+ ## <desc>
+ ## <p>
+@@ -27,10 +28,8 @@
+ files_type(virt_etc_rw_t)
+
+ # virt Image files
+-type virt_image_t; # customizable
+-files_type(virt_image_t)
+-# virt_image_t can be assigned to blk devices
+-dev_node(virt_image_t)
++type virt_image_t, virt_image_type; # customizable
++virt_image(virt_image_t)
+
+ type virt_log_t;
+ logging_log_file(virt_log_t)
+@@ -45,6 +44,9 @@
+ type virtd_exec_t;
+ init_daemon_domain(virtd_t, virtd_exec_t)
+
++type virtd_initrc_exec_t;
++init_script_file(virtd_initrc_exec_t)
++
+ ########################################
+ #
+ # virtd local policy
+@@ -49,9 +51,8 @@
+ #
+ # virtd local policy
+ #
+-
+ allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace };
+-allow virtd_t self:process { sigkill signal execmem };
++allow virtd_t self:process { getsched sigkill signal execmem };
+ allow virtd_t self:fifo_file rw_file_perms;
+ allow virtd_t self:unix_stream_socket create_stream_socket_perms;
+ allow virtd_t self:tcp_socket create_stream_socket_perms;
+@@ -64,7 +65,7 @@
+ manage_lnk_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
+ filetrans_pattern(virtd_t, virt_etc_t, virt_etc_rw_t, dir)
+
+-manage_files_pattern(virtd_t, virt_image_t, virt_image_t)
++manage_files_pattern(virtd_t, virt_image_type, virt_image_type)
+
+ manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
+ manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
+@@ -82,6 +83,8 @@
+ kernel_read_system_state(virtd_t)
+ kernel_read_network_state(virtd_t)
+ kernel_rw_net_sysctls(virtd_t)
++kernel_read_xen_state(virtd_t)
++kernel_write_xen_state(virtd_t)
+ kernel_load_module(virtd_t)
+
+ corecmd_exec_bin(virtd_t)
+@@ -93,7 +96,7 @@
+ corenet_tcp_sendrecv_all_nodes(virtd_t)
+ corenet_tcp_sendrecv_all_ports(virtd_t)
+ corenet_tcp_bind_all_nodes(virtd_t)
+-#corenet_tcp_bind_virt_port(virtd_t)
++corenet_tcp_bind_virt_port(virtd_t)
+ corenet_tcp_bind_vnc_port(virtd_t)
+ corenet_tcp_connect_vnc_port(virtd_t)
+ corenet_tcp_connect_soundd_port(virtd_t)
+@@ -107,8 +110,10 @@
+
+ files_read_usr_files(virtd_t)
+ files_read_etc_files(virtd_t)
++files_read_usr_files(virtd_t)
+ files_read_etc_runtime_files(virtd_t)
+ files_search_all(virtd_t)
++files_list_kernel_modules(virtd_t)
+
+ fs_list_auto_mountpoints(virtd_t)
+
+@@ -159,26 +164,27 @@
+ ')
+ ')
+
+-#optional_policy(`
+-# dnsmasq_domtrans(virtd_t)
+-# dnsmasq_signal(virtd_t)
+-# dnsmasq_sigkill(virtd_t)
+-#')
++optional_policy(`
++ dnsmasq_domtrans(virtd_t)
++ dnsmasq_signal(virtd_t)
++ dnsmasq_kill(virtd_t)
++')
+
+ optional_policy(`
+ iptables_domtrans(virtd_t)
+ ')
+
+-#optional_policy(`
+-# polkit_domtrans_auth(virtd_t)
+-# polkit_domtrans_resolve(virtd_t)
+-#')
++optional_policy(`
++ polkit_domtrans_auth(virtd_t)
++ polkit_domtrans_resolve(virtd_t)
++')
+
+ optional_policy(`
+ qemu_domtrans(virtd_t)
+ qemu_read_state(virtd_t)
+ qemu_signal(virtd_t)
+ qemu_kill(virtd_t)
++ qemu_setsched(virtd_t)
+ ')
+
+ optional_policy(`
+@@ -186,9 +192,10 @@
+ ')
+
+ optional_policy(`
+- kernel_read_xen_state(virtd_t)
+- kernel_write_xen_state(virtd_t)
+-
+ xen_stream_connect(virtd_t)
+ xen_stream_connect_xenstore(virtd_t)
+ ')
++
++optional_policy(`
++ unconfined_domain(virtd_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.6.1/policy/modules/services/w3c.te
+--- nsaserefpolicy/policy/modules/services/w3c.te 2008-08-25 09:12:31.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/services/w3c.te 2008-11-25 09:45:43.000000000 -0500
+@@ -8,11 +8,18 @@
+
+ apache_content_template(w3c_validator)
+
++type httpd_w3c_validator_tmp_t;
++files_tmp_file(httpd_w3c_validator_tmp_t)
++
+ ########################################
+ #
+ # Local policy
+ #
+
++manage_dirs_pattern(httpd_w3c_validator_script_t, httpd_w3c_validator_tmp_t, httpd_w3c_validator_tmp_t)
++manage_files_pattern(httpd_w3c_validator_script_t, httpd_w3c_validator_tmp_t, httpd_w3c_validator_tmp_t)
++files_tmp_filetrans(httpd_w3c_validator_script_t, httpd_w3c_validator_tmp_t, { file dir })
++
+ corenet_tcp_connect_ftp_port(httpd_w3c_validator_script_t)
+ corenet_tcp_sendrecv_ftp_port(httpd_w3c_validator_script_t)
+ corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.1/policy/modules/services/xserver.fc
+--- nsaserefpolicy/policy/modules/services/xserver.fc 2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/xserver.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -3,11 +3,13 @@
+ #
+ HOME_DIR/\.fonts\.conf -- gen_context(system_u:object_r:user_fonts_config_t,s0)
+ HOME_DIR/\.fonts(/.*)? gen_context(system_u:object_r:user_fonts_t,s0)
++HOME_DIR/\.fontconfig(/.*)? gen_context(system_u:object_r:user_fonts_config_t,s0)
+ HOME_DIR/\.fonts/auto(/.*)? gen_context(system_u:object_r:user_fonts_cache_t,s0)
+ HOME_DIR/\.fonts\.cache-.* -- gen_context(system_u:object_r:user_fonts_cache_t,s0)
+ HOME_DIR/\.ICEauthority.* -- gen_context(system_u:object_r:iceauth_home_t,s0)
+ HOME_DIR/\.xauth.* -- gen_context(system_u:object_r:xauth_home_t,s0)
+ HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:xauth_home_t,s0)
++HOME_DIR/\.xsession-errors.* -- gen_context(system_u:object_r:xdm_home_t,s0)
+
+ #
+ # /dev
+@@ -32,11 +34,6 @@
+ /etc/X11/wdm/Xstartup.* -- gen_context(system_u:object_r:xsession_exec_t,s0)
+ /etc/X11/Xsession[^/]* -- gen_context(system_u:object_r:xsession_exec_t,s0)
+
+-ifdef(`distro_redhat',`
+-/etc/gdm/PostSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0)
+-/etc/gdm/PreSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0)
+-')
+-
+ #
+ # /opt
+ #
+@@ -61,6 +58,7 @@
+ /usr/(s)?bin/[xgkw]dm -- gen_context(system_u:object_r:xdm_exec_t,s0)
+ /usr/bin/gpe-dm -- gen_context(system_u:object_r:xdm_exec_t,s0)
+ /usr/bin/iceauth -- gen_context(system_u:object_r:iceauth_exec_t,s0)
++/usr/bin/slim -- gen_context(system_u:object_r:xdm_exec_t,s0)
+ /usr/bin/Xair -- gen_context(system_u:object_r:xserver_exec_t,s0)
+ /usr/bin/xauth -- gen_context(system_u:object_r:xauth_exec_t,s0)
+ /usr/bin/Xorg -- gen_context(system_u:object_r:xserver_exec_t,s0)
+@@ -89,16 +87,26 @@
+
+ /var/[xgk]dm(/.*)? gen_context(system_u:object_r:xserver_log_t,s0)
+
+-/var/lib/[xkw]dm(/.*)? gen_context(system_u:object_r:xdm_var_lib_t,s0)
++/var/lib/[gxkw]dm(/.*)? gen_context(system_u:object_r:xdm_var_lib_t,s0)
+ /var/lib/xkb(/.*)? gen_context(system_u:object_r:xkb_var_lib_t,s0)
++/var/lib/xorg(/.*)? gen_context(system_u:object_r:xserver_var_lib_t,s0)
+
+-/var/log/[kw]dm\.log -- gen_context(system_u:object_r:xserver_log_t,s0)
++/var/log/[kw]dm\.log.* -- gen_context(system_u:object_r:xserver_log_t,s0)
+ /var/log/gdm(/.*)? gen_context(system_u:object_r:xserver_log_t,s0)
+ /var/log/XFree86.* -- gen_context(system_u:object_r:xserver_log_t,s0)
+ /var/log/Xorg.* -- gen_context(system_u:object_r:xserver_log_t,s0)
++/var/log/nvidia-installer\.log.* -- gen_context(system_u:object_r:xserver_log_t,s0)
+
++/var/spool/gdm(/.*)? gen_context(system_u:object_r:xdm_spool_t,s0)
++
++/var/run/gdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
++/var/run/gdm_socket -s gen_context(system_u:object_r:xdm_var_run_t,s0)
+ /var/run/[gx]dm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0)
+ /var/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
++/var/run/xauth(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0)
++
++/var/run/video.rom -- gen_context(system_u:object_r:xserver_var_run_t,s0)
++/var/run/xorg(/.*)? gen_context(system_u:object_r:xserver_var_run_t,s0)
+
+ ifdef(`distro_suse',`
+ /var/lib/pam_devperm/:0 -- gen_context(system_u:object_r:xdm_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.1/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if 2008-11-11 16:13:47.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/xserver.if 2008-11-25 11:11:15.000000000 -0500
+@@ -397,11 +397,12 @@
+ gen_require(`
+ type xdm_t, xdm_tmp_t;
+ type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
++ class x_screen all_x_screen_perms;
+ ')
+
+- allow $2 self:shm create_shm_perms;
+- allow $2 self:unix_dgram_socket create_socket_perms;
+- allow $2 self:unix_stream_socket { connectto create_stream_socket_perms };
++ allow $2 $2:shm create_shm_perms;
++ allow $2 $2:unix_dgram_socket create_socket_perms;
++ allow $2 $2:unix_stream_socket { connectto create_stream_socket_perms };
+
+ # Read .Xauthority file
+ allow $2 xauth_home_t:file read_file_perms;
+@@ -437,6 +438,10 @@
+ allow $2 xserver_t:shm rw_shm_perms;
+ allow $2 xserver_tmpfs_t:file rw_file_perms;
+ ')
++
++ allow $2 xserver_t:x_screen { saver_hide saver_show };
++
++ xserver_use_xdm($2)
+ ')
+
+ ########################################
+@@ -639,7 +644,7 @@
+ type xdm_t;
+ ')
+
+- allow $1 xdm_t:fifo_file { getattr read write };
++ allow $1 xdm_t:fifo_file rw_fifo_file_perms;
+ ')
+
+ ########################################
+@@ -738,6 +743,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)
++ allow $1 xdm_tmp_t:sock_file unlink;
+ ')
+
+ ########################################
+@@ -756,7 +762,26 @@
+ ')
+
+ files_search_pids($1)
+- allow $1 xdm_var_run_t:file read_file_perms;
++ read_files_pattern($1, xdm_var_run_t, xdm_var_run_t)
++')
++
++########################################
++## <summary>
++## Manage XDM pid files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_manage_xdm_pid',`
++ gen_require(`
++ type xdm_var_run_t;
++ ')
++
++ files_search_pids($1)
++ manage_files_pattern($1, xdm_var_run_t, xdm_var_run_t)
+ ')
+
+ ########################################
+@@ -779,6 +804,31 @@
+
+ ########################################
+ ## <summary>
++## Execute xsever in the xserver domain, and
++## allow the specified role the xserver domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the xserver domain.
++## </summary>
++## </param>
++#
++interface(`xserver_run',`
++ gen_require(`
++ type xserver_t;
++ ')
++
++ xserver_domtrans($1)
++ role $2 types xserver_t;
++')
++
++########################################
++## <summary>
+ ## Make an X session script an entrypoint for the specified domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -1018,10 +1068,11 @@
+ #
+ interface(`xserver_domtrans',`
+ gen_require(`
+- type xserver_t, xserver_exec_t;
++ type xserver_t, xserver_exec_t, xdm_t;
+ ')
+
+ allow $1 xserver_t:process siginh;
++ allow xdm_t $1:process sigchld;
+ domtrans_pattern($1, xserver_exec_t, xserver_t)
+ ')
+
+@@ -1159,6 +1210,252 @@
+
+ ########################################
+ ## <summary>
++## Read xserver files created in /var/run
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_read_pid',`
++ gen_require(`
++ type xserver_var_run_t;
++ ')
++
++ files_search_pids($1)
++ read_files_pattern($1, xserver_var_run_t, xserver_var_run_t)
++')
++
++########################################
++## <summary>
++## Execute xserver files created in /var/run
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_exec_pid',`
++ gen_require(`
++ type xserver_var_run_t;
++ ')
++
++ files_search_pids($1)
++ exec_files_pattern($1, xserver_var_run_t, xserver_var_run_t)
++')
++
++########################################
++## <summary>
++## Write xserver files created in /var/run
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_write_pid',`
++ gen_require(`
++ type xserver_var_run_t;
++ ')
++
++ files_search_pids($1)
++ write_files_pattern($1, xserver_var_run_t, xserver_var_run_t)
++')
++
++########################################
++## <summary>
++## Read user homedir fonts.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`xserver_manage_home_fonts',`
++ gen_require(`
++ type user_fonts_t;
++ type user_fonts_config_t;
++ ')
++
++ manage_dirs_pattern($1, user_fonts_t, user_fonts_t)
++ manage_files_pattern($1, user_fonts_t, user_fonts_t)
++ manage_lnk_files_pattern($1, user_fonts_t, user_fonts_t)
++
++ manage_files_pattern($1, user_fonts_config_t, user_fonts_config_t)
++')
++
++########################################
++## <summary>
++## Read user homedir fonts.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`xserver_read_home_fonts',`
++ gen_require(`
++ type user_fonts_t;
++ ')
++
++ read_files_pattern($1, user_fonts_t, user_fonts_t)
++ read_lnk_files_pattern($1, user_fonts_t, user_fonts_t)
++')
++
++########################################
++## <summary>
++## write to .xsession-errors file
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_rw_xdm_home_files',`
++ gen_require(`
++ type xdm_home_t;
++ ')
++
++ allow $1 xdm_home_t:file rw_file_perms;
++')
++
++########################################
++## <summary>
++## Dontaudit write to .xsession-errors file
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit
++## </summary>
++## </param>
++#
++interface(`xserver_dontaudit_rw_xdm_home_files',`
++ gen_require(`
++ type xdm_home_t;
++ ')
++
++ dontaudit $1 xdm_home_t:file rw_file_perms;
++')
++
++
++#######################################
++## <summary>
++## Interface to provide X object permissions on a given X server to
++## an X client domain. Provides the minimal set required by a basic
++## X client application.
++## </summary>
++## <param name="domain">
++## <summary>
++## Client domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_use_xdm',`
++ gen_require(`
++ type xdm_t, xdm_tmp_t;
++ class x_client all_x_client_perms;
++ class x_drawable all_x_drawable_perms;
++ class x_property all_x_property_perms;
++ ')
++
++ allow $1 xdm_t:fd use;
++ allow $1 xdm_t:fifo_file rw_fifo_file_perms;
++ dontaudit $1 xdm_t:tcp_socket { read write };
++
++ # Allow connections to X server.
++ xserver_stream_connect_xdm($1)
++ xserver_read_xdm_tmp_files($1)
++ xserver_xdm_stream_connect($1)
++
++ allow $1 xdm_t:x_client { getattr destroy };
++ allow $1 xdm_t:x_drawable { read receive get_property getattr send list_child add_child };
++')
++
++########################################
++## <summary>
++## Get the attributes of xauth executable
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_getattr_xauth',`
++ gen_require(`
++ type xauth_exec_t;
++ ')
++
++ allow $1 xauth_exec_t:file getattr;
++')
++
++########################################
++## <summary>
++## Read a user Iceauthority domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++template(`xserver_read_user_iceauth',`
++ gen_require(`
++ type iceauth_home_t;
++ ')
++
++ # Read .Iceauthority file
++ allow $1 iceauth_home_t:file read_file_perms;
++')
++
++########################################
++## <summary>
++## Connect to apmd over an unix stream socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`xserver_xdm_stream_connect',`
++ gen_require(`
++ type xdm_t, xdm_var_run_t;
++ ')
++
++ files_search_pids($1)
++ allow $1 xdm_var_run_t:sock_file write;
++ allow $1 xdm_t:unix_stream_socket connectto;
++')
++
++########################################
++## <summary>
++## Ptrace XDM
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain to not audit
++## </summary>
++## </param>
++#
++interface(`xserver_ptrace_xdm',`
++ gen_require(`
++ type xdm_t;
++ ')
++
++ allow $1 xdm_t:process ptrace;
++')
++
++########################################
++## <summary>
+ ## Interface to provide X object permissions on a given X server to
+ ## an X client domain. Gives the domain complete control over the
+ ## display.
+@@ -1171,8 +1468,9 @@
+ #
+ interface(`xserver_unconfined',`
+ gen_require(`
+- attribute xserver_unconfined_type;
++ attribute xserver_unconfined_type, x_domain;
+ ')
+
+- typeattribute $1 xserver_unconfined_type;
++ typeattribute $1 xserver_unconfined_type, x_domain;
+ ')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.1/policy/modules/services/xserver.te
+--- nsaserefpolicy/policy/modules/services/xserver.te 2008-11-18 18:57:20.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/xserver.te 2008-11-27 06:23:46.000000000 -0500
+@@ -34,6 +34,13 @@
+
+ ## <desc>
+ ## <p>
++## Allows XServer to execute writable memory
++## </p>
++## </desc>
++gen_tunable(allow_xserver_execmem, false)
++
++## <desc>
++## <p>
+ ## Allow xdm logins as sysadm
+ ## </p>
+ ## </desc>
+@@ -166,7 +173,10 @@
+ files_lock_file(xdm_lock_t)
+
+ type xdm_rw_etc_t;
+-files_type(xdm_rw_etc_t)
++files_config_file(xdm_rw_etc_t)
++
++type xdm_spool_t;
++files_type(xdm_spool_t)
+
+ type xdm_var_lib_t;
+ files_type(xdm_var_lib_t)
+@@ -174,6 +184,12 @@
+ type xdm_var_run_t;
+ files_pid_file(xdm_var_run_t)
+
++type xserver_var_lib_t;
++files_type(xserver_var_lib_t)
++
++type xserver_var_run_t;
++files_pid_file(xserver_var_run_t)
++
+ type xdm_tmp_t;
+ files_tmp_file(xdm_tmp_t)
+ typealias xdm_tmp_t alias ice_tmp_t;
+@@ -181,6 +197,9 @@
+ type xdm_tmpfs_t;
+ files_tmpfs_file(xdm_tmpfs_t)
+
++type xdm_home_t;
++userdom_user_home_content(xdm_home_t)
++
+ # type for /var/lib/xkb
+ type xkb_var_lib_t;
+ files_type(xkb_var_lib_t)
+@@ -256,6 +275,9 @@
+ allow xauth_t xauth_home_t:file manage_file_perms;
+ userdom_user_home_dir_filetrans(xauth_t, xauth_home_t, file)
+
++manage_dirs_pattern(xauth_t, xdm_var_run_t, xdm_var_run_t)
++manage_files_pattern(xauth_t, xdm_var_run_t, xdm_var_run_t)
++
+ manage_dirs_pattern(xauth_t, xauth_tmp_t, xauth_tmp_t)
+ manage_files_pattern(xauth_t, xauth_tmp_t, xauth_tmp_t)
+ files_tmp_filetrans(xauth_t, xauth_tmp_t, { file dir })
+@@ -300,13 +322,14 @@
+ # XDM Local policy
+ #
+
+-allow xdm_t self:capability { setgid setuid sys_resource kill sys_tty_config mknod chown dac_override dac_read_search fowner fsetid ipc_owner sys_nice sys_rawio net_bind_service };
+-allow xdm_t self:process { setexec setpgid getsched setsched setrlimit signal_perms setkeycreate };
++allow xdm_t self:capability { setgid setuid sys_resource kill sys_tty_config mknod chown dac_override dac_read_search fowner fsetid ipc_owner sys_nice sys_rawio net_bind_service sys_ptrace };
++allow xdm_t self:process { setexec setpgid getsched setsched setrlimit signal_perms setkeycreate ptrace };
++allow xdm_t self:process { getattr getcap setcap };
+ allow xdm_t self:fifo_file rw_fifo_file_perms;
+ allow xdm_t self:shm create_shm_perms;
+ allow xdm_t self:sem create_sem_perms;
+ allow xdm_t self:unix_stream_socket { connectto create_stream_socket_perms };
+-allow xdm_t self:unix_dgram_socket create_socket_perms;
++allow xdm_t self:unix_dgram_socket { create_socket_perms sendto };
+ allow xdm_t self:tcp_socket create_stream_socket_perms;
+ allow xdm_t self:udp_socket create_socket_perms;
+ allow xdm_t self:socket create_socket_perms;
+@@ -314,6 +337,11 @@
+ allow xdm_t self:key { search link write };
+
+ allow xdm_t xconsole_device_t:fifo_file { getattr setattr };
++manage_dirs_pattern(xdm_t, xkb_var_lib_t, xkb_var_lib_t)
++manage_files_pattern(xdm_t, xkb_var_lib_t, xkb_var_lib_t)
++
++manage_files_pattern(xdm_t, xdm_home_t, xdm_home_t)
++userdom_user_tmp_filetrans(xdm_t, xdm_home_t, file)
+
+ # Allow gdm to run gdm-binary
+ can_exec(xdm_t, xdm_exec_t)
+@@ -329,6 +357,8 @@
+ manage_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
+ manage_sock_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
+ files_tmp_filetrans(xdm_t, xdm_tmp_t, { file dir sock_file })
++relabelfrom_dirs_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
++relabelfrom_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
+
+ manage_dirs_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
+ manage_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
+@@ -336,15 +366,30 @@
+ manage_fifo_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
+ manage_sock_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
+ fs_tmpfs_filetrans(xdm_t, xdm_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
++fs_getattr_all_fs(xdm_t)
++fs_search_inotifyfs(xdm_t)
++fs_read_noxattr_fs_files(xdm_t)
++
++manage_files_pattern(xdm_t, user_fonts_t, user_fonts_t)
++
++files_search_spool(xdm_t)
++manage_dirs_pattern(xdm_t, xdm_spool_t, xdm_spool_t)
++manage_files_pattern(xdm_t, xdm_spool_t, xdm_spool_t)
++files_spool_filetrans(xdm_t, xdm_spool_t, { file dir })
+
+ manage_dirs_pattern(xdm_t, xdm_var_lib_t, xdm_var_lib_t)
+ manage_files_pattern(xdm_t, xdm_var_lib_t, xdm_var_lib_t)
+-files_var_lib_filetrans(xdm_t, xdm_var_lib_t, file)
++manage_lnk_files_pattern(xdm_t, xdm_var_lib_t, xdm_var_lib_t)
++manage_sock_files_pattern(xdm_t, xdm_var_lib_t, xdm_var_lib_t)
++files_var_lib_filetrans(xdm_t, xdm_var_lib_t, { file dir })
++# Read machine-id
++files_read_var_lib_files(xdm_t)
+
+ manage_dirs_pattern(xdm_t, xdm_var_run_t, xdm_var_run_t)
+ manage_files_pattern(xdm_t, xdm_var_run_t, xdm_var_run_t)
+ manage_fifo_files_pattern(xdm_t, xdm_var_run_t, xdm_var_run_t)
+-files_pid_filetrans(xdm_t, xdm_var_run_t, { dir file fifo_file })
++manage_sock_files_pattern(xdm_t, xdm_var_run_t, xdm_var_run_t)
++files_pid_filetrans(xdm_t, xdm_var_run_t, { dir file fifo_file sock_file })
+
+ allow xdm_t xserver_t:process signal;
+ allow xdm_t xserver_t:unix_stream_socket connectto;
+@@ -358,6 +403,7 @@
+ allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
+
+ allow xdm_t xserver_t:shm rw_shm_perms;
++read_files_pattern(xdm_t, xserver_t, xserver_t)
+
+ # connect to xdm xserver over stream socket
+ stream_connect_pattern(xdm_t,xserver_tmp_t,xserver_tmp_t,xserver_t)
+@@ -389,11 +435,13 @@
+ corenet_udp_sendrecv_all_ports(xdm_t)
+ corenet_tcp_bind_all_nodes(xdm_t)
+ corenet_udp_bind_all_nodes(xdm_t)
++corenet_udp_bind_xdmcp_port(xdm_t)
+ corenet_tcp_connect_all_ports(xdm_t)
+ corenet_sendrecv_all_client_packets(xdm_t)
+ # xdm tries to bind to biff_port_t
+ corenet_dontaudit_tcp_bind_all_ports(xdm_t)
+
++dev_rwx_zero(xdm_t)
+ dev_read_rand(xdm_t)
+ dev_read_sysfs(xdm_t)
+ dev_getattr_framebuffer_dev(xdm_t)
+@@ -401,6 +449,7 @@
+ dev_getattr_mouse_dev(xdm_t)
+ dev_setattr_mouse_dev(xdm_t)
+ dev_rw_apm_bios(xdm_t)
++dev_rw_input_dev(xdm_t)
+ dev_setattr_apm_bios_dev(xdm_t)
+ dev_rw_dri(xdm_t)
+ dev_rw_agp(xdm_t)
+@@ -413,14 +462,17 @@
+ dev_setattr_video_dev(xdm_t)
+ dev_getattr_scanner_dev(xdm_t)
+ dev_setattr_scanner_dev(xdm_t)
+-dev_getattr_sound_dev(xdm_t)
+-dev_setattr_sound_dev(xdm_t)
++dev_read_sound(xdm_t)
++dev_write_sound(xdm_t)
+ dev_getattr_power_mgmt_dev(xdm_t)
+ dev_setattr_power_mgmt_dev(xdm_t)
++dev_getattr_null_dev(xdm_t)
++dev_setattr_null_dev(xdm_t)
+
+ domain_use_interactive_fds(xdm_t)
+ # Do not audit denied probes of /proc.
+ domain_dontaudit_read_all_domains_state(xdm_t)
++domain_dontaudit_ptrace_all_domains(xdm_t)
+
+ files_read_etc_files(xdm_t)
+ files_read_var_files(xdm_t)
+@@ -431,9 +483,13 @@
+ files_read_usr_files(xdm_t)
+ # Poweroff wants to create the /poweroff file when run from xdm
+ files_create_boot_flag(xdm_t)
++files_dontaudit_getattr_boot_dirs(xdm_t)
++files_dontaudit_write_usr_files(xdm_t)
+
+ fs_getattr_all_fs(xdm_t)
+ fs_search_auto_mountpoints(xdm_t)
++fs_rw_anon_inodefs_files(xdm_t)
++fs_mount_tmpfs(xdm_t)
+
+ storage_dontaudit_read_fixed_disk(xdm_t)
+ storage_dontaudit_write_fixed_disk(xdm_t)
+@@ -442,6 +498,7 @@
+ storage_dontaudit_raw_write_removable_device(xdm_t)
+ storage_dontaudit_setattr_removable_dev(xdm_t)
+ storage_dontaudit_rw_scsi_generic(xdm_t)
++storage_dontaudit_rw_fuse(xdm_t)
+
+ term_setattr_console(xdm_t)
+ term_use_unallocated_ttys(xdm_t)
+@@ -450,6 +507,7 @@
+ auth_domtrans_pam_console(xdm_t)
+ auth_manage_pam_pid(xdm_t)
+ auth_manage_pam_console_data(xdm_t)
++auth_signal_pam(xdm_t)
+ auth_rw_faillog(xdm_t)
+ auth_write_login_records(xdm_t)
+
+@@ -460,10 +518,10 @@
+
+ logging_read_generic_logs(xdm_t)
+
++miscfiles_dontaudit_write_fonts(xdm_t)
+ miscfiles_read_localization(xdm_t)
+ miscfiles_read_fonts(xdm_t)
+-
+-sysnet_read_config(xdm_t)
++miscfiles_manage_localization(xdm_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(xdm_t)
+ userdom_create_all_users_keys(xdm_t)
+@@ -504,10 +562,12 @@
+
+ optional_policy(`
+ alsa_domtrans(xdm_t)
++ alsa_read_rw_config(xdm_t)
+ ')
+
+ optional_policy(`
+ consolekit_dbus_chat(xdm_t)
++ consolekit_read_log(xdm_t)
+ ')
+
+ optional_policy(`
+@@ -515,6 +575,22 @@
+ ')
+
+ optional_policy(`
++ # Use dbus to start other processes as xdm_t
++ dbus_role_template(xdm, system_r, xdm_t)
++ corecmd_bin_entry_type(xdm_t)
++
++ dbus_system_bus_client(xdm_t)
++
++ optional_policy(`
++ hal_dbus_chat(xdm_t)
++ ')
++
++ optional_policy(`
++ networkmanager_dbus_chat(xdm_t)
++ ')
++')
++
++optional_policy(`
+ # Talk to the console mouse server.
+ gpm_stream_connect(xdm_t)
+ gpm_setattr_gpmctl(xdm_t)
+@@ -542,6 +618,18 @@
+ ')
+
+ optional_policy(`
++ polkit_domtrans_auth(xdm_t)
++ polkit_read_lib(xdm_t)
++')
++
++# On crash gdm execs gdb to dump stack
++optional_policy(`
++ rpm_exec(xdm_t)
++ rpm_read_db(xdm_t)
++ rpm_dontaudit_manage_db(xdm_t)
++')
++
++optional_policy(`
+ seutil_sigchld_newrole(xdm_t)
+ ')
+
+@@ -550,8 +638,8 @@
+ ')
+
+ optional_policy(`
+- unconfined_domain(xdm_t)
+ unconfined_domtrans(xdm_t)
++ unconfined_signal(xdm_t)
+
+ ifndef(`distro_redhat',`
+ allow xdm_t self:process { execheap execmem };
+@@ -571,6 +659,10 @@
+ ')
+
+ optional_policy(`
++ wm_exec(xdm_t)
++')
++
++optional_policy(`
+ xfs_stream_connect(xdm_t)
+ ')
+
+@@ -635,6 +727,15 @@
+ manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
+ files_search_var_lib(xserver_t)
+
++manage_dirs_pattern(xserver_t, xserver_var_lib_t, xserver_var_lib_t)
++manage_files_pattern(xserver_t, xserver_var_lib_t, xserver_var_lib_t)
++files_var_lib_filetrans(xserver_t, xserver_var_lib_t, dir)
++
++manage_dirs_pattern(xserver_t, xserver_var_run_t, xserver_var_run_t)
++manage_files_pattern(xserver_t, xserver_var_run_t, xserver_var_run_t)
++manage_sock_files_pattern(xserver_t, xdm_var_run_t, xdm_var_run_t)
++files_pid_filetrans(xserver_t, xserver_var_run_t, { dir file })
++
+ # Create files in /var/log with the xserver_log_t type.
+ manage_files_pattern(xserver_t, xserver_log_t, xserver_log_t)
+ logging_log_filetrans(xserver_t, xserver_log_t,file)
+@@ -682,6 +783,7 @@
+ dev_rw_input_dev(xserver_t)
+ dev_rwx_zero(xserver_t)
+
++domain_mmap_low_type(xserver_t)
+ domain_mmap_low(xserver_t)
+
+ files_read_etc_files(xserver_t)
+@@ -806,7 +908,7 @@
+ allow xserver_t xdm_var_lib_t:file { getattr read };
+ dontaudit xserver_t xdm_var_lib_t:dir search;
+
+-allow xserver_t xdm_var_run_t:file read_file_perms;
++read_files_pattern(xserver_t, xdm_var_run_t, xdm_var_run_t)
+
+ # Label pid and temporary files with derived types.
+ manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
+@@ -830,6 +932,10 @@
+
+ xserver_use_user_fonts(xserver_t)
+
++optional_policy(`
++ userhelper_search_config(xserver_t)
++')
++
+ tunable_policy(`use_nfs_home_dirs',`
+ fs_manage_nfs_dirs(xserver_t)
+ fs_manage_nfs_files(xserver_t)
+@@ -844,11 +950,14 @@
+
+ optional_policy(`
+ dbus_system_bus_client(xserver_t)
++
++ optional_policy(`
+ hal_dbus_chat(xserver_t)
+ ')
++')
+
+ optional_policy(`
+- resmgr_stream_connect(xdm_t)
++ mono_rw_shm(xserver_t)
+ ')
+
+ optional_policy(`
+@@ -856,6 +965,11 @@
+ rhgb_rw_tmpfs_files(xserver_t)
+ ')
+
++optional_policy(`
++ rpm_dontaudit_rw_shm(xserver_t)
++ rpm_rw_tmpfs_files(xserver_t)
++')
++
+ ########################################
+ #
+ # Rules common to all X window domains
+@@ -972,6 +1086,21 @@
+ allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
+ allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
+
++optional_policy(`
++ unconfined_rw_shm(xserver_t)
++ unconfined_execmem_rw_shm(xserver_t)
++
++ # xserver signals unconfined user on startx
++ unconfined_signal(xserver_t)
++ unconfined_getpgid(xserver_t)
++ unconfined_domain(xserver_t)
++')
++
++
++tunable_policy(`allow_xserver_execmem',`
++ allow xserver_t self:process { execheap execmem execstack };
++')
++
+ ifdef(`TODO',`
+ tunable_policy(`allow_polyinstantiation',`
+ # xdm needs access for linking .X11-unix to poly /tmp
+@@ -986,3 +1115,12 @@
+ #
+ allow xdm_t user_home_type:file unlink;
+ ') dnl end TODO
++
++# Hack to handle the problem of using the nvidia blobs
++tunable_policy(`allow_execmem',`
++ allow xdm_t self:process execmem;
++')
++
++tunable_policy(`allow_execstack',`
++ allow xdm_t self:process { execstack execmem };
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.fc serefpolicy-3.6.1/policy/modules/services/zosremote.fc
+--- nsaserefpolicy/policy/modules/services/zosremote.fc 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/zosremote.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,2 @@
++
++/sbin/audispd-zos-remote -- gen_context(system_u:object_r:zos_remote_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.if serefpolicy-3.6.1/policy/modules/services/zosremote.if
+--- nsaserefpolicy/policy/modules/services/zosremote.if 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/zosremote.if 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,46 @@
++## <summary>policy for z/OS Remote-services Audit dispatcher plugin</summary>
++
++########################################
++## <summary>
++## Execute a domain transition to run audispd-zos-remote.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`zos_remote_domtrans',`
++ gen_require(`
++ type zos_remote_t;
++ type zos_remote_exec_t;
++ ')
++
++ domtrans_pattern($1, zos_remote_exec_t, zos_remote_t)
++')
++
++########################################
++## <summary>
++## Allow specified type and role to transition and
++## run in the zos_remote_t domain. Allow specified type
++## to use zos_remote_t terminal.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the zos_remote domain.
++## </summary>
++## </param>
++#
++interface(`zos_remote_run',`
++ gen_require(`
++ type zos_remote_t;
++ ')
++
++ zos_remote_domtrans($1)
++ role $2 types zos_remote_t;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.te serefpolicy-3.6.1/policy/modules/services/zosremote.te
+--- nsaserefpolicy/policy/modules/services/zosremote.te 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/zosremote.te 2008-11-25 09:45:43.000000000 -0500
+@@ -0,0 +1,33 @@
++policy_module(zosremote,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type zos_remote_t;
++type zos_remote_exec_t;
++logging_dispatcher_domain(zos_remote_t, zos_remote_exec_t)
++
++init_system_domain(zos_remote_t, zos_remote_exec_t)
++
++role system_r types zos_remote_t;
++
++
++########################################
++#
++# zos_remote local policy
++#
++
++allow zos_remote_t self:fifo_file rw_file_perms;
++allow zos_remote_t self:unix_stream_socket create_stream_socket_perms;
++
++allow zos_remote_t self:process signal;
++
++files_read_etc_files(zos_remote_t)
++
++auth_use_nsswitch(zos_remote_t);
++
++miscfiles_read_localization(zos_remote_t)
++
++logging_send_syslog_msg(zos_remote_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.6.1/policy/modules/system/application.te
+--- nsaserefpolicy/policy/modules/system/application.te 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/application.te 2008-11-25 09:45:43.000000000 -0500
+@@ -7,6 +7,12 @@
+ # Executables to be run by user
+ attribute application_exec_type;
+
++userdom_append_user_home_content_files(application_domain_type)
++userdom_write_user_tmp_files(application_domain_type)
++logging_rw_all_logs(application_domain_type)
++
++files_dontaudit_search_all_dirs(application_domain_type)
++
+ optional_policy(`
+ ssh_sigchld(application_domain_type)
+ ssh_rw_stream_sockets(application_domain_type)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.6.1/policy/modules/system/authlogin.fc
+--- nsaserefpolicy/policy/modules/system/authlogin.fc 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/authlogin.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -7,12 +7,10 @@
+ /etc/passwd\.lock -- gen_context(system_u:object_r:shadow_t,s0)
+ /etc/shadow.* -- gen_context(system_u:object_r:shadow_t,s0)
+
+-/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+-/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:pam_exec_t,s0)
+-
+ /sbin/pam_console_apply -- gen_context(system_u:object_r:pam_console_exec_t,s0)
+ /sbin/pam_timestamp_check -- gen_context(system_u:object_r:pam_exec_t,s0)
+ /sbin/unix_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0)
++/usr/sbin/validate -- gen_context(system_u:object_r:chkpwd_exec_t,s0)
+ /sbin/unix_update -- gen_context(system_u:object_r:updpwd_exec_t,s0)
+ /sbin/unix_verify -- gen_context(system_u:object_r:chkpwd_exec_t,s0)
+ ifdef(`distro_suse', `
+@@ -40,6 +38,10 @@
+ /var/log/wtmp.* -- gen_context(system_u:object_r:wtmp_t,s0)
+
+ /var/run/console(/.*)? gen_context(system_u:object_r:pam_var_console_t,s0)
+-
+ /var/run/pam_mount(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
++/var/run/sepermit(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
++
+ /var/run/sudo(/.*)? gen_context(system_u:object_r:pam_var_run_t,s0)
++/var/run/pam_ssh(/.*)? gen_context(system_u:object_r:var_auth_t,s0)
++
++/var/cache/coolkey(/.*)? gen_context(system_u:object_r:auth_cache_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.1/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/authlogin.if 2008-11-25 09:45:43.000000000 -0500
+@@ -43,6 +43,7 @@
+ interface(`auth_login_pgm_domain',`
+ gen_require(`
+ type var_auth_t;
++ type auth_cache_t;
+ ')
+
+ domain_type($1)
+@@ -51,12 +52,27 @@
+ domain_obj_id_change_exemption($1)
+ role system_r types $1;
+
++ # Needed for pam_selinux_permit to cleanup properly
++ domain_read_all_domains_state($1)
++ domain_kill_all_domains($1)
++
++ # pam_keyring
++ allow $1 self:capability ipc_lock;
++ allow $1 self:process setkeycreate;
++ allow $1 self:key manage_key_perms;
++ userdom_manage_all_users_keys($1)
++
+ files_list_var_lib($1)
+ manage_files_pattern($1, var_auth_t, var_auth_t)
+
+ # needed for afs - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=253321
+ kernel_rw_afs_state($1)
+
++ manage_dirs_pattern($1, auth_cache_t, auth_cache_t)
++ manage_files_pattern($1, auth_cache_t, auth_cache_t)
++ manage_sock_files_pattern($1, auth_cache_t, auth_cache_t)
++ files_var_filetrans($1, auth_cache_t, dir)
++
+ # for SSP/ProPolice
+ dev_read_urand($1)
+ # for fingerprint readers
+@@ -90,6 +106,7 @@
+ auth_rw_faillog($1)
+ auth_exec_pam($1)
+ auth_use_nsswitch($1)
++ auth_manage_pam_pid($1)
+
+ init_rw_utmp($1)
+
+@@ -100,8 +117,39 @@
+ seutil_read_config($1)
+ seutil_read_default_contexts($1)
+
++ userdom_set_rlimitnh($1)
++ userdom_read_user_home_content_symlinks($1)
++ userdom_delete_user_tmp_files($1)
++
++ optional_policy(`
++ dbus_system_bus_client($1)
++ optional_policy(`
++ oddjob_dbus_chat($1)
++ oddjob_domtrans_mkhomedir($1)
++ ')
++ ')
++
++ optional_policy(`
++ corecmd_exec_bin($1)
++ storage_getattr_fixed_disk_dev($1)
++ mount_domtrans($1)
++ ')
++
++ optional_policy(`
++ nis_authenticate($1)
++ ')
++
++ optional_policy(`
++ ssh_agent_exec($1)
++ userdom_read_user_home_content_files($1)
++ ')
++
+ tunable_policy(`allow_polyinstantiation',`
+ files_polyinstantiate_all($1)
++ userdom_manage_user_home_content_dirs($1)
++ userdom_manage_user_home_content_files($1)
++ userdom_relabelto_user_home_dirs($1)
++ userdom_relabelto_user_home_files($1)
+ ')
+ ')
+
+@@ -207,19 +255,15 @@
+ dev_read_rand($1)
+ dev_read_urand($1)
+
++ auth_use_nsswitch($1)
++
+ logging_send_audit_msgs($1)
+
+ miscfiles_read_certs($1)
+
+- sysnet_dns_name_resolve($1)
+- sysnet_use_ldap($1)
+-
+ optional_policy(`
+- kerberos_use($1)
+- ')
+-
+- optional_policy(`
+- nis_use_ypbind($1)
++ kerberos_read_keytab($1)
++ kerberos_connect_524($1)
+ ')
+
+ optional_policy(`
+@@ -230,6 +274,29 @@
+ optional_policy(`
+ samba_stream_connect_winbind($1)
+ ')
++ auth_domtrans_upd_passwd($1)
++')
++
++########################################
++## <summary>
++## Run unix_chkpwd to check a password.
++## Stripped down version to be called within boolean
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`auth_domtrans_chkpwd',`
++ gen_require(`
++ type chkpwd_t, chkpwd_exec_t, shadow_t;
++ ')
++
++ corecmd_search_bin($1)
++ domtrans_pattern($1, chkpwd_exec_t, chkpwd_t)
++ dontaudit $1 shadow_t:file { getattr read };
++ auth_domtrans_upd_passwd($1)
+ ')
+
+ ########################################
+@@ -254,6 +321,7 @@
+
+ auth_domtrans_chk_passwd($1)
+ role $2 types chkpwd_t;
++ auth_run_upd_passwd($1, $2)
+ ')
+
+ ########################################
+@@ -1031,6 +1099,32 @@
+
+ ########################################
+ ## <summary>
++## rw all files on the filesystem, except
++## the shadow passwords and listed exceptions.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the domain perfoming this action.
++## </summary>
++## </param>
++## <param name="exception_types" optional="true">
++## <summary>
++## The types to be excluded. Each type or attribute
++## must be negated by the caller.
++## </summary>
++## </param>
++#
++
++interface(`auth_rw_all_files_except_shadow',`
++ gen_require(`
++ type shadow_t;
++ ')
++
++ files_rw_all_files($1,$2 -shadow_t)
++')
++
++########################################
++## <summary>
+ ## Manage all files on the filesystem, except
+ ## the shadow passwords and listed exceptions.
+ ## </summary>
+@@ -1297,6 +1391,10 @@
+ ')
+
+ optional_policy(`
++ kerberos_use($1)
++ ')
++
++ optional_policy(`
+ nis_use_ypbind($1)
+ ')
+
+@@ -1307,6 +1405,7 @@
+ optional_policy(`
+ samba_stream_connect_winbind($1)
+ samba_read_var_files($1)
++ samba_dontaudit_write_var_files($1)
+ ')
+ ')
+
+@@ -1341,3 +1440,61 @@
+ typeattribute $1 can_write_shadow_passwords;
+ typeattribute $1 can_relabelto_shadow_passwords;
+ ')
++
++########################################
++## <summary>
++## Read/Write authentication cache
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`auth_rw_cache',`
++ gen_require(`
++ type auth_cache_t;
++ ')
++
++ rw_files_pattern($1, auth_cache_t, auth_cache_t)
++')
++########################################
++## <summary>
++## Manage authentication cache
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`auth_manage_cache',`
++ gen_require(`
++ type auth_cache_t;
++ ')
++
++ manage_files_pattern($1, auth_cache_t, auth_cache_t)
++')
++
++#######################################
++## <summary>
++## Automatic transition from cache_t to cache.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`auth_filetrans_cache',`
++ gen_require(`
++ type auth_cache_t;
++ ')
++
++ manage_files_pattern($1, auth_cache_t, auth_cache_t)
++ manage_dirs_pattern($1, auth_cache_t, auth_cache_t)
++ files_var_filetrans($1,auth_cache_t,{ file dir } )
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.6.1/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/authlogin.te 2008-11-25 09:45:43.000000000 -0500
+@@ -63,6 +63,9 @@
+ type utempter_exec_t;
+ application_domain(utempter_t,utempter_exec_t)
+
++type auth_cache_t;
++logging_log_file(auth_cache_t)
++
+ #
+ # var_auth_t is the type of /var/lib/auth, usually
+ # used for auth data in pam_able
+@@ -121,6 +124,11 @@
+ ')
+
+ optional_policy(`
++ # apache leaks file descriptors
++ apache_dontaudit_rw_tcp_sockets(chkpwd_t)
++')
++
++optional_policy(`
+ kerberos_use(chkpwd_t)
+ ')
+
+@@ -168,6 +176,11 @@
+
+ logging_send_syslog_msg(pam_t)
+
++userdom_write_user_tmp_files(pam_t)
++userdom_delete_user_tmp_files(pam_t)
++userdom_dontaudit_read_user_home_content_files(pam_t)
++userdom_dontaudit_write_user_home_content_files(pam_t)
++
+ ifdef(`distro_ubuntu',`
+ optional_policy(`
+ unconfined_domain(pam_t)
+@@ -201,6 +214,8 @@
+ dev_read_sysfs(pam_console_t)
+ dev_getattr_apm_bios_dev(pam_console_t)
+ dev_setattr_apm_bios_dev(pam_console_t)
++dev_getattr_cpu_dev(pam_console_t)
++dev_setattr_cpu_dev(pam_console_t)
+ dev_getattr_dri_dev(pam_console_t)
+ dev_setattr_dri_dev(pam_console_t)
+ dev_getattr_input_dev(pam_console_t)
+@@ -225,6 +240,10 @@
+ dev_setattr_video_dev(pam_console_t)
+ dev_getattr_xserver_misc_dev(pam_console_t)
+ dev_setattr_xserver_misc_dev(pam_console_t)
++
++dev_getattr_all_chr_files(pam_console_t)
++dev_setattr_all_chr_files(pam_console_t)
++
+ dev_read_urand(pam_console_t)
+
+ mls_file_read_all_levels(pam_console_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.6.1/policy/modules/system/fstools.fc
+--- nsaserefpolicy/policy/modules/system/fstools.fc 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/fstools.fc 2008-11-25 09:45:43.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)
+ /sbin/blockdev -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/cfdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+@@ -21,7 +20,6 @@
+ /sbin/mkfs.* -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/mkraid -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/mkreiserfs -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+-/sbin/mkswap -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/parted -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/partprobe -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.6.1/policy/modules/system/fstools.te
+--- nsaserefpolicy/policy/modules/system/fstools.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/fstools.te 2008-11-25 09:45:43.000000000 -0500
+@@ -97,6 +97,10 @@
+ fs_getattr_tmpfs_dirs(fsadm_t)
+ fs_read_tmpfs_symlinks(fsadm_t)
+
++fs_manage_nfs_files(fsadm_t)
++
++fs_manage_cifs_files(fsadm_t)
++
+ mls_file_read_all_levels(fsadm_t)
+ mls_file_write_all_levels(fsadm_t)
+
+@@ -182,4 +186,9 @@
+
+ optional_policy(`
+ xen_append_log(fsadm_t)
++ xen_rw_image_files(fsadm_t)
++')
++
++optional_policy(`
++ unconfined_domain(fsadm_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.6.1/policy/modules/system/hostname.te
+--- nsaserefpolicy/policy/modules/system/hostname.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/hostname.te 2008-11-25 09:45:43.000000000 -0500
+@@ -8,7 +8,9 @@
+
+ type hostname_t;
+ type hostname_exec_t;
+-init_system_domain(hostname_t,hostname_exec_t)
++
++#dont transition from initrc
++application_domain(hostname_t, hostname_exec_t)
+ role system_r types hostname_t;
+
+ ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.6.1/policy/modules/system/init.fc
+--- nsaserefpolicy/policy/modules/system/init.fc 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/init.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -4,8 +4,7 @@
+ /etc/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0)
+
+ /etc/rc\.d/rc -- gen_context(system_u:object_r:initrc_exec_t,s0)
+-/etc/rc\.d/rc\.sysinit -- gen_context(system_u:object_r:initrc_exec_t,s0)
+-/etc/rc\.d/rc\.local -- gen_context(system_u:object_r:initrc_exec_t,s0)
++/etc/rc\.d/rc\.[^/]+ -- gen_context(system_u:object_r:initrc_exec_t,s0)
+
+ /etc/rc\.d/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0)
+
+@@ -45,6 +44,8 @@
+ /usr/sbin/apachectl -- gen_context(system_u:object_r:initrc_exec_t,s0)
+ /usr/sbin/open_init_pty -- gen_context(system_u:object_r:initrc_exec_t,s0)
+
++/usr/share/system-config-services/system-config-services-mechanism\.py -- gen_context(system_u:object_r:initrc_exec_t,s0)
++
+ #
+ # /var
+ #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.1/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/init.if 2008-11-25 09:45:43.000000000 -0500
+@@ -280,6 +280,27 @@
+ kernel_dontaudit_use_fds($1)
+ ')
+ ')
++
++ userdom_dontaudit_search_user_home_dirs($1)
++
++ tunable_policy(`allow_daemons_use_tty',`
++ term_use_all_user_ttys($1)
++ term_use_all_user_ptys($1)
++ ',`
++ term_dontaudit_use_all_user_ttys($1)
++ term_dontaudit_use_all_user_ptys($1)
++ ')
++
++ # these apps are often redirect output to random log files
++ logging_rw_all_logs($1)
++
++ optional_policy(`
++ cron_rw_pipes($1)
++ ')
++
++ optional_policy(`
++ xserver_rw_xdm_home_files($1)
++ ')
+ ')
+
+ ########################################
+@@ -619,18 +640,19 @@
+ #
+ interface(`init_spec_domtrans_script',`
+ gen_require(`
+- type initrc_t, initrc_exec_t;
++ type initrc_t;
++ attribute init_script_file_type;
+ ')
+
+ files_list_etc($1)
+- spec_domtrans_pattern($1,initrc_exec_t,initrc_t)
++ spec_domtrans_pattern($1, init_script_file_type, initrc_t)
+
+ ifdef(`enable_mcs',`
+- range_transition $1 initrc_exec_t:process s0;
++ range_transition $1 init_script_file_type:process s0;
+ ')
+
+ ifdef(`enable_mls',`
+- range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++ range_transition $1 init_script_file_type:process s0 - mls_systemhigh;
+ ')
+ ')
+
+@@ -646,19 +668,39 @@
+ #
+ interface(`init_domtrans_script',`
+ gen_require(`
+- type initrc_t, initrc_exec_t;
++ type initrc_t;
++ attribute init_script_file_type;
+ ')
+
+ files_list_etc($1)
+- domtrans_pattern($1,initrc_exec_t,initrc_t)
++ domtrans_pattern($1, init_script_file_type, initrc_t)
+
+ ifdef(`enable_mcs',`
+- range_transition $1 initrc_exec_t:process s0;
++ range_transition $1 init_script_file_type:process s0;
+ ')
+
+ ifdef(`enable_mls',`
+- range_transition $1 initrc_exec_t:process s0 - mls_systemhigh;
++ range_transition $1 init_script_file_type:process s0 - mls_systemhigh;
++ ')
++')
++
++########################################
++## <summary>
++## Execute a file in a bin directory
++## in the initrc_t domain
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`init_bin_domtrans_spec',`
++ gen_require(`
++ type initrc_t;
+ ')
++
++ corecmd_bin_domtrans($1, initrc_t)
+ ')
+
+ ########################################
+@@ -1291,6 +1333,25 @@
+
+ ########################################
+ ## <summary>
++## Read init script temporary data.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`init_read_script_tmp_files',`
++ gen_require(`
++ type initrc_tmp_t;
++ ')
++
++ files_search_tmp($1)
++ read_files_pattern($1, initrc_tmp_t, initrc_tmp_t)
++')
++
++########################################
++## <summary>
+ ## Create files in a init script
+ ## temporary data directory.
+ ## </summary>
+@@ -1470,26 +1531,25 @@
+
+ ########################################
+ ## <summary>
+-## Create files in /var/run with the
+-## utmp file type.
++## Allow the specified domain to connect to daemon with a tcp socket
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+-## Domain access allowed.
++## Domain allowed access.
+ ## </summary>
+ ## </param>
+ #
+-interface(`init_pid_filetrans_utmp',`
++interface(`init_tcp_recvfrom_all_daemons',`
+ gen_require(`
+- type initrc_var_run_t;
++ attribute daemon;
+ ')
+
+- files_pid_filetrans($1, initrc_var_run_t, file)
++ corenet_tcp_recvfrom_labeled($1, daemon)
+ ')
+
+ ########################################
+ ## <summary>
+-## Allow the specified domain to connect to daemon with a tcp socket
++## Allow the specified domain to connect to daemon with a udp socket
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+@@ -1497,17 +1557,45 @@
+ ## </summary>
+ ## </param>
+ #
+-interface(`init_tcp_recvfrom_all_daemons',`
++interface(`init_udp_recvfrom_all_daemons',`
+ gen_require(`
+ attribute daemon;
+ ')
++ corenet_udp_recvfrom_labeled($1, daemon)
++')
+
+- corenet_tcp_recvfrom_labeled($1, daemon)
++########################################
++## <summary>
++## Transition to system_r when execute an init script
++## </summary>
++## <desc>
++## <p>
++## Execute a init script in a specified role
++## </p>
++## <p>
++## No interprocess communication (signals, pipes,
++## etc.) is provided by this interface since
++## the domains are not owned by this module.
++## </p>
++## </desc>
++## <param name="source_role">
++## <summary>
++## Role to transition from.
++## </summary>
++## </param>
++#
++interface(`init_script_role_transition',`
++ gen_require(`
++ attribute init_script_file_type;
++ ')
++
++ role_transition $1 init_script_file_type system_r;
+ ')
+
+ ########################################
+ ## <summary>
+-## Allow the specified domain to connect to daemon with a udp socket
++## Send and receive unix_stream_messages with
++## init
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+@@ -1515,9 +1603,11 @@
+ ## </summary>
+ ## </param>
+ #
+-interface(`init_udp_recvfrom_all_daemons',`
++interface(`init_chat',`
+ gen_require(`
+- attribute daemon;
++ type init_t;
+ ')
+- corenet_udp_recvfrom_labeled($1, daemon)
++
++ allow $1 init_t:unix_dgram_socket sendto;
++ allow init_t $1:unix_dgram_socket sendto;
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.1/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/init.te 2008-11-25 09:45:43.000000000 -0500
+@@ -17,6 +17,20 @@
+ ## </desc>
+ gen_tunable(init_upstart,false)
+
++## <desc>
++## <p>
++## Allow all daemons the ability to read/write terminals
++## </p>
++## </desc>
++gen_tunable(allow_daemons_use_tty, false)
++
++## <desc>
++## <p>
++## Allow all daemons to write corefiles to /
++## </p>
++## </desc>
++gen_tunable(allow_daemons_dump_core, false)
++
+ # used for direct running of init scripts
+ # by admin domains
+ attribute direct_run_init;
+@@ -88,7 +102,7 @@
+ #
+
+ # Use capabilities. old rule:
+-allow init_t self:capability ~sys_module;
++allow init_t self:capability ~{ audit_control audit_write sys_module };
+ # is ~sys_module really needed? observed:
+ # sys_boot
+ # sys_tty_config
+@@ -101,7 +115,7 @@
+ # Re-exec itself
+ can_exec(init_t,init_exec_t)
+
+-allow init_t initrc_t:unix_stream_socket connectto;
++allow init_t initrc_t:unix_stream_socket { connectto rw_stream_socket_perms };
+
+ # For /var/run/shutdown.pid.
+ allow init_t init_var_run_t:file manage_file_perms;
+@@ -117,6 +131,8 @@
+ kernel_read_system_state(init_t)
+ kernel_share_state(init_t)
+
++fs_list_inotifyfs(init_t)
++
+ corecmd_exec_chroot(init_t)
+ corecmd_exec_bin(init_t)
+
+@@ -167,6 +183,8 @@
+
+ miscfiles_read_localization(init_t)
+
++allow init_t self:process setsched;
++
+ ifdef(`distro_gentoo',`
+ allow init_t self:process { getcap setcap };
+ ')
+@@ -189,6 +207,14 @@
+ ')
+
+ optional_policy(`
++ # /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)
++')
++
++optional_policy(`
+ nscd_socket_use(init_t)
+ ')
+
+@@ -202,9 +228,10 @@
+ #
+
+ allow initrc_t self:process { getpgid setsched setpgid setrlimit getsched };
+-allow initrc_t self:capability ~{ sys_admin sys_module };
++allow initrc_t self:capability ~{ audit_control audit_write sys_admin sys_module };
+ dontaudit initrc_t self:capability sys_module; # sysctl is triggering this
+ allow initrc_t self:passwd rootok;
++allow initrc_t self:key { search };
+
+ # Allow IPC with self
+ allow initrc_t self:unix_dgram_socket create_socket_perms;
+@@ -217,7 +244,8 @@
+ term_create_pty(initrc_t,initrc_devpts_t)
+
+ # Going to single user mode
+-init_exec(initrc_t)
++init_telinit(initrc_t)
++init_chat(initrc_t)
+
+ can_exec(initrc_t, init_script_file_type)
+
+@@ -230,6 +258,7 @@
+
+ allow initrc_t initrc_var_run_t:file manage_file_perms;
+ files_pid_filetrans(initrc_t,initrc_var_run_t,file)
++files_manage_generic_pids_symlinks(initrc_t)
+
+ can_exec(initrc_t,initrc_tmp_t)
+ allow initrc_t initrc_tmp_t:file manage_file_perms;
+@@ -251,6 +280,7 @@
+ kernel_dontaudit_getattr_message_if(initrc_t)
+
+ files_read_kernel_symbol_table(initrc_t)
++files_exec_etc_files(initrc_t)
+
+ corenet_all_recvfrom_unlabeled(initrc_t)
+ corenet_all_recvfrom_netlabel(initrc_t)
+@@ -274,7 +304,7 @@
+ dev_read_sound_mixer(initrc_t)
+ dev_write_sound_mixer(initrc_t)
+ dev_setattr_all_chr_files(initrc_t)
+-dev_read_lvm_control(initrc_t)
++dev_rw_lvm_control(initrc_t)
+ dev_delete_lvm_control_dev(initrc_t)
+ dev_manage_generic_symlinks(initrc_t)
+ dev_manage_generic_files(initrc_t)
+@@ -328,7 +358,7 @@
+ domain_sigchld_all_domains(initrc_t)
+ domain_read_all_domains_state(initrc_t)
+ domain_getattr_all_domains(initrc_t)
+-domain_dontaudit_ptrace_all_domains(initrc_t)
++domain_ptrace_all_domains(initrc_t)
+ domain_getsession_all_domains(initrc_t)
+ domain_use_interactive_fds(initrc_t)
+ # for lsof which is used by alsa shutdown:
+@@ -367,6 +397,7 @@
+ libs_rw_ld_so_cache(initrc_t)
+ libs_exec_lib_files(initrc_t)
+
++logging_send_audit_msgs(initrc_t)
+ logging_send_syslog_msg(initrc_t)
+ logging_manage_generic_logs(initrc_t)
+ logging_read_all_logs(initrc_t)
+@@ -498,6 +529,7 @@
+ optional_policy(`
+ #for /etc/rc.d/init.d/nfs to create /etc/exports
+ rpc_write_exports(initrc_t)
++ rpc_manage_nfs_state_data(initrc_t)
+ ')
+
+ optional_policy(`
+@@ -516,6 +548,31 @@
+ ')
+ ')
+
++domain_dontaudit_use_interactive_fds(daemon)
++
++userdom_dontaudit_search_admin_dir(daemon)
++
++tunable_policy(`allow_daemons_use_tty',`
++ term_use_unallocated_ttys(daemon)
++ term_use_generic_ptys(daemon)
++ term_use_all_user_ttys(daemon)
++ term_use_all_user_ptys(daemon)
++',`
++ term_dontaudit_use_unallocated_ttys(daemon)
++ term_dontaudit_use_generic_ptys(daemon)
++ term_dontaudit_use_all_user_ttys(daemon)
++ term_dontaudit_use_all_user_ptys(daemon)
++ ')
++
++# system-config-services causes avc messages that should be dontaudited
++tunable_policy(`allow_daemons_dump_core',`
++ files_dump_core(daemon)
++')
++
++optional_policy(`
++ unconfined_dontaudit_rw_pipes(daemon)
++')
++
+ optional_policy(`
+ amavis_search_lib(initrc_t)
+ amavis_setattr_pid_files(initrc_t)
+@@ -570,6 +627,10 @@
+ dbus_read_config(initrc_t)
+
+ optional_policy(`
++ consolekit_dbus_chat(initrc_t)
++ ')
++
++ optional_policy(`
+ networkmanager_dbus_chat(initrc_t)
+ ')
+ ')
+@@ -655,12 +716,6 @@
+ mta_read_config(initrc_t)
+ mta_dontaudit_read_spool_symlinks(initrc_t)
+ ')
+-# cjp: require doesnt work in the else of optionals :\
+-# this also would result in a type transition
+-# conflict if sendmail is enabled
+-#optional_policy(`',`
+-# mta_send_mail(initrc_t)
+-#')
+
+ optional_policy(`
+ ifdef(`distro_redhat',`
+@@ -721,6 +776,9 @@
+
+ # why is this needed:
+ rpm_manage_db(initrc_t)
++ # Allow SELinux aware applications to request rpm_script_t execution
++ rpm_transition_script(initrc_t)
++
+ ')
+
+ optional_policy(`
+@@ -733,10 +791,12 @@
+ squid_manage_logs(initrc_t)
+ ')
+
++ifdef(`enabled_mls',`
+ optional_policy(`
+ # allow init scripts to su
+ su_restricted_domain_template(initrc,initrc_t,system_r)
+ ')
++')
+
+ optional_policy(`
+ ssh_dontaudit_read_server_keys(initrc_t)
+@@ -754,6 +814,11 @@
+ uml_setattr_util_sockets(initrc_t)
+ ')
+
++# Cron jobs used to start and stop services
++optional_policy(`
++ cron_rw_pipes(daemon)
++')
++
+ optional_policy(`
+ unconfined_domain(initrc_t)
+
+@@ -768,6 +833,10 @@
+ ')
+
+ optional_policy(`
++ rpm_dontaudit_rw_pipes(daemon)
++')
++
++optional_policy(`
+ vmware_read_system_config(initrc_t)
+ vmware_append_system_config(initrc_t)
+ ')
+@@ -790,3 +859,11 @@
+ optional_policy(`
+ zebra_read_config(initrc_t)
+ ')
++
++userdom_append_user_home_content_files(daemon)
++userdom_write_user_tmp_files(daemon)
++logging_append_all_logs(daemon)
++
++optional_policy(`
++ xserver_rw_xdm_home_files(daemon)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.fc serefpolicy-3.6.1/policy/modules/system/ipsec.fc
+--- nsaserefpolicy/policy/modules/system/ipsec.fc 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/ipsec.fc 2008-11-25 09:55:43.000000000 -0500
+@@ -16,6 +16,8 @@
+ /usr/lib(64)?/ipsec/pluto -- gen_context(system_u:object_r:ipsec_exec_t,s0)
+ /usr/lib(64)?/ipsec/spi -- gen_context(system_u:object_r:ipsec_exec_t,s0)
+
++/usr/libexec/ipsec/_plutoload -- gen_context(system_u:object_r:ipsec_mgmt_exec_t,s0)
++/usr/libexec/ipsec/_plutorun -- gen_context(system_u:object_r:ipsec_mgmt_exec_t,s0)
+ /usr/libexec/ipsec/eroute -- gen_context(system_u:object_r:ipsec_exec_t,s0)
+ /usr/libexec/ipsec/klipsdebug -- gen_context(system_u:object_r:ipsec_exec_t,s0)
+ /usr/libexec/ipsec/pluto -- gen_context(system_u:object_r:ipsec_exec_t,s0)
+@@ -26,6 +28,7 @@
+ /usr/local/lib(64)?/ipsec/pluto -- gen_context(system_u:object_r:ipsec_exec_t,s0)
+ /usr/local/lib(64)?/ipsec/spi -- gen_context(system_u:object_r:ipsec_exec_t,s0)
+
++/usr/sbin/ipsec -- gen_context(system_u:object_r:ipsec_mgmt_exec_t,s0)
+ /usr/sbin/racoon -- gen_context(system_u:object_r:racoon_exec_t,s0)
+ /usr/sbin/setkey -- gen_context(system_u:object_r:setkey_exec_t,s0)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.6.1/policy/modules/system/ipsec.te
+--- nsaserefpolicy/policy/modules/system/ipsec.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/ipsec.te 2008-11-25 09:45:43.000000000 -0500
+@@ -55,11 +55,12 @@
+
+ allow ipsec_t self:capability { net_admin dac_override dac_read_search };
+ dontaudit ipsec_t self:capability sys_tty_config;
+-allow ipsec_t self:process signal;
+-allow ipsec_t self:netlink_route_socket r_netlink_socket_perms;
++allow ipsec_t self:process { signal setsched };
+ allow ipsec_t self:tcp_socket create_stream_socket_perms;
+-allow ipsec_t self:key_socket { create write read setopt };
+-allow ipsec_t self:fifo_file read_file_perms;
++allow ipsec_t self:udp_socket create_socket_perms;
++allow ipsec_t self:key_socket create_socket_perms;
++allow ipsec_t self:fifo_file read_fifo_file_perms;
++allow ipsec_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_write };
+
+ allow ipsec_t ipsec_conf_file_t:dir list_dir_perms;
+ read_files_pattern(ipsec_t,ipsec_conf_file_t,ipsec_conf_file_t)
+@@ -104,6 +105,11 @@
+ corenet_tcp_bind_all_nodes(ipsec_t)
+ corenet_tcp_bind_reserved_port(ipsec_t)
+ corenet_tcp_bind_isakmp_port(ipsec_t)
++
++corenet_udp_bind_all_nodes(ipsec_t)
++corenet_udp_bind_isakmp_port(ipsec_t)
++corenet_udp_bind_ipsecnat_port(ipsec_t)
++
+ corenet_sendrecv_generic_server_packets(ipsec_t)
+ corenet_sendrecv_isakmp_server_packets(ipsec_t)
+
+@@ -127,20 +133,16 @@
+ init_use_fds(ipsec_t)
+ init_use_script_ptys(ipsec_t)
+
++auth_use_nsswitch(ipsec_t)
++
+ logging_send_syslog_msg(ipsec_t)
+
+ miscfiles_read_localization(ipsec_t)
+
+-sysnet_read_config(ipsec_t)
+-
+ userdom_dontaudit_use_unpriv_user_fds(ipsec_t)
+ userdom_dontaudit_search_user_home_dirs(ipsec_t)
+
+ optional_policy(`
+- nis_use_ypbind(ipsec_t)
+-')
+-
+-optional_policy(`
+ seutil_sigchld_newrole(ipsec_t)
+ ')
+
+@@ -156,9 +158,9 @@
+ allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
+ allow ipsec_mgmt_t self:process { signal setrlimit };
+ allow ipsec_mgmt_t self:unix_stream_socket create_stream_socket_perms;
+-allow ipsec_mgmt_t self:tcp_socket create_socket_perms;
++allow ipsec_mgmt_t self:tcp_socket create_stream_socket_perms;
+ allow ipsec_mgmt_t self:udp_socket create_socket_perms;
+-allow ipsec_mgmt_t self:key_socket { create setopt };
++allow ipsec_mgmt_t self:key_socket create_socket_perms;
+ allow ipsec_mgmt_t self:fifo_file rw_file_perms;
+
+ allow ipsec_mgmt_t ipsec_mgmt_lock_t:file manage_file_perms;
+@@ -167,6 +169,8 @@
+ allow ipsec_mgmt_t ipsec_mgmt_var_run_t:file manage_file_perms;
+ files_pid_filetrans(ipsec_mgmt_t,ipsec_mgmt_var_run_t,file)
+
++logging_send_syslog_msg(ipsec_mgmt_t)
++
+ manage_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
+ manage_lnk_files_pattern(ipsec_mgmt_t,ipsec_var_run_t,ipsec_var_run_t)
+
+@@ -222,6 +226,7 @@
+ # the ipsec wrapper wants to run /usr/bin/logger (should we put
+ # it in its own domain?)
+ corecmd_exec_bin(ipsec_mgmt_t)
++corecmd_exec_shell(ipsec_mgmt_t)
+
+ domain_use_interactive_fds(ipsec_mgmt_t)
+ # denials when ps tries to search /proc. Do not audit these denials.
+@@ -276,7 +281,7 @@
+ allow racoon_t self:unix_dgram_socket { connect create ioctl write };
+ allow racoon_t self:netlink_selinux_socket { bind create read };
+ allow racoon_t self:udp_socket create_socket_perms;
+-allow racoon_t self:key_socket { create read setopt write };
++allow racoon_t self:key_socket create_socket_perms;
+
+ # manage pid file
+ manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t)
+@@ -298,6 +303,7 @@
+ corenet_tcp_bind_all_nodes(racoon_t)
+ corenet_udp_bind_all_nodes(racoon_t)
+ corenet_udp_bind_isakmp_port(racoon_t)
++corenet_udp_sendrecv_all_if(racoon_t)
+ corenet_udp_bind_ipsecnat_port(racoon_t)
+
+ dev_read_urand(racoon_t)
+@@ -312,6 +318,8 @@
+
+ ipsec_setcontext_default_spd(racoon_t)
+
++auth_use_nsswitch(racoon_t)
++
+ locallogin_use_fds(racoon_t)
+
+ logging_send_syslog_msg(racoon_t)
+@@ -325,7 +333,7 @@
+ #
+
+ allow setkey_t self:capability net_admin;
+-allow setkey_t self:key_socket { create read setopt write };
++allow setkey_t self:key_socket create_socket_perms;
+ allow setkey_t self:netlink_route_socket create_netlink_socket_perms;
+
+ allow setkey_t ipsec_conf_file_t:dir list_dir_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.1/policy/modules/system/iptables.te
+--- nsaserefpolicy/policy/modules/system/iptables.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/iptables.te 2008-11-27 06:12:53.000000000 -0500
+@@ -22,12 +22,12 @@
+ # Iptables local policy
+ #
+
+-allow iptables_t self:capability { net_admin net_raw };
++allow iptables_t self:capability { dac_read_search dac_override net_admin net_raw };
+ dontaudit iptables_t self:capability sys_tty_config;
+ allow iptables_t self:process { sigchld sigkill sigstop signull signal };
+ allow iptables_t self:rawip_socket create_socket_perms;
+
+-allow iptables_t iptables_var_run_t:dir rw_dir_perms;
++manage_files_pattern(iptables_t, iptables_var_run_t, iptables_var_run_t)
+ files_pid_filetrans(iptables_t,iptables_var_run_t,file)
+
+ can_exec(iptables_t,iptables_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.1/policy/modules/system/iscsi.te
+--- nsaserefpolicy/policy/modules/system/iscsi.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/iscsi.te 2008-11-25 09:45:43.000000000 -0500
+@@ -28,7 +28,7 @@
+ # iscsid local policy
+ #
+
+-allow iscsid_t self:capability { dac_override ipc_lock net_admin sys_nice sys_resource };
++allow iscsid_t self:capability { dac_override ipc_lock net_admin net_raw sys_admin sys_nice sys_resource };
+ allow iscsid_t self:process { setrlimit setsched signal };
+ allow iscsid_t self:fifo_file rw_fifo_file_perms;
+ allow iscsid_t self:unix_stream_socket { create_stream_socket_perms connectto };
+@@ -39,7 +39,7 @@
+ allow iscsid_t self:netlink_route_socket rw_netlink_socket_perms;
+ allow iscsid_t self:tcp_socket create_stream_socket_perms;
+
+-allow iscsid_t iscsi_lock_t:file manage_file_perms;
++manage_files_pattern(iscsid_t, iscsi_lock_t, iscsi_lock_t)
+ files_lock_filetrans(iscsid_t,iscsi_lock_t,file)
+
+ allow iscsid_t iscsi_tmp_t:dir manage_dir_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.1/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc 2008-08-13 15:24:56.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/libraries.fc 2008-12-01 08:43:02.000000000 -0500
+@@ -60,12 +60,15 @@
+ #
+ # /opt
+ #
++/opt/.*\.so gen_context(system_u:object_r:lib_t,s0)
+ /opt/(.*/)?lib(/.*)? gen_context(system_u:object_r:lib_t,s0)
+ /opt/(.*/)?lib64(/.*)? gen_context(system_u:object_r:lib_t,s0)
+ /opt/(.*/)?java/.+\.jar -- gen_context(system_u:object_r:lib_t,s0)
+ /opt/(.*/)?jre.*/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/(.*/)?jre/.+\.jar -- gen_context(system_u:object_r:lib_t,s0)
+
++/opt/Acrobat[5-9]/Reader/intellinux/plugins/.*\.api -- gen_context(system_u:object_r:lib_t,s0)
++
+ ifdef(`distro_gentoo',`
+ # despite the extensions, they are actually libs
+ /opt/Acrobat[5-9]/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:lib_t,s0)
+@@ -84,7 +87,8 @@
+
+ ifdef(`distro_redhat',`
+ /opt/Adobe(/.*?)/nppdf\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/opt/Adobe/Reader8/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/Adobe/Reader.?/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/Adobe/Reader.?/Reader/intellinux/SPPlugins/.*\.ap[il] -- gen_context(system_u:object_r:lib_t,s0)
+ /opt/cisco-vpnclient/lib/libvpnapi\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/cxoffice/lib/wine/.+\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/f-secure/fspms/libexec/librapi\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -115,9 +119,17 @@
+
+ /usr/(.*/)?nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+
++/usr/lib/vlc/video_chroma/libi420_rgb_mmx_plugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/vlc/codec/librealvideo_plugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib/vlc/codec/libdmo_plugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib/vlc/codec/librealaudio_plugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+
++/usr/lib64/vlc/codec/librealvideo_plugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib64/vlc/codec/libdmo_plugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib64/vlc/codec/librealaudio_plugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/libavfilter\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
+ /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libsipphoneapi\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -127,12 +139,14 @@
+ /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libjs\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libx264\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/sse2/libx264\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/libnvidia.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/nvidia_drv.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /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)
+ /usr/lib(64)?/xorg/libGL\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/xorg/modules/glesx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xulrunner-[^/]*/libgtkembedmoz\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xulrunner-[^/]*/libxul\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+
+@@ -168,7 +182,8 @@
+ # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
+ # HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
+ /usr/lib(64)?/gstreamer-.*/[^/]*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-HOME_DIR/.*/\.gstreamer-.*/plugins/*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++HOME_DIR/\.gstreamer-.*/plugins/.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++HOME_DIR/.*/plugins/nppdf\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+
+ /usr/lib/firefox-[^/]*/plugins/nppdf.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib/libFLAC\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -187,6 +202,7 @@
+ /usr/lib(64)?/libdv\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/helix/plugins/[^/]*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/helix/codecs/[^/]*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libswscale\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libSDL-.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xorg/modules/dri/.+\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/X11R6/lib/modules/dri/.+\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -246,7 +262,7 @@
+
+ # Flash plugin, Macromedia
+ HOME_DIR/\.mozilla(/.*)?/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+-HOME_DIR/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++HOME_DIR/.*/plugins/nppdf\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/.*/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/local/(.*/)?libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ HOME_DIR/.*/plugins/nprhapengine\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -267,6 +283,8 @@
+ /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/vmware/(.*/)?VmPerl\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+
++/usr/lib(64)?/(virtualbox(-ose)?/)?(components/)?VBox.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
+ # Java, Sun Microsystems (JPackage SRPM)
+ /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/local/(.*/)?jre.*/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -291,6 +309,8 @@
+ /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib/acroread/.+\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib/acroread/(.*/)?ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/.*/program(/.*)?\.so gen_context(system_u:object_r:lib_t,s0)
++/usr/lib64/.*/program(/.*)?\.so gen_context(system_u:object_r:lib_t,s0)
+ ') dnl end distro_redhat
+
+ #
+@@ -310,3 +330,20 @@
+ /var/spool/postfix/lib(64)?(/.*)? gen_context(system_u:object_r:lib_t,s0)
+ /var/spool/postfix/usr(/.*)? gen_context(system_u:object_r:lib_t,s0)
+ /var/spool/postfix/lib(64)?/ld.*\.so.* -- gen_context(system_u:object_r:ld_so_t,s0)
++
++/usr/lib(64)?/libavdevice\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libmythavcodec-[^/]+\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib/jvm/java(.*/)bin(/.*)?/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib64/jvm/java(.*/)bin(/.*)?/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib/oracle/.*/lib/libnnz10\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/opt/novell/groupwise/client/lib/libgwapijni\.so\.1 -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/libmpeg2\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/libav.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/sse2/libav.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/sse2/.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/google-earth/.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.6.1/policy/modules/system/libraries.te
+--- nsaserefpolicy/policy/modules/system/libraries.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/libraries.te 2008-11-25 09:45:43.000000000 -0500
+@@ -52,11 +52,11 @@
+ # ldconfig local policy
+ #
+
+-allow ldconfig_t self:capability sys_chroot;
++allow ldconfig_t self:capability { dac_override sys_chroot };
+
+ manage_files_pattern(ldconfig_t, ldconfig_cache_t, ldconfig_cache_t)
+
+-allow ldconfig_t ld_so_cache_t:file manage_file_perms;
++manage_files_pattern(ldconfig_t, ld_so_cache_t, ld_so_cache_t)
+ files_etc_filetrans(ldconfig_t,ld_so_cache_t,file)
+
+ manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
+@@ -70,8 +70,11 @@
+
+ fs_getattr_xattr_fs(ldconfig_t)
+
++corecmd_search_bin(ldconfig_t)
++
+ domain_use_interactive_fds(ldconfig_t)
+
++files_search_home(ldconfig_t)
+ files_search_var_lib(ldconfig_t)
+ files_read_etc_files(ldconfig_t)
+ files_search_tmp(ldconfig_t)
+@@ -80,6 +83,7 @@
+ files_delete_etc_files(ldconfig_t)
+
+ init_use_script_ptys(ldconfig_t)
++init_read_script_tmp_files(ldconfig_t)
+
+ miscfiles_read_localization(ldconfig_t)
+
+@@ -94,6 +98,10 @@
+ ')
+ ')
+
++userdom_manage_user_home_content_files(ldconfig_t)
++userdom_manage_user_tmp_files(ldconfig_t)
++userdom_manage_user_tmp_symlinks(ldconfig_t)
++
+ ifdef(`hide_broken_symptoms',`
+ optional_policy(`
+ unconfined_dontaudit_rw_tcp_sockets(ldconfig_t)
+@@ -116,4 +124,10 @@
+ # and executes ldconfig on it. If you dont allow this kernel installs
+ # blow up.
+ rpm_manage_script_tmp_files(ldconfig_t)
++ # smart package manager needs the following for the same reason
++ rpm_rw_tmp_files(ldconfig_t)
++')
++
++optional_policy(`
++ unconfined_domain(ldconfig_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.6.1/policy/modules/system/locallogin.te
+--- nsaserefpolicy/policy/modules/system/locallogin.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/locallogin.te 2008-11-25 09:45:43.000000000 -0500
+@@ -67,6 +67,7 @@
+ dev_setattr_power_mgmt_dev(local_login_t)
+ dev_getattr_sound_dev(local_login_t)
+ dev_setattr_sound_dev(local_login_t)
++dev_rw_generic_usb_dev(local_login_t)
+ dev_dontaudit_getattr_apm_bios_dev(local_login_t)
+ dev_dontaudit_setattr_apm_bios_dev(local_login_t)
+ dev_dontaudit_read_framebuffer(local_login_t)
+@@ -100,7 +101,6 @@
+
+ auth_rw_login_records(local_login_t)
+ auth_rw_faillog(local_login_t)
+-auth_manage_pam_pid(local_login_t)
+ auth_manage_pam_console_data(local_login_t)
+ auth_domtrans_pam_console(local_login_t)
+
+@@ -160,6 +160,11 @@
+ fs_read_cifs_symlinks(local_login_t)
+ ')
+
++tunable_policy(`allow_console_login',`
++ term_relabel_console(local_login_t)
++ term_setattr_console(local_login_t)
++')
++
+ optional_policy(`
+ alsa_domtrans(local_login_t)
+ ')
+@@ -189,7 +194,7 @@
+ ')
+
+ optional_policy(`
+- unconfined_domain(local_login_t)
++ unconfined_shell_domtrans(local_login_t)
+ ')
+
+ optional_policy(`
+@@ -235,17 +240,25 @@
+ seutil_read_default_contexts(sulogin_t)
+
+ auth_read_shadow(sulogin_t)
++auth_use_nsswitch(sulogin_t)
+
+ userdom_use_unpriv_users_fds(sulogin_t)
+
+ userdom_search_user_home_dirs(sulogin_t)
+ userdom_use_user_ptys(sulogin_t)
+
++ifdef(`enable_mls',`
+ sysadm_shell_domtrans(sulogin_t)
++',`
++ optional_policy(`
++ unconfined_shell_domtrans(sulogin_t)
++ ')
++')
+
+ # suse and debian do not use pam with sulogin...
+ ifdef(`distro_suse', `define(`sulogin_no_pam')')
+ ifdef(`distro_debian', `define(`sulogin_no_pam')')
++ifdef(`distro_redhat',`define(`sulogin_no_pam')')
+
+ ifdef(`sulogin_no_pam', `
+ allow sulogin_t self:capability sys_tty_config;
+@@ -260,10 +273,4 @@
+ selinux_compute_user_contexts(sulogin_t)
+ ')
+
+-optional_policy(`
+- nis_use_ypbind(sulogin_t)
+-')
+
+-optional_policy(`
+- nscd_socket_use(sulogin_t)
+-')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.6.1/policy/modules/system/logging.fc
+--- nsaserefpolicy/policy/modules/system/logging.fc 2008-09-24 09:07:28.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/logging.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -53,15 +53,18 @@
+ /var/named/chroot/var/log -d gen_context(system_u:object_r:var_log_t,s0)
+ ')
+
+-/var/run/audit_events -s gen_context(system_u:object_r:auditd_var_run_t,s0)
+-/var/run/audispd_events -s gen_context(system_u:object_r:audisp_var_run_t,s0)
+-/var/run/auditd\.pid -- gen_context(system_u:object_r:auditd_var_run_t,s0)
+-/var/run/auditd_sock -s gen_context(system_u:object_r:auditd_var_run_t,s0)
++/var/run/audit_events -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
++/var/run/audispd_events -s gen_context(system_u:object_r:audisp_var_run_t,mls_systemhigh)
++/var/run/auditd\.pid -- gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
++/var/run/auditd_sock -s gen_context(system_u:object_r:auditd_var_run_t,mls_systemhigh)
+ /var/run/klogd\.pid -- gen_context(system_u:object_r:klogd_var_run_t,s0)
+ /var/run/log -s gen_context(system_u:object_r:devlog_t,s0)
+ /var/run/metalog\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,s0)
+ /var/run/syslogd\.pid -- gen_context(system_u:object_r:syslogd_var_run_t,s0)
+
+ /var/spool/postfix/pid -d gen_context(system_u:object_r:var_run_t,s0)
++/var/spool/plymouth/boot.log gen_context(system_u:object_r:var_log_t,s0)
++/var/spool/rsyslog(/.*)? gen_context(system_u:object_r:var_log_t,s0)
+
+ /var/tinydns/log/main(/.*)? gen_context(system_u:object_r:var_log_t,s0)
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.6.1/policy/modules/system/logging.if
+--- nsaserefpolicy/policy/modules/system/logging.if 2008-11-18 18:57:21.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/logging.if 2008-11-25 09:45:43.000000000 -0500
+@@ -707,6 +707,8 @@
+ files_search_var($1)
+ manage_files_pattern($1,logfile,logfile)
+ read_lnk_files_pattern($1,logfile,logfile)
++ allow $1 logfile:dir { relabelfrom relabelto };
++ allow $1 logfile:file { relabelfrom relabelto };
+ ')
+
+ ########################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.1/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/logging.te 2008-11-25 09:45:43.000000000 -0500
+@@ -126,7 +126,7 @@
+ allow auditd_t self:process { signal_perms setpgid setsched };
+ allow auditd_t self:file rw_file_perms;
+ allow auditd_t self:unix_dgram_socket create_socket_perms;
+-allow auditd_t self:fifo_file rw_file_perms;
++allow auditd_t self:fifo_file rw_fifo_file_perms;
+ allow auditd_t self:tcp_socket create_stream_socket_perms;
+
+ allow auditd_t auditd_etc_t:dir list_dir_perms;
+@@ -215,9 +215,9 @@
+ # audit dispatcher local policy
+ #
+
+-allow audisp_t self:capability sys_nice;
++allow audisp_t self:capability { dac_override sys_nice };
+ allow audisp_t self:process setsched;
+-allow audisp_t self:fifo_file rw_file_perms;
++allow audisp_t self:fifo_file rw_fifo_file_perms;
+ allow audisp_t self:unix_stream_socket create_stream_socket_perms;
+ allow audisp_t self:unix_dgram_socket create_socket_perms;
+
+@@ -231,9 +231,12 @@
+ domain_use_interactive_fds(audisp_t)
+
+ files_read_etc_files(audisp_t)
++files_read_etc_runtime_files(audisp_t)
+
+ mls_file_write_all_levels(audisp_t)
+
++auth_use_nsswitch(audisp_t)
++
+ logging_send_syslog_msg(audisp_t)
+
+ miscfiles_read_localization(audisp_t)
+@@ -337,7 +340,7 @@
+ allow syslogd_t self:unix_dgram_socket create_socket_perms;
+ allow syslogd_t self:unix_stream_socket create_stream_socket_perms;
+ allow syslogd_t self:unix_dgram_socket sendto;
+-allow syslogd_t self:fifo_file rw_file_perms;
++allow syslogd_t self:fifo_file rw_fifo_file_perms;
+ allow syslogd_t self:udp_socket create_socket_perms;
+ allow syslogd_t self:tcp_socket create_stream_socket_perms;
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.6.1/policy/modules/system/lvm.fc
+--- nsaserefpolicy/policy/modules/system/lvm.fc 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/lvm.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -55,6 +55,7 @@
+ /sbin/lvs -- gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/lvscan -- gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/multipathd -- gen_context(system_u:object_r:lvm_exec_t,s0)
++/sbin/multipath\.static -- gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/pvchange -- gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/pvcreate -- gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/pvdata -- gen_context(system_u:object_r:lvm_exec_t,s0)
+@@ -97,3 +98,4 @@
+ /var/lock/lvm(/.*)? gen_context(system_u:object_r:lvm_lock_t,s0)
+ /var/run/multipathd\.sock -s gen_context(system_u:object_r:lvm_var_run_t,s0)
+ /var/lib/multipath(/.*)? gen_context(system_u:object_r:lvm_var_lib_t,s0)
++/var/run/dmevent.* gen_context(system_u:object_r:lvm_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.1/policy/modules/system/lvm.te
+--- nsaserefpolicy/policy/modules/system/lvm.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/lvm.te 2008-11-25 09:45:43.000000000 -0500
+@@ -10,6 +10,9 @@
+ type clvmd_exec_t;
+ init_daemon_domain(clvmd_t,clvmd_exec_t)
+
++type clvmd_initrc_exec_t;
++init_script_file(clvmd_initrc_exec_t)
++
+ type clvmd_var_run_t;
+ files_pid_file(clvmd_var_run_t)
+
+@@ -22,7 +25,7 @@
+ role system_r types lvm_t;
+
+ type lvm_etc_t;
+-files_type(lvm_etc_t)
++files_config_file(lvm_etc_t)
+
+ type lvm_lock_t;
+ files_lock_file(lvm_lock_t)
+@@ -44,9 +47,9 @@
+ # Cluster LVM daemon local policy
+ #
+
+-allow clvmd_t self:capability { sys_admin mknod };
++allow clvmd_t self:capability { sys_nice chown ipc_lock sys_admin mknod };
+ dontaudit clvmd_t self:capability sys_tty_config;
+-allow clvmd_t self:process signal_perms;
++allow clvmd_t self:process { signal_perms setsched };
+ dontaudit clvmd_t self:process ptrace;
+ allow clvmd_t self:socket create_socket_perms;
+ allow clvmd_t self:fifo_file rw_fifo_file_perms;
+@@ -54,6 +57,8 @@
+ allow clvmd_t self:tcp_socket create_stream_socket_perms;
+ allow clvmd_t self:udp_socket create_socket_perms;
+
++init_dontaudit_getattr_initctl(clvmd_t)
++
+ manage_files_pattern(clvmd_t,clvmd_var_run_t,clvmd_var_run_t)
+ files_pid_filetrans(clvmd_t,clvmd_var_run_t,file)
+
+@@ -85,10 +90,15 @@
+ corenet_sendrecv_generic_server_packets(clvmd_t)
+
+ dev_read_sysfs(clvmd_t)
++dev_manage_generic_symlinks(clvmd_t)
++dev_relabel_generic_dev_dirs(clvmd_t)
++dev_manage_generic_blk_files(clvmd_t)
+ dev_manage_generic_chr_files(clvmd_t)
+ dev_rw_lvm_control(clvmd_t)
+ dev_dontaudit_getattr_all_blk_files(clvmd_t)
+ dev_dontaudit_getattr_all_chr_files(clvmd_t)
++dev_create_generic_dirs(clvmd_t)
++dev_delete_generic_dirs(clvmd_t)
+
+ files_read_etc_files(clvmd_t)
+ files_list_usr(clvmd_t)
+@@ -99,9 +109,12 @@
+ fs_dontaudit_read_removable_files(clvmd_t)
+
+ storage_dontaudit_getattr_removable_dev(clvmd_t)
++storage_dev_filetrans_fixed_disk(clvmd_t)
++storage_manage_fixed_disk(clvmd_t)
+
+ domain_use_interactive_fds(clvmd_t)
+
++storage_relabel_fixed_disk(clvmd_t)
+ storage_raw_read_fixed_disk(clvmd_t)
+
+ auth_use_nsswitch(clvmd_t)
+@@ -112,6 +125,9 @@
+
+ seutil_dontaudit_search_config(clvmd_t)
+ seutil_sigchld_newrole(clvmd_t)
++seutil_read_config(clvmd_t)
++seutil_read_file_contexts(clvmd_t)
++seutil_search_default_contexts(clvmd_t)
+
+ userdom_dontaudit_use_unpriv_user_fds(clvmd_t)
+ userdom_dontaudit_search_user_home_dirs(clvmd_t)
+@@ -124,6 +140,14 @@
+ ')
+
+ optional_policy(`
++ dbus_system_bus_client(lvm_t)
++
++ optional_policy(`
++ hal_dbus_chat(lvm_t)
++ ')
++')
++
++optional_policy(`
+ gpm_dontaudit_getattr_gpmctl(clvmd_t)
+ ')
+
+@@ -133,6 +157,14 @@
+ ')
+
+ optional_policy(`
++ unconfined_domain(clvmd_t)
++')
++
++optional_policy(`
++ unconfined_domain(lvm_t)
++')
++
++optional_policy(`
+ udev_read_db(clvmd_t)
+ ')
+
+@@ -143,17 +175,19 @@
+
+ # DAC overrides and mknod for modifying /dev entries (vgmknodes)
+ # rawio needed for dmraid
+-allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio };
++allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio net_admin };
++# lvm needs net_admin for multipath
+ dontaudit lvm_t self:capability sys_tty_config;
+ allow lvm_t self:process { sigchld sigkill sigstop signull signal };
+ # LVM will complain a lot if it cannot set its priority.
+ allow lvm_t self:process setsched;
+ allow lvm_t self:file rw_file_perms;
+-allow lvm_t self:fifo_file rw_file_perms;
++allow lvm_t self:fifo_file manage_fifo_file_perms;
+ allow lvm_t self:unix_dgram_socket create_socket_perms;
+ allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms;
+
+-allow lvm_t clvmd_t:unix_stream_socket connectto;
++allow lvm_t self:unix_stream_socket { connectto create_stream_socket_perms };
++allow lvm_t clvmd_t:unix_stream_socket { connectto rw_socket_perms };
+
+ manage_dirs_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t)
+ manage_files_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t)
+@@ -185,6 +219,7 @@
+ manage_files_pattern(lvm_t,lvm_metadata_t,lvm_metadata_t)
+ filetrans_pattern(lvm_t,lvm_etc_t,lvm_metadata_t,file)
+ files_etc_filetrans(lvm_t,lvm_metadata_t,file)
++files_search_mnt(lvm_t)
+
+ kernel_read_system_state(lvm_t)
+ kernel_read_kernel_sysctls(lvm_t)
+@@ -221,6 +256,7 @@
+ dev_dontaudit_getattr_generic_blk_files(lvm_t)
+ dev_dontaudit_getattr_generic_pipes(lvm_t)
+ dev_create_generic_dirs(lvm_t)
++dev_rw_generic_files(lvm_t)
+
+ fs_getattr_xattr_fs(lvm_t)
+ fs_search_auto_mountpoints(lvm_t)
+@@ -239,12 +275,17 @@
+ storage_dev_filetrans_fixed_disk(lvm_t)
+ # Access raw devices and old /dev/lvm (c 109,0). Is this needed?
+ storage_manage_fixed_disk(lvm_t)
++mls_file_read_all_levels(lvm_t)
++
++term_getattr_all_user_ttys(lvm_t)
++term_list_ptys(lvm_t)
+
+ corecmd_exec_bin(lvm_t)
+ corecmd_exec_shell(lvm_t)
+
+ domain_use_interactive_fds(lvm_t)
+
++files_read_usr_files(lvm_t)
+ files_read_etc_files(lvm_t)
+ files_read_etc_runtime_files(lvm_t)
+ # for when /usr is not mounted:
+@@ -283,5 +324,18 @@
+ ')
+
+ optional_policy(`
++ modutils_domtrans_insmod(lvm_t)
++')
++
++optional_policy(`
+ udev_read_db(lvm_t)
+ ')
++
++optional_policy(`
++ unconfined_domain(lvm_t)
++')
++
++optional_policy(`
++ xen_append_log(lvm_t)
++ xen_dontaudit_rw_unix_stream_sockets(lvm_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-3.6.1/policy/modules/system/miscfiles.if
+--- nsaserefpolicy/policy/modules/system/miscfiles.if 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/miscfiles.if 2008-11-25 09:45:43.000000000 -0500
+@@ -23,6 +23,45 @@
+
+ ########################################
+ ## <summary>
++## manange system SSL certificates.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`miscfiles_manage_cert_dirs',`
++ gen_require(`
++ type cert_t;
++ ')
++
++ manage_dirs_pattern($1,cert_t,cert_t)
++')
++
++########################################
++## <summary>
++## manange system SSL certificates.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`miscfiles_manage_cert_files',`
++ gen_require(`
++ type cert_t;
++ ')
++
++ manage_files_pattern($1,cert_t,cert_t)
++ read_lnk_files_pattern($1,cert_t,cert_t)
++')
++
++########################################
++## <summary>
+ ## Read fonts.
+ ## </summary>
+ ## <param name="domain">
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.1/policy/modules/system/modutils.te
+--- nsaserefpolicy/policy/modules/system/modutils.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/modutils.te 2008-11-25 09:45:43.000000000 -0500
+@@ -42,7 +42,7 @@
+ # insmod local policy
+ #
+
+-allow insmod_t self:capability { dac_override net_raw sys_tty_config };
++allow insmod_t self:capability { dac_override mknod net_raw sys_nice sys_tty_config };
+ allow insmod_t self:process { execmem sigchld sigkill sigstop signull signal };
+
+ allow insmod_t self:udp_socket create_socket_perms;
+@@ -55,6 +55,7 @@
+
+ kernel_load_module(insmod_t)
+ kernel_read_system_state(insmod_t)
++kernel_read_network_state(insmod_t)
+ kernel_write_proc_files(insmod_t)
+ kernel_mount_debugfs(insmod_t)
+ kernel_mount_kvmfs(insmod_t)
+@@ -63,6 +64,7 @@
+ kernel_read_kernel_sysctls(insmod_t)
+ kernel_rw_kernel_sysctl(insmod_t)
+ kernel_read_hotplug_sysctls(insmod_t)
++kernel_setsched(insmod_t)
+
+ files_read_kernel_modules(insmod_t)
+ # for locking: (cjp: ????)
+@@ -76,11 +78,10 @@
+ dev_read_sound(insmod_t)
+ dev_write_sound(insmod_t)
+ dev_rw_apm_bios(insmod_t)
+-# cjp: why is this needed? insmod cannot mounton any dir
+-# and it also transitions to mount
+-dev_mount_usbfs(insmod_t)
++dev_create_generic_chr_files(insmod_t)
+
+ fs_getattr_xattr_fs(insmod_t)
++fs_dontaudit_use_tmpfs_chr_dev(insmod_t)
+
+ corecmd_exec_bin(insmod_t)
+ corecmd_exec_shell(insmod_t)
+@@ -101,6 +102,8 @@
+ init_use_fds(insmod_t)
+ init_use_script_fds(insmod_t)
+ init_use_script_ptys(insmod_t)
++init_spec_domtrans_script(insmod_t)
++init_rw_script_tmp_files(insmod_t)
+
+ logging_send_syslog_msg(insmod_t)
+ logging_search_logs(insmod_t)
+@@ -110,18 +113,29 @@
+ seutil_read_file_contexts(insmod_t)
+
+ userdom_use_user_terminals(insmod_t)
++userdom_dontaudit_search_user_home_dirs(insmod_t)
+
+-ifdef(`distro_ubuntu',`
+ optional_policy(`
+ unconfined_domain(insmod_t)
+ ')
+-')
+
+ if( ! secure_mode_insmod ) {
+ kernel_domtrans_to(insmod_t,insmod_exec_t)
+ }
+
+ optional_policy(`
++ alsa_domtrans(insmod_t)
++')
++
++optional_policy(`
++ firstboot_dontaudit_rw_pipes(insmod_t)
++')
++
++optional_policy(`
++ hal_write_log(insmod_t)
++')
++
++optional_policy(`
+ hotplug_search_config(insmod_t)
+ ')
+
+@@ -154,6 +168,7 @@
+
+ optional_policy(`
+ rpm_rw_pipes(insmod_t)
++ rpm_read_script_tmp_files(insmod_t)
+ ')
+
+ optional_policy(`
+@@ -184,6 +199,7 @@
+
+ files_read_kernel_symbol_table(depmod_t)
+ files_read_kernel_modules(depmod_t)
++files_delete_kernel_modules(depmod_t)
+
+ fs_getattr_xattr_fs(depmod_t)
+
+@@ -214,7 +230,13 @@
+ ')
+
+ optional_policy(`
++ # Read System.map from home directories.
++ unconfined_domain(depmod_t)
++')
++
++optional_policy(`
+ rpm_rw_pipes(depmod_t)
++ rpm_manage_script_tmp_files(depmod_t)
+ ')
+
+ #################################
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.6.1/policy/modules/system/mount.fc
+--- nsaserefpolicy/policy/modules/system/mount.fc 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/mount.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,4 +1,6 @@
+ /bin/mount.* -- gen_context(system_u:object_r:mount_exec_t,s0)
+ /bin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0)
+-
++/sbin/mount.* -- gen_context(system_u:object_r:mount_exec_t,s0)
++/sbin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0)
++/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0)
+ /usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.6.1/policy/modules/system/mount.if
+--- nsaserefpolicy/policy/modules/system/mount.if 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/mount.if 2008-11-25 09:45:43.000000000 -0500
+@@ -43,9 +43,11 @@
+
+ mount_domtrans($1)
+ role $2 types mount_t;
++ #Leaked File Descriptors
++ dontaudit mount_t $1:unix_stream_socket rw_socket_perms;
+
+ optional_policy(`
+- samba_run_smbmount($1, $2)
++ samba_run_smbmount($1, $2, $3)
+ ')
+ ')
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.1/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/mount.te 2008-11-27 06:40:08.000000000 -0500
+@@ -18,17 +18,18 @@
+ init_system_domain(mount_t,mount_exec_t)
+ role system_r types mount_t;
+
++typealias mount_t alias mount_ntfs_t;
++typealias mount_exec_t alias mount_ntfs_exec_t;
++
+ type mount_loopback_t; # customizable
+ files_type(mount_loopback_t)
+
+ type mount_tmp_t;
+ files_tmp_file(mount_tmp_t)
+
+-# causes problems with interfaces when
+-# this is optionally declared in monolithic
+-# policy--duplicate type declaration
+ type unconfined_mount_t;
+ application_domain(unconfined_mount_t,mount_exec_t)
++role system_r types unconfined_mount_t;
+
+ ########################################
+ #
+@@ -36,7 +37,8 @@
+ #
+
+ # setuid/setgid needed to mount cifs
+-allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid };
++allow mount_t self:capability { fsetid ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid };
++allow mount_t self:process ptrace;
+
+ allow mount_t mount_loopback_t:file read_file_perms;
+
+@@ -47,12 +49,17 @@
+
+ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir })
+
++# In order to mount reiserfs_t
++kernel_list_unlabeled(mount_t)
+ kernel_read_system_state(mount_t)
++kernel_read_network_state(mount_t)
+ kernel_read_kernel_sysctls(mount_t)
+ kernel_dontaudit_getattr_core_if(mount_t)
++kernel_search_debugfs(mount_t)
+
+ dev_getattr_all_blk_files(mount_t)
+ dev_list_all_dev_nodes(mount_t)
++dev_read_usbfs(mount_t)
+ dev_rw_lvm_control(mount_t)
+ dev_dontaudit_getattr_all_chr_files(mount_t)
+ dev_dontaudit_getattr_memory_dev(mount_t)
+@@ -62,16 +69,19 @@
+ storage_raw_write_fixed_disk(mount_t)
+ storage_raw_read_removable_device(mount_t)
+ storage_raw_write_removable_device(mount_t)
++storage_rw_fuse(mount_t)
+
+-fs_getattr_xattr_fs(mount_t)
+-fs_getattr_cifs(mount_t)
++fs_list_all(mount_t)
++fs_getattr_all_fs(mount_t)
+ fs_mount_all_fs(mount_t)
+ fs_unmount_all_fs(mount_t)
+ fs_remount_all_fs(mount_t)
+ fs_relabelfrom_all_fs(mount_t)
+-fs_list_auto_mountpoints(mount_t)
+ fs_rw_tmpfs_chr_files(mount_t)
++fs_manage_tmpfs_dirs(mount_t)
+ fs_read_tmpfs_symlinks(mount_t)
++fs_read_fusefs_files(mount_t)
++fs_manage_nfs_dirs(mount_t)
+
+ term_use_all_terms(mount_t)
+
+@@ -79,6 +89,7 @@
+ corecmd_exec_bin(mount_t)
+
+ domain_use_interactive_fds(mount_t)
++domain_dontaudit_search_all_domains_state(mount_t)
+
+ files_search_all(mount_t)
+ files_read_etc_files(mount_t)
+@@ -87,7 +98,7 @@
+ files_mounton_all_mountpoints(mount_t)
+ files_unmount_rootfs(mount_t)
+ # These rules need to be generalized. Only admin, initrc should have it:
+-files_relabelto_all_file_type_fs(mount_t)
++files_relabel_all_file_type_fs(mount_t)
+ files_mount_all_file_type_fs(mount_t)
+ files_unmount_all_file_type_fs(mount_t)
+ # for when /etc/mtab loses its type
+@@ -100,6 +111,8 @@
+ init_use_fds(mount_t)
+ init_use_script_ptys(mount_t)
+ init_dontaudit_getattr_initctl(mount_t)
++init_stream_connect_script(mount_t)
++init_rw_script_stream_sockets(mount_t)
+
+ auth_use_nsswitch(mount_t)
+
+@@ -133,7 +146,7 @@
+
+ tunable_policy(`allow_mount_anyfile',`
+ auth_read_all_dirs_except_shadow(mount_t)
+- auth_read_all_files_except_shadow(mount_t)
++ auth_rw_all_files_except_shadow(mount_t)
+ files_mounton_non_security(mount_t)
+ ')
+
+@@ -164,6 +177,8 @@
+ fs_search_rpc(mount_t)
+
+ rpc_stub(mount_t)
++
++ rpc_domtrans_rpcd(mount_t)
+ ')
+
+ optional_policy(`
+@@ -171,6 +186,15 @@
+ ')
+
+ optional_policy(`
++ dbus_system_bus_client(mount_t)
++
++ optional_policy(`
++ hal_dbus_chat(mount_t)
++ ')
++')
++
++
++optional_policy(`
+ ifdef(`hide_broken_symptoms',`
+ # for a bug in the X server
+ rhgb_dontaudit_rw_stream_sockets(mount_t)
+@@ -178,6 +202,11 @@
+ ')
+ ')
+
++# Needed for mount crypt https://bugzilla.redhat.com/show_bug.cgi?id=418711
++optional_policy(`
++ lvm_domtrans(mount_t)
++')
++
+ # for kernel package installation
+ optional_policy(`
+ rpm_rw_pipes(mount_t)
+@@ -185,6 +214,7 @@
+
+ optional_policy(`
+ samba_domtrans_smbmount(mount_t)
++ samba_read_config(mount_t)
+ ')
+
+ ########################################
+@@ -195,4 +225,26 @@
+ optional_policy(`
+ files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
+ unconfined_domain(unconfined_mount_t)
++ optional_policy(`
++ hal_dbus_chat(unconfined_mount_t)
++ ')
++')
++
++########################################
++#
++# ntfs local policy
++#
++allow mount_t self:fifo_file rw_fifo_file_perms;
++allow mount_t self:unix_stream_socket create_stream_socket_perms;
++allow mount_t self:unix_dgram_socket create_socket_perms;
++
++corecmd_exec_shell(mount_t)
++
++modutils_domtrans_insmod(mount_t)
++
++optional_policy(`
++ hal_write_log(mount_t)
++ hal_use_fds(mount_t)
++ hal_rw_pipes(mount_t)
+ ')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.6.1/policy/modules/system/raid.te
+--- nsaserefpolicy/policy/modules/system/raid.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/raid.te 2008-11-25 09:45:43.000000000 -0500
+@@ -39,6 +39,7 @@
+ dev_dontaudit_getattr_generic_files(mdadm_t)
+ dev_dontaudit_getattr_generic_chr_files(mdadm_t)
+ dev_dontaudit_getattr_generic_blk_files(mdadm_t)
++dev_read_realtime_clock(mdadm_t)
+
+ fs_search_auto_mountpoints(mdadm_t)
+ fs_dontaudit_list_tmpfs(mdadm_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.6.1/policy/modules/system/selinuxutil.fc
+--- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/selinuxutil.fc 2008-11-25 09:45:43.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)
+ /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0)
+-/usr/sbin/setsebool -- gen_context(system_u:object_r:semanage_exec_t,s0)
++/usr/sbin/setsebool -- gen_context(system_u:object_r:setsebool_exec_t,s0)
+ /usr/sbin/semanage -- gen_context(system_u:object_r:semanage_exec_t,s0)
+ /usr/sbin/semodule -- gen_context(system_u:object_r:semanage_exec_t,s0)
+
+@@ -46,3 +46,11 @@
+ # /var/run
+ #
+ /var/run/restorecond\.pid -- gen_context(system_u:object_r:restorecond_var_run_t,s0)
++
++#
++# /var/lib
++#
++/var/lib/selinux(/.*)? gen_context(system_u:object_r:selinux_var_lib_t,s0)
++
++/etc/share/selinux/targeted(/.*)? gen_context(system_u:object_r:semanage_store_t,s0)
++/etc/share/selinux/mls(/.*)? gen_context(system_u:object_r:semanage_store_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.6.1/policy/modules/system/selinuxutil.if
+--- nsaserefpolicy/policy/modules/system/selinuxutil.if 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/selinuxutil.if 2008-11-25 09:45:43.000000000 -0500
+@@ -535,6 +535,53 @@
+
+ ########################################
+ ## <summary>
++## Execute setfiles in the setfiles domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`seutil_domtrans_setfiles_mac',`
++ gen_require(`
++ type setfiles_mac_t, setfiles_exec_t;
++ ')
++
++ files_search_usr($1)
++ corecmd_search_bin($1)
++ domtrans_pattern($1, setfiles_exec_t, setfiles_mac_t)
++')
++
++########################################
++## <summary>
++## Execute setfiles in the setfiles_mac domain, and
++## allow the specified role the setfiles_mac domain,
++## and use the caller's terminal.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the setfiles_mac domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`seutil_run_setfiles_mac',`
++ gen_require(`
++ type setfiles_mac_t;
++ ')
++
++ seutil_domtrans_setfiles_mac($1)
++ role $2 types setfiles_mac_t;
++')
++
++########################################
++## <summary>
+ ## Execute setfiles in the caller domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -680,6 +727,7 @@
+ ')
+
+ files_search_etc($1)
++ manage_dirs_pattern($1, selinux_config_t, selinux_config_t)
+ manage_files_pattern($1,selinux_config_t,selinux_config_t)
+ read_lnk_files_pattern($1,selinux_config_t,selinux_config_t)
+ ')
+@@ -999,6 +1047,26 @@
+
+ ########################################
+ ## <summary>
++## Execute a domain transition to run setsebool.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`seutil_domtrans_setsebool',`
++ gen_require(`
++ type setsebool_t, setsebool_exec_t;
++ ')
++
++ files_search_usr($1)
++ corecmd_search_bin($1)
++ domtrans_pattern($1, setsebool_exec_t, setsebool_t)
++')
++
++########################################
++## <summary>
+ ## Execute semanage in the semanage domain, and
+ ## allow the specified role the semanage domain,
+ ## and use the caller's terminal.
+@@ -1010,7 +1078,7 @@
+ ## </param>
+ ## <param name="role">
+ ## <summary>
+-## The role to be allowed the checkpolicy domain.
++## The role to be allowed the semanage domain.
+ ## </summary>
+ ## </param>
+ ## <rolecap/>
+@@ -1028,6 +1096,33 @@
+
+ ########################################
+ ## <summary>
++## Execute setsebool in the semanage domain, and
++## allow the specified role the semanage domain,
++## and use the caller's terminal.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="role">
++## <summary>
++## The role to be allowed the setsebool domain.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`seutil_run_setsebool',`
++ gen_require(`
++ type semanage_t;
++ ')
++
++ seutil_domtrans_setsebool($1)
++ role $2 types setsebool_t;
++')
++
++########################################
++## <summary>
+ ## Full management of the semanage
+ ## module store.
+ ## </summary>
+@@ -1139,3 +1234,254 @@
+ selinux_dontaudit_get_fs_mount($1)
+ seutil_dontaudit_read_config($1)
+ ')
++
++#######################################
++## <summary>
++## The per role template for the setsebool module.
++## </summary>
++## <desc>
++## <p>
++## This template creates a derived domains which are used
++## for setsebool plugins that are executed by a browser.
++## </p>
++## <p>
++## This template is invoked automatically for each user, and
++## generally does not need to be invoked directly
++## by policy writers.
++## </p>
++## </desc>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="user_domain">
++## <summary>
++## The type of the user domain.
++## </summary>
++## </param>
++## <param name="user_role">
++## <summary>
++## The role associated with the user domain.
++## </summary>
++## </param>
++#
++template(`seutil_setsebool_per_role_template',`
++ gen_require(`
++ type setsebool_exec_t;
++ ')
++
++ type $1_setsebool_t;
++ domain_type($1_setsebool_t)
++ domain_entry_file($1_setsebool_t, setsebool_exec_t)
++ role $3 types $1_setsebool_t;
++
++ files_search_usr($2)
++ corecmd_search_bin($2)
++ domtrans_pattern($2, setsebool_exec_t, $1_setsebool_t)
++ seutil_semanage_policy($1_setsebool_t)
++
++ # Need to define per type booleans
++ selinux_set_boolean($1_setsebool_t)
++
++ # Bug in semanage
++ seutil_domtrans_setfiles($1_setsebool_t)
++ seutil_manage_file_contexts($1_setsebool_t)
++ seutil_manage_default_contexts($1_setsebool_t)
++ seutil_manage_config($1_setsebool_t)
++')
++
++#######################################
++## <summary>
++## All rules necessary to run semanage command
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`seutil_semanage_policy',`
++ gen_require(`
++ type semanage_tmp_t;
++ type policy_config_t;
++ ')
++ allow $1 self:capability { dac_override audit_write sys_resource };
++ dontaudit $1 self:capability sys_tty_config;
++ allow $1 self:unix_stream_socket create_stream_socket_perms;
++ allow $1 self:unix_dgram_socket create_socket_perms;
++ logging_send_audit_msgs($1)
++
++ # Running genhomedircon requires this for finding all users
++ auth_use_nsswitch($1)
++
++ allow $1 policy_config_t:file { read write };
++
++ allow $1 semanage_tmp_t:dir manage_dir_perms;
++ allow $1 semanage_tmp_t:file manage_file_perms;
++ files_tmp_filetrans($1, semanage_tmp_t, { file dir })
++
++ kernel_read_system_state($1)
++ kernel_read_kernel_sysctls($1)
++
++ corecmd_exec_bin($1)
++ corecmd_exec_shell($1)
++
++ dev_read_urand($1)
++
++ domain_use_interactive_fds($1)
++
++ files_read_etc_files($1)
++ files_read_etc_runtime_files($1)
++ files_read_usr_files($1)
++ files_list_pids($1)
++ fs_list_inotifyfs($1)
++ fs_getattr_all_fs($1)
++
++ mls_file_write_all_levels($1)
++ mls_file_read_all_levels($1)
++
++ selinux_getattr_fs($1)
++ selinux_validate_context($1)
++ selinux_get_enforce_mode($1)
++
++ term_use_all_terms($1)
++
++ locallogin_use_fds($1)
++
++ logging_send_syslog_msg($1)
++
++ miscfiles_read_localization($1)
++
++ seutil_search_default_contexts($1)
++ seutil_domtrans_loadpolicy($1)
++ seutil_read_config($1)
++ seutil_manage_bin_policy($1)
++ seutil_use_newrole_fds($1)
++ seutil_manage_module_store($1)
++ seutil_get_semanage_trans_lock($1)
++ seutil_get_semanage_read_lock($1)
++
++ userdom_dontaudit_write_user_home_content_files($1)
++
++ optional_policy(`
++ rpm_dontaudit_rw_tmp_files($1)
++ rpm_dontaudit_rw_pipes($1)
++ ')
++')
++
++
++#######################################
++## <summary>
++## All rules necessary to run setfiles command
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`seutil_setfiles',`
++
++allow $1 self:capability { dac_override dac_read_search fowner };
++dontaudit $1 self:capability sys_tty_config;
++allow $1 self:fifo_file rw_file_perms;
++dontaudit $1 self:dir relabelfrom;
++dontaudit $1 self:file relabelfrom;
++dontaudit $1 self:lnk_file relabelfrom;
++
++
++allow $1 { policy_src_t policy_config_t file_context_t default_context_t }:dir list_dir_perms;
++allow $1 { policy_src_t policy_config_t file_context_t default_context_t }:file read_file_perms;
++allow $1 { policy_src_t policy_config_t file_context_t default_context_t }:lnk_file { read_lnk_file_perms ioctl lock };
++
++logging_send_audit_msgs($1)
++
++kernel_read_system_state($1)
++kernel_relabelfrom_unlabeled_dirs($1)
++kernel_relabelfrom_unlabeled_files($1)
++kernel_relabelfrom_unlabeled_symlinks($1)
++kernel_relabelfrom_unlabeled_pipes($1)
++kernel_relabelfrom_unlabeled_sockets($1)
++kernel_use_fds($1)
++kernel_rw_pipes($1)
++kernel_rw_unix_dgram_sockets($1)
++kernel_dontaudit_list_all_proc($1)
++kernel_read_all_sysctls($1)
++kernel_read_network_state_symlinks($1)
++
++dev_relabel_all_dev_nodes($1)
++
++domain_use_interactive_fds($1)
++domain_read_all_domains_state($1)
++
++files_read_etc_runtime_files($1)
++files_read_etc_files($1)
++files_list_all($1)
++files_relabel_all_files($1)
++files_list_isid_type_dirs($1)
++files_read_isid_type_files($1)
++files_dontaudit_read_all_symlinks($1)
++
++fs_getattr_xattr_fs($1)
++fs_list_all($1)
++fs_getattr_all_files($1)
++fs_search_auto_mountpoints($1)
++fs_relabelfrom_noxattr_fs($1)
++
++mls_file_read_all_levels($1)
++mls_file_write_all_levels($1)
++mls_file_upgrade($1)
++mls_file_downgrade($1)
++
++selinux_validate_context($1)
++selinux_compute_access_vector($1)
++selinux_compute_create_context($1)
++selinux_compute_relabel_context($1)
++selinux_compute_user_contexts($1)
++
++term_use_all_terms($1)
++
++# this is to satisfy the assertion:
++auth_relabelto_shadow($1)
++
++init_use_fds($1)
++init_use_script_fds($1)
++init_use_script_ptys($1)
++init_exec_script_files($1)
++
++logging_send_syslog_msg($1)
++
++miscfiles_read_localization($1)
++
++seutil_libselinux_linked($1)
++
++userdom_use_all_users_fds($1)
++# for config files in a home directory
++userdom_read_user_home_content_files($1)
++
++ifdef(`distro_debian',`
++ # udev tmpfs is populated with static device nodes
++ # and then relabeled afterwards; thus
++ # /dev/console has the tmpfs type
++ fs_rw_tmpfs_chr_files($1)
++')
++
++ifdef(`distro_redhat',`
++ fs_rw_tmpfs_chr_files($1)
++ fs_rw_tmpfs_blk_files($1)
++ fs_relabel_tmpfs_blk_file($1)
++ fs_relabel_tmpfs_chr_file($1)
++')
++
++ifdef(`distro_ubuntu',`
++ optional_policy(`
++ unconfined_domain($1)
++ ')
++')
++
++optional_policy(`
++ hotplug_use_fds($1)
++')
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.1/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/selinuxutil.te 2008-11-25 09:45:43.000000000 -0500
+@@ -23,6 +23,9 @@
+ type selinux_config_t;
+ files_type(selinux_config_t)
+
++type selinux_var_lib_t;
++files_type(selinux_var_lib_t)
++
+ type checkpolicy_t, can_write_binary_policy;
+ type checkpolicy_exec_t;
+ application_domain(checkpolicy_t, checkpolicy_exec_t)
+@@ -75,7 +78,6 @@
+ type restorecond_exec_t;
+ init_daemon_domain(restorecond_t,restorecond_exec_t)
+ domain_obj_id_change_exemption(restorecond_t)
+-role system_r types restorecond_t;
+
+ type restorecond_var_run_t;
+ files_pid_file(restorecond_var_run_t)
+@@ -92,6 +94,10 @@
+ domain_interactive_fd(semanage_t)
+ role system_r types semanage_t;
+
++type setsebool_t;
++type setsebool_exec_t;
++init_system_domain(setsebool_t, setsebool_exec_t)
++
+ type semanage_store_t;
+ files_type(semanage_store_t)
+
+@@ -109,6 +115,11 @@
+ init_system_domain(setfiles_t,setfiles_exec_t)
+ domain_obj_id_change_exemption(setfiles_t)
+
++type setfiles_mac_t;
++domain_type(setfiles_mac_t)
++domain_entry_file(setfiles_mac_t, setfiles_exec_t)
++domain_obj_id_change_exemption(setfiles_mac_t)
++
+ ########################################
+ #
+ # Checkpolicy local policy
+@@ -166,6 +177,7 @@
+ files_read_etc_runtime_files(load_policy_t)
+
+ fs_getattr_xattr_fs(load_policy_t)
++fs_list_inotifyfs(load_policy_t)
+
+ mls_file_read_all_levels(load_policy_t)
+
+@@ -191,15 +203,6 @@
+ ')
+ ')
+
+-ifdef(`hide_broken_symptoms',`
+- # cjp: cover up stray file descriptors.
+- dontaudit load_policy_t selinux_config_t:file write;
+-
+- optional_policy(`
+- unconfined_dontaudit_read_pipes(load_policy_t)
+- ')
+-')
+-
+ ########################################
+ #
+ # Newrole local policy
+@@ -217,7 +220,7 @@
+ allow newrole_t self:msg { send receive };
+ allow newrole_t self:unix_dgram_socket sendto;
+ allow newrole_t self:unix_stream_socket { create_stream_socket_perms connectto };
+-allow newrole_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++logging_send_audit_msgs(newrole_t)
+
+ read_files_pattern(newrole_t,default_context_t,default_context_t)
+ read_lnk_files_pattern(newrole_t,default_context_t,default_context_t)
+@@ -270,12 +273,14 @@
+ init_rw_utmp(newrole_t)
+ init_use_fds(newrole_t)
+
++logging_send_audit_msgs(newrole_t)
+ logging_send_syslog_msg(newrole_t)
+
+ miscfiles_read_localization(newrole_t)
+
+ seutil_libselinux_linked(newrole_t)
+
++userdom_use_unpriv_users_fds(newrole_t)
+ # for some PAM modules and for cwd
+ userdom_dontaudit_search_user_home_content(newrole_t)
+ userdom_search_user_home_dirs(newrole_t)
+@@ -336,6 +341,8 @@
+
+ seutil_libselinux_linked(restorecond_t)
+
++userdom_read_user_home_content_symlinks(restorecond_t)
++
+ ifdef(`distro_ubuntu',`
+ optional_policy(`
+ unconfined_domain(restorecond_t)
+@@ -354,7 +361,7 @@
+ allow run_init_t self:process setexec;
+ allow run_init_t self:capability setuid;
+ allow run_init_t self:fifo_file rw_file_perms;
+-allow run_init_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++logging_send_audit_msgs(run_init_t)
+
+ # often the administrator runs such programs from a directory that is owned
+ # by a different user or has restrictive SE permissions, do not want to audit
+@@ -383,7 +390,6 @@
+
+ auth_use_nsswitch(run_init_t)
+ auth_domtrans_chk_passwd(run_init_t)
+-auth_domtrans_upd_passwd(run_init_t)
+ auth_dontaudit_read_shadow(run_init_t)
+
+ init_spec_domtrans_script(run_init_t)
+@@ -421,61 +427,22 @@
+ # semodule local policy
+ #
+
+-allow semanage_t self:capability { dac_override audit_write };
+-allow semanage_t self:unix_stream_socket create_stream_socket_perms;
+-allow semanage_t self:unix_dgram_socket create_socket_perms;
+-allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+-
+-allow semanage_t policy_config_t:file rw_file_perms;
+-
+-allow semanage_t semanage_tmp_t:dir manage_dir_perms;
+-allow semanage_t semanage_tmp_t:file manage_file_perms;
+-files_tmp_filetrans(semanage_t, semanage_tmp_t, { file dir })
+-
+-kernel_read_system_state(semanage_t)
+-kernel_read_kernel_sysctls(semanage_t)
++seutil_semanage_policy(semanage_t)
++allow semanage_t self:fifo_file rw_fifo_file_perms;
+
+-corecmd_exec_bin(semanage_t)
++manage_dirs_pattern(semanage_t, selinux_var_lib_t, selinux_var_lib_t)
++manage_files_pattern(semanage_t, selinux_var_lib_t, selinux_var_lib_t)
+
+-dev_read_urand(semanage_t)
+-
+-domain_use_interactive_fds(semanage_t)
+-
+-files_read_etc_files(semanage_t)
+-files_read_etc_runtime_files(semanage_t)
+-files_read_usr_files(semanage_t)
+-files_list_pids(semanage_t)
+-
+-mls_file_write_all_levels(semanage_t)
+-mls_file_read_all_levels(semanage_t)
+-
+-selinux_validate_context(semanage_t)
+-selinux_get_enforce_mode(semanage_t)
+-selinux_getattr_fs(semanage_t)
+-# for setsebool:
+ selinux_set_boolean(semanage_t)
++can_exec(semanage_t, semanage_exec_t)
+
+-term_use_all_terms(semanage_t)
+-
+-# Running genhomedircon requires this for finding all users
+-auth_use_nsswitch(semanage_t)
+-
+-locallogin_use_fds(semanage_t)
++# Admins are creating pp files in random locations
++auth_read_all_files_except_shadow(semanage_t)
+
+-logging_send_syslog_msg(semanage_t)
+-
+-miscfiles_read_localization(semanage_t)
+-
+-seutil_libselinux_linked(semanage_t)
+ seutil_manage_file_contexts(semanage_t)
+ seutil_manage_config(semanage_t)
+ seutil_domtrans_setfiles(semanage_t)
+-seutil_domtrans_loadpolicy(semanage_t)
+-seutil_manage_bin_policy(semanage_t)
+-seutil_use_newrole_fds(semanage_t)
+-seutil_manage_module_store(semanage_t)
+-seutil_get_semanage_trans_lock(semanage_t)
+-seutil_get_semanage_read_lock(semanage_t)
++
+ # netfilter_contexts:
+ seutil_manage_default_contexts(semanage_t)
+
+@@ -484,12 +451,23 @@
+ files_read_var_lib_symlinks(semanage_t)
+ ')
+
++optional_policy(`
++ setrans_initrc_domtrans(semanage_t)
++ domain_system_change_exemption(semanage_t)
++ consoletype_exec(semanage_t)
++')
++
+ ifdef(`distro_ubuntu',`
+ optional_policy(`
+ unconfined_domain(semanage_t)
+ ')
+ ')
+
++optional_policy(`
++ #signal mcstrans on reload
++ init_spec_domtrans_script(semanage_t)
++')
++
+ # cjp: need a more general way to handle this:
+ ifdef(`enable_mls',`
+ # read secadm tmp files
+@@ -499,111 +477,36 @@
+ userdom_read_user_tmp_files(semanage_t)
+ ')
+
+-########################################
++userdom_search_admin_dir(semanage_t)
++
++####################################n####
+ #
+-# Setfiles local policy
++# setsebool local policy
+ #
++seutil_semanage_policy(setsebool_t)
++selinux_set_boolean(setsebool_t)
+
+-allow setfiles_t self:capability { dac_override dac_read_search fowner };
+-dontaudit setfiles_t self:capability sys_tty_config;
+-allow setfiles_t self:fifo_file rw_file_perms;
+-
+-allow setfiles_t { policy_src_t policy_config_t file_context_t default_context_t }:dir list_dir_perms;
+-allow setfiles_t { policy_src_t policy_config_t file_context_t default_context_t }:file read_file_perms;
+-allow setfiles_t { policy_src_t policy_config_t file_context_t default_context_t }:lnk_file { read_lnk_file_perms ioctl lock };
+-
+-kernel_read_system_state(setfiles_t)
+-kernel_relabelfrom_unlabeled_dirs(setfiles_t)
+-kernel_relabelfrom_unlabeled_files(setfiles_t)
+-kernel_relabelfrom_unlabeled_symlinks(setfiles_t)
+-kernel_relabelfrom_unlabeled_pipes(setfiles_t)
+-kernel_relabelfrom_unlabeled_sockets(setfiles_t)
+-kernel_use_fds(setfiles_t)
+-kernel_rw_pipes(setfiles_t)
+-kernel_rw_unix_dgram_sockets(setfiles_t)
+-kernel_dontaudit_list_all_proc(setfiles_t)
+-kernel_dontaudit_list_all_sysctls(setfiles_t)
+-
+-dev_relabel_all_dev_nodes(setfiles_t)
+-
+-domain_use_interactive_fds(setfiles_t)
+-domain_dontaudit_search_all_domains_state(setfiles_t)
+-
+-files_read_etc_runtime_files(setfiles_t)
+-files_read_etc_files(setfiles_t)
+-files_list_all(setfiles_t)
+-files_relabel_all_files(setfiles_t)
+-
+-fs_getattr_xattr_fs(setfiles_t)
+-fs_list_all(setfiles_t)
+-fs_search_auto_mountpoints(setfiles_t)
+-fs_relabelfrom_noxattr_fs(setfiles_t)
+-
+-mls_file_read_all_levels(setfiles_t)
+-mls_file_write_all_levels(setfiles_t)
+-mls_file_upgrade(setfiles_t)
+-mls_file_downgrade(setfiles_t)
+-
+-selinux_validate_context(setfiles_t)
+-selinux_compute_access_vector(setfiles_t)
+-selinux_compute_create_context(setfiles_t)
+-selinux_compute_relabel_context(setfiles_t)
+-selinux_compute_user_contexts(setfiles_t)
+-
+-term_use_all_user_ttys(setfiles_t)
+-term_use_all_user_ptys(setfiles_t)
+-term_use_unallocated_ttys(setfiles_t)
+-
+-# this is to satisfy the assertion:
+-auth_relabelto_shadow(setfiles_t)
+-
+-init_use_fds(setfiles_t)
+-init_use_script_fds(setfiles_t)
+-init_use_script_ptys(setfiles_t)
+-init_exec_script_files(setfiles_t)
+-
+-logging_send_syslog_msg(setfiles_t)
+-
+-miscfiles_read_localization(setfiles_t)
+-
+-seutil_libselinux_linked(setfiles_t)
+-
+-userdom_use_all_users_fds(setfiles_t)
+-# for config files in a home directory
+-userdom_read_user_home_content_files(setfiles_t)
++init_dontaudit_use_fds(setsebool_t)
+
+-ifdef(`distro_debian',`
+- # udev tmpfs is populated with static device nodes
+- # and then relabeled afterwards; thus
+- # /dev/console has the tmpfs type
+- fs_rw_tmpfs_chr_files(setfiles_t)
+-')
+-
+-ifdef(`distro_redhat', `
+- fs_rw_tmpfs_chr_files(setfiles_t)
+- fs_rw_tmpfs_blk_files(setfiles_t)
+- fs_relabel_tmpfs_blk_file(setfiles_t)
+- fs_relabel_tmpfs_chr_file(setfiles_t)
+-')
++# Bug in semanage
++seutil_domtrans_setfiles(setsebool_t)
++seutil_manage_file_contexts(setsebool_t)
++seutil_manage_default_contexts(setsebool_t)
++seutil_manage_config(setsebool_t)
+
+-ifdef(`distro_ubuntu',`
+- optional_policy(`
+- unconfined_domain(setfiles_t)
+- ')
+-')
++########################################
++#
++# Setfiles local policy
++#
+
+-ifdef(`hide_broken_symptoms',`
+- optional_policy(`
+- udev_dontaudit_rw_dgram_sockets(setfiles_t)
+- ')
++seutil_setfiles(setfiles_t)
++# During boot in Rawhide
++term_use_generic_ptys(setfiles_t)
+
+- # cjp: cover up stray file descriptors.
+- optional_policy(`
+- unconfined_dontaudit_read_pipes(setfiles_t)
+- unconfined_dontaudit_rw_tcp_sockets(setfiles_t)
+- ')
+-')
++seutil_setfiles(setfiles_mac_t)
++allow setfiles_mac_t self:capability2 mac_admin;
++kernel_relabelto_unlabeled(setfiles_mac_t)
+
+ optional_policy(`
+- hotplug_use_fds(setfiles_t)
++ unconfined_domain(setfiles_mac_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.6.1/policy/modules/system/setrans.if
+--- nsaserefpolicy/policy/modules/system/setrans.if 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/setrans.if 2008-11-25 09:45:43.000000000 -0500
+@@ -21,3 +21,23 @@
+ stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
+ files_list_pids($1)
+ ')
++
++########################################
++## <summary>
++## Execute setrans server in the setrans domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++#
++interface(`setrans_initrc_domtrans',`
++ gen_require(`
++ type setrans_initrc_exec_t;
++ ')
++
++ init_labeled_script_domtrans($1, setrans_initrc_exec_t)
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.1/policy/modules/system/sysnetwork.fc
+--- nsaserefpolicy/policy/modules/system/sysnetwork.fc 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/sysnetwork.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -11,6 +11,7 @@
+ /etc/dhclient-script -- gen_context(system_u:object_r:dhcp_etc_t,s0)
+ /etc/dhcpc.* gen_context(system_u:object_r:dhcp_etc_t,s0)
+ /etc/dhcpd\.conf -- gen_context(system_u:object_r:dhcp_etc_t,s0)
++/etc/hosts -- gen_context(system_u:object_r:net_conf_t,s0)
+ /etc/resolv\.conf.* -- gen_context(system_u:object_r:net_conf_t,s0)
+ /etc/yp\.conf.* -- gen_context(system_u:object_r:net_conf_t,s0)
+
+@@ -20,6 +21,7 @@
+ ifdef(`distro_redhat',`
+ /etc/sysconfig/network-scripts/.*resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
+ /etc/sysconfig/networking/profiles/.*/resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
++/etc/sysconfig/networking/profiles/.*/hosts -- gen_context(system_u:object_r:net_conf_t,s0)
+ ')
+
+ #
+@@ -57,3 +59,5 @@
+ ifdef(`distro_gentoo',`
+ /var/lib/dhcpc(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0)
+ ')
++
++/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.6.1/policy/modules/system/sysnetwork.if
+--- nsaserefpolicy/policy/modules/system/sysnetwork.if 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/sysnetwork.if 2008-11-25 09:45:43.000000000 -0500
+@@ -192,7 +192,25 @@
+ type dhcpc_state_t;
+ ')
+
+- allow $1 dhcpc_state_t:file read_file_perms;
++ read_files_pattern($1, dhcpc_state_t, dhcpc_state_t)
++')
++
++#######################################
++## <summary>
++## Delete the dhcp client state files.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`sysnet_delete_dhcpc_state',`
++ gen_require(`
++ type dhcpc_state_t;
++ ')
++
++ delete_files_pattern($1, dhcpc_state_t, dhcpc_state_t)
+ ')
+
+ #######################################
+@@ -541,6 +559,7 @@
+ type net_conf_t;
+ ')
+
++ allow $1 self:netlink_route_socket r_netlink_socket_perms;
+ allow $1 self:tcp_socket create_socket_perms;
+ allow $1 self:udp_socket create_socket_perms;
+
+@@ -557,6 +576,14 @@
+
+ files_search_etc($1)
+ allow $1 net_conf_t:file read_file_perms;
++
++ optional_policy(`
++ avahi_stream_connect($1)
++ ')
++
++ optional_policy(`
++ nscd_socket_use($1)
++ ')
+ ')
+
+ ########################################
+@@ -586,6 +613,8 @@
+
+ files_search_etc($1)
+ allow $1 net_conf_t:file read_file_perms;
++ # LDAP Configuration using encrypted requires
++ dev_read_urand($1)
+ ')
+
+ ########################################
+@@ -620,3 +649,49 @@
+ files_search_etc($1)
+ allow $1 net_conf_t:file read_file_perms;
+ ')
++
++########################################
++## <summary>
++## Do not audit attempts to use
++## the dhcp file descriptors.
++## </summary>
++## <param name="domain">
++## <summary>
++## The domain sending the SIGCHLD.
++## </summary>
++## </param>
++#
++interface(`sysnet_dontaudit_dhcpc_use_fds',`
++ gen_require(`
++ type dhcpc_t;
++ ')
++
++ dontaudit $1 dhcpc_t:fd use;
++')
++
++########################################
++## <summary>
++## Transition to system_r when execute an dhclient script
++## </summary>
++## <desc>
++## <p>
++## Execute dhclient script in a specified role
++## </p>
++## <p>
++## No interprocess communication (signals, pipes,
++## etc.) is provided by this interface since
++## the domains are not owned by this module.
++## </p>
++## </desc>
++## <param name="source_role">
++## <summary>
++## Role to transition from.
++## </summary>
++## </param>
++interface(`sysnet_role_transition_dhcpc',`
++ gen_require(`
++ type dhcpc_exec_t;
++ ')
++
++ role_transition $1 dhcpc_exec_t system_r;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.1/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/sysnetwork.te 2008-11-25 13:29:45.000000000 -0500
+@@ -20,6 +20,9 @@
+ init_daemon_domain(dhcpc_t,dhcpc_exec_t)
+ role system_r types dhcpc_t;
+
++type dhcpc_helper_exec_t;
++init_script_file(dhcpc_helper_exec_t)
++
+ type dhcpc_state_t;
+ files_type(dhcpc_state_t)
+
+@@ -41,21 +44,22 @@
+ #
+ # DHCP client local policy
+ #
+-allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_resource sys_tty_config };
++allow dhcpc_t self:capability { dac_override fsetid net_admin net_raw net_bind_service sys_nice sys_resource sys_tty_config };
+ dontaudit dhcpc_t self:capability sys_tty_config;
+ # for access("/etc/bashrc", X_OK) on Red Hat
+ dontaudit dhcpc_t self:capability { dac_read_search sys_module };
+-allow dhcpc_t self:process signal_perms;
+-allow dhcpc_t self:fifo_file rw_file_perms;
++allow dhcpc_t self:process { setfscreate ptrace signal_perms };
++allow dhcpc_t self:fifo_file rw_fifo_file_perms;
+ allow dhcpc_t self:tcp_socket create_stream_socket_perms;
+ allow dhcpc_t self:udp_socket create_socket_perms;
+ allow dhcpc_t self:packet_socket create_socket_perms;
+-allow dhcpc_t self:netlink_route_socket { create_socket_perms nlmsg_read nlmsg_write };
++allow dhcpc_t self:netlink_route_socket { create_socket_perms nlmsg_read };
+
+ allow dhcpc_t dhcp_etc_t:dir list_dir_perms;
+ read_lnk_files_pattern(dhcpc_t,dhcp_etc_t,dhcp_etc_t)
+ exec_files_pattern(dhcpc_t,dhcp_etc_t,dhcp_etc_t)
+
++allow dhcpc_t dhcp_state_t:file read_file_perms;
+ manage_files_pattern(dhcpc_t,dhcpc_state_t,dhcpc_state_t)
+ filetrans_pattern(dhcpc_t,dhcp_state_t,dhcpc_state_t,file)
+
+@@ -116,7 +120,7 @@
+ corecmd_exec_shell(dhcpc_t)
+
+ domain_use_interactive_fds(dhcpc_t)
+-domain_dontaudit_list_all_domains_state(dhcpc_t)
++domain_dontaudit_read_all_domains_state(dhcpc_t)
+
+ files_read_etc_files(dhcpc_t)
+ files_read_etc_runtime_files(dhcpc_t)
+@@ -183,25 +187,23 @@
+ ')
+
+ optional_policy(`
+- nis_use_ypbind(dhcpc_t)
+- nis_signal_ypbind(dhcpc_t)
+- nis_read_ypbind_pid(dhcpc_t)
+- nis_delete_ypbind_pid(dhcpc_t)
++ networkmanager_domtrans(dhcpc_t)
++ networkmanager_read_pid_files(dhcpc_t)
++')
+
+- # dhclient sometimes starts ypbind
+- init_exec_script_files(dhcpc_t)
+- nis_domtrans_ypbind(dhcpc_t)
++optional_policy(`
++ nis_ypbind_initrc_domtrans(dhcpc_t)
++ nis_read_ypbind_pid(dhcpc_t)
+ ')
+
+ optional_policy(`
++ nscd_initrc_domtrans(dhcpc_t)
+ nscd_domtrans(dhcpc_t)
+ nscd_read_pid(dhcpc_t)
+ ')
+
+ optional_policy(`
+- # dhclient sometimes starts ntpd
+- init_exec_script_files(dhcpc_t)
+- ntp_domtrans(dhcpc_t)
++ ntp_initrc_domtrans(dhcpc_t)
+ ')
+
+ optional_policy(`
+@@ -212,6 +214,7 @@
+ optional_policy(`
+ seutil_sigchld_newrole(dhcpc_t)
+ seutil_dontaudit_search_config(dhcpc_t)
++ seutil_domtrans_setfiles(dhcpc_t)
+ ')
+
+ optional_policy(`
+@@ -223,6 +226,10 @@
+ ')
+
+ optional_policy(`
++ vmware_append_log(dhcpc_t)
++')
++
++optional_policy(`
+ kernel_read_xen_state(dhcpc_t)
+ kernel_write_xen_state(dhcpc_t)
+ xen_append_log(dhcpc_t)
+@@ -236,7 +243,6 @@
+
+ allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
+ allow ifconfig_t self:capability { net_raw net_admin sys_tty_config };
+-dontaudit ifconfig_t self:capability sys_module;
+
+ allow ifconfig_t self:fd use;
+ allow ifconfig_t self:fifo_file rw_fifo_file_perms;
+@@ -250,6 +256,7 @@
+ allow ifconfig_t self:sem create_sem_perms;
+ allow ifconfig_t self:msgq create_msgq_perms;
+ allow ifconfig_t self:msg { send receive };
++allow ifconfig_t net_conf_t:file read_file_perms;
+
+ # Create UDP sockets, necessary when called from dhcpc
+ allow ifconfig_t self:udp_socket create_socket_perms;
+@@ -259,13 +266,20 @@
+ allow ifconfig_t self:netlink_route_socket create_netlink_socket_perms;
+ allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read };
+ allow ifconfig_t self:tcp_socket { create ioctl };
++
++read_files_pattern(ifconfig_t, dhcpc_state_t, dhcpc_state_t)
++
+ files_read_etc_files(ifconfig_t);
++files_read_etc_runtime_files(ifconfig_t);
+
+ kernel_use_fds(ifconfig_t)
+ kernel_read_system_state(ifconfig_t)
+ kernel_read_network_state(ifconfig_t)
+ kernel_search_network_sysctl(ifconfig_t)
++kernel_search_debugfs(ifconfig_t)
+ kernel_rw_net_sysctls(ifconfig_t)
++# This should be put inside a boolean, but can not because of attributes
++kernel_load_module(ifconfig_t)
+
+ corenet_rw_tun_tap_dev(ifconfig_t)
+
+@@ -276,8 +290,13 @@
+ fs_getattr_xattr_fs(ifconfig_t)
+ fs_search_auto_mountpoints(ifconfig_t)
+
++selinux_dontaudit_getattr_fs(ifconfig_t)
++
++term_dontaudit_use_console(ifconfig_t)
+ term_dontaudit_use_all_user_ttys(ifconfig_t)
+ term_dontaudit_use_all_user_ptys(ifconfig_t)
++term_dontaudit_use_ptmx(ifconfig_t)
++term_dontaudit_use_generic_ptys(ifconfig_t)
+
+ domain_use_interactive_fds(ifconfig_t)
+
+@@ -296,6 +315,8 @@
+
+ seutil_use_runinit_fds(ifconfig_t)
+
++sysnet_dns_name_resolve(ifconfig_t)
++
+ userdom_use_user_terminals(ifconfig_t)
+ userdom_use_all_users_fds(ifconfig_t)
+
+@@ -332,6 +353,14 @@
+ ')
+
+ optional_policy(`
++ unconfined_dontaudit_rw_pipes(ifconfig_t)
++')
++
++optional_policy(`
++ vmware_append_log(ifconfig_t)
++')
++
++optional_policy(`
+ kernel_read_xen_state(ifconfig_t)
+ kernel_write_xen_state(ifconfig_t)
+ xen_append_log(ifconfig_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.1/policy/modules/system/udev.fc
+--- nsaserefpolicy/policy/modules/system/udev.fc 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/udev.fc 2008-11-25 16:15:10.000000000 -0500
+@@ -17,3 +17,5 @@
+ /sbin/wait_for_sysfs -- gen_context(system_u:object_r:udev_exec_t,s0)
+
+ /usr/bin/udevinfo -- gen_context(system_u:object_r:udev_exec_t,s0)
++
++/var/run/PackageKit/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.1/policy/modules/system/udev.if
+--- nsaserefpolicy/policy/modules/system/udev.if 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/udev.if 2008-11-25 09:45:43.000000000 -0500
+@@ -96,6 +96,24 @@
+
+ ########################################
+ ## <summary>
++## dontaudit process read list of devices.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`udev_dontaudit_search_db',`
++ gen_require(`
++ type udev_tbl_t;
++ ')
++
++ dontaudit $1 udev_tbl_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
+ ## Allow process to read list of devices.
+ ## </summary>
+ ## <param name="domain">
+@@ -106,11 +124,13 @@
+ #
+ interface(`udev_read_db',`
+ gen_require(`
+- type udev_tdb_t;
++ type udev_tbl_t;
+ ')
+
+ dev_list_all_dev_nodes($1)
+- allow $1 udev_tdb_t:file read_file_perms;
++ allow $1 udev_tbl_t:dir list_dir_perms;
++ read_files_pattern($1, udev_tbl_t, udev_tbl_t)
++ read_lnk_files_pattern($1, udev_tbl_t, udev_tbl_t)
+ ')
+
+ ########################################
+@@ -125,9 +145,9 @@
+ #
+ interface(`udev_rw_db',`
+ gen_require(`
+- type udev_tdb_t;
++ type udev_tbl_t;
+ ')
+
+ dev_list_all_dev_nodes($1)
+- allow $1 udev_tdb_t:file rw_file_perms;
++ allow $1 udev_tbl_t:file rw_file_perms;
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.1/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/udev.te 2008-11-25 09:45:43.000000000 -0500
+@@ -83,6 +83,7 @@
+ kernel_rw_unix_dgram_sockets(udev_t)
+ kernel_dgram_send(udev_t)
+ kernel_signal(udev_t)
++kernel_search_debugfs(udev_t)
+
+ #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235182
+ kernel_rw_net_sysctls(udev_t)
+@@ -139,6 +140,7 @@
+
+ logging_search_logs(udev_t)
+ logging_send_syslog_msg(udev_t)
++logging_send_audit_msgs(udev_t)
+
+ miscfiles_read_localization(udev_t)
+
+@@ -186,6 +188,7 @@
+
+ optional_policy(`
+ alsa_domtrans(udev_t)
++ alsa_read_lib(udev_t)
+ alsa_read_rw_config(udev_t)
+ ')
+
+@@ -194,6 +197,10 @@
+ ')
+
+ optional_policy(`
++ clock_domtrans(udev_t)
++')
++
++optional_policy(`
+ consoletype_exec(udev_t)
+ ')
+
+@@ -230,6 +237,10 @@
+ ')
+
+ optional_policy(`
++ rpm_search_log(udev_t)
++')
++
++optional_policy(`
+ kernel_write_xen_state(udev_t)
+ kernel_read_xen_state(udev_t)
+ xen_manage_log(udev_t)
+@@ -237,5 +248,9 @@
+ ')
+
+ optional_policy(`
++ unconfined_domain(udev_t)
++')
++
++optional_policy(`
+ xserver_read_xdm_pid(udev_t)
+ ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.1/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-09-11 16:42:49.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/unconfined.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,15 +2,29 @@
+ # e.g.:
+ # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0)
+ # For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
+-/usr/bin/qemu.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/bin/valgrind -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/bin/vncserver -- gen_context(system_u:object_r:unconfined_exec_t,s0)
+-
+-/usr/lib/ia32el/ia32x_loader -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+-
+-/usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/valgrind -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/vncserver -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
+
++/usr/lib/ia32el/ia32x_loader -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
+ ifdef(`distro_gentoo',`
+-/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
+ ')
++/usr/bin/sbcl -- gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/usr/sbin/mock -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
++/usr/sbin/sysreport -- gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
++
++/usr/lib64/erlang/erts-[^/]+/bin/beam.smp -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/erlang/erts-[^/]+/bin/beam.smp -- gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/usr/bin/haddock.* -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/hasktags -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/runghc -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/runhaskell -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/libexec/ghc-[^/]+/.*bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/libexec/ghc-[^/]+/ghc-.* -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib(64)?/ghc-[^/]+/ghc-.* -- gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/gcl -- gen_context(system_u:object_r:execmem_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.1/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/unconfined.if 2008-12-01 16:30:53.000000000 -0500
+@@ -12,14 +12,13 @@
+ #
+ interface(`unconfined_domain_noaudit',`
+ gen_require(`
+- type unconfined_t;
+ class dbus all_dbus_perms;
+ class nscd all_nscd_perms;
+ class passwd all_passwd_perms;
+ ')
+
+ # Use any Linux capability.
+- allow $1 self:capability *;
++ allow $1 self:capability all_capabilities;
+ allow $1 self:fifo_file manage_fifo_file_perms;
+
+ # Transition to myself, to make get_ordered_context_list happy.
+@@ -27,12 +26,13 @@
+
+ # Write access is for setting attributes under /proc/self/attr.
+ allow $1 self:file rw_file_perms;
++ allow $1 self:dir rw_dir_perms;
+
+ # Userland object managers
+- allow $1 self:nscd *;
+- allow $1 self:dbus *;
+- allow $1 self:passwd *;
+- allow $1 self:association *;
++ allow $1 self:nscd all_nscd_perms;
++ allow $1 self:dbus all_dbus_perms;
++ allow $1 self:passwd all_passwd_perms;
++ allow $1 self:association all_association_perms;
+
+ kernel_unconfined($1)
+ corenet_unconfined($1)
+@@ -44,6 +44,11 @@
+ fs_unconfined($1)
+ selinux_unconfined($1)
+
++ domain_mmap_low_type($1)
++ tunable_policy(`allow_unconfined_mmap_low',`
++ domain_mmap_low($1)
++ ')
++
+ tunable_policy(`allow_execheap',`
+ # Allow making the stack executable via mprotect.
+ allow $1 self:process execheap;
+@@ -69,6 +74,7 @@
+ optional_policy(`
+ # Communicate via dbusd.
+ dbus_system_bus_unconfined($1)
++ dbus_unconfined($1)
+ ')
+
+ optional_policy(`
+@@ -367,6 +373,24 @@
+
+ ########################################
+ ## <summary>
++## Send a SIGNULL signal to the unconfined execmem domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`unconfined_execmem_signull',`
++ gen_require(`
++ type unconfined_execmem_t;
++ ')
++
++ allow $1 unconfined_execmem_t:process signull;
++')
++
++########################################
++## <summary>
+ ## Send generic signals to the unconfined domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -581,3 +605,150 @@
+
+ allow $1 unconfined_t:dbus acquire_svc;
+ ')
++
++########################################
++## <summary>
++## Allow ptrace of unconfined domain
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`unconfined_ptrace',`
++ gen_require(`
++ type unconfined_t;
++ ')
++
++ allow $1 unconfined_t:process ptrace;
++')
++
++########################################
++## <summary>
++## Read and write to unconfined shared memory.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`unconfined_rw_shm',`
++ gen_require(`
++ type unconfined_t;
++ ')
++
++ allow $1 unconfined_t:shm rw_shm_perms;
++')
++
++########################################
++## <summary>
++## Read and write to unconfined execmem shared memory.
++## </summary>
++## <param name="domain">
++## <summary>
++## The type of the process performing this action.
++## </summary>
++## </param>
++#
++interface(`unconfined_execmem_rw_shm',`
++ gen_require(`
++ type unconfined_execmem_t;
++ ')
++
++ allow $1 unconfined_execmem_t:shm rw_shm_perms;
++')
++
++########################################
++## <summary>
++## Transition to the unconfined_execmem domain.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`unconfined_execmem_domtrans',`
++
++ gen_require(`
++ type unconfined_execmem_t, execmem_exec_t;
++ ')
++
++ domtrans_pattern($1, execmem_exec_t, unconfined_execmem_t)
++')
++
++########################################
++## <summary>
++## execute the execmem applications
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`unconfined_execmem_exec',`
++
++ gen_require(`
++ type execmem_exec_t;
++ ')
++
++ can_exec($1, execmem_exec_t)
++')
++
++########################################
++## <summary>
++## Allow apps to set rlimits on userdomain
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`unconfined_set_rlimitnh',`
++ gen_require(`
++ type unconfined_t;
++ ')
++
++ allow $1 unconfined_t:process rlimitinh;
++')
++
++########################################
++## <summary>
++## Get the process group of unconfined.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`unconfined_getpgid',`
++ gen_require(`
++ type unconfined_t;
++ ')
++
++ allow $1 unconfined_t:process getpgid;
++')
++
++########################################
++## <summary>
++## Change to the unconfined role.
++## </summary>
++## <param name="role">
++## <summary>
++## Role allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`unconfined_role_change',`
++ gen_require(`
++ role unconfined_r;
++ ')
++
++ allow $1 unconfined_r;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.1/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/unconfined.te 2008-11-25 09:45:43.000000000 -0500
+@@ -6,35 +6,75 @@
+ # Declarations
+ #
+
++## <desc>
++## <p>
++## Transition to confined nsplugin domains from unconfined user
++## </p>
++## </desc>
++gen_tunable(allow_unconfined_nsplugin_transition, false)
++
++## <desc>
++## <p>
++## Allow unconfined domain to map low memory in the kernel
++## </p>
++## </desc>
++gen_tunable(allow_unconfined_mmap_low, false)
++
++## <desc>
++## <p>
++## Transition to confined qemu domains from unconfined user
++## </p>
++## </desc>
++gen_tunable(allow_unconfined_qemu_transition, false)
++
+ # usage in this module of types created by these
+ # calls is not correct, however we dont currently
+ # have another method to add access to these types
+-userdom_base_user_template(unconfined)
+-userdom_manage_home_role(unconfined_r, unconfined_t)
+-userdom_manage_tmp_role(unconfined_r, unconfined_t)
+-userdom_manage_tmpfs_role(unconfined_r, unconfined_t)
++userdom_restricted_user_template(unconfined)
++#userdom_common_user_template(unconfined)
++#userdom_xwindows_client_template(unconfined)
+
+ type unconfined_exec_t;
+ init_system_domain(unconfined_t, unconfined_exec_t)
++role unconfined_r types unconfined_t;
++
++domain_user_exemption_target(unconfined_t)
++allow system_r unconfined_r;
++allow unconfined_r system_r;
++init_script_role_transition(unconfined_r)
++role system_r types unconfined_t;
+
+ type unconfined_execmem_t;
+-type unconfined_execmem_exec_t;
+-init_system_domain(unconfined_execmem_t, unconfined_execmem_exec_t)
++type execmem_exec_t;
++init_system_domain(unconfined_execmem_t, execmem_exec_t)
+ role unconfined_r types unconfined_execmem_t;
++typealias execmem_exec_t alias unconfined_execmem_exec_t;
++
++type unconfined_notrans_t;
++type unconfined_notrans_exec_t;
++init_system_domain(unconfined_notrans_t, unconfined_notrans_exec_t)
++role unconfined_r types unconfined_notrans_t;
+
+ ########################################
+ #
+ # Local policy
+ #
+
+-domtrans_pattern(unconfined_t, unconfined_execmem_exec_t, unconfined_execmem_t)
++dontaudit unconfined_t self:dir write;
++
++allow unconfined_t self:system syslog_read;
++dontaudit unconfined_t self:capability sys_module;
++
++domtrans_pattern(unconfined_t, execmem_exec_t, unconfined_execmem_t)
+
+ files_create_boot_flag(unconfined_t)
++files_create_default_dir(unconfined_t)
+
+ mcs_killall(unconfined_t)
+ mcs_ptrace_all(unconfined_t)
+
+ init_run_daemon(unconfined_t, unconfined_r)
++init_domtrans_script(unconfined_t)
+
+ libs_run_ldconfig(unconfined_t, unconfined_r)
+
+@@ -42,26 +82,39 @@
+ logging_run_auditctl(unconfined_t, unconfined_r)
+
+ mount_run_unconfined(unconfined_t, unconfined_r)
++# Unconfined running as system_r
++mount_domtrans_unconfined(unconfined_t)
+
++seutil_run_setsebool(unconfined_t, unconfined_r)
+ seutil_run_setfiles(unconfined_t, unconfined_r)
+ seutil_run_semanage(unconfined_t, unconfined_r)
+
+ unconfined_domain(unconfined_t)
++domain_mmap_low(unconfined_t)
+
+ userdom_user_home_dir_filetrans_user_home_content(unconfined_t, { dir file lnk_file fifo_file sock_file })
+
++optional_policy(`
++ nsplugin_role_notrans(unconfined_r, unconfined_t)
++ tunable_policy(`allow_unconfined_nsplugin_transition',`
++ nsplugin_domtrans(unconfined_execmem_t)
++ nsplugin_domtrans_config(unconfined_execmem_t)
++ nsplugin_domtrans(unconfined_t)
++ nsplugin_domtrans_config(unconfined_t)
++ ')
++')
++
+ ifdef(`distro_gentoo',`
+ seutil_run_runinit(unconfined_t, unconfined_r)
+ seutil_init_script_run_runinit(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+- ada_domtrans(unconfined_t)
++ ada_run(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+ apache_run_helper(unconfined_t, unconfined_r)
+- apache_role(unconfined_r, unconfined_t)
+ ')
+
+ optional_policy(`
+@@ -102,12 +155,24 @@
+ ')
+
+ optional_policy(`
++ gnomeclock_dbus_chat(unconfined_t)
++ ')
++
++ optional_policy(`
++ kerneloops_dbus_chat(unconfined_t)
++ ')
++
++ optional_policy(`
+ networkmanager_dbus_chat(unconfined_t)
+ ')
+
+ optional_policy(`
+ oddjob_dbus_chat(unconfined_t)
+ ')
++
++ optional_policy(`
++ vpnc_dbus_chat(unconfined_t)
++ ')
+ ')
+
+ optional_policy(`
+@@ -119,7 +184,7 @@
+ ')
+
+ optional_policy(`
+- inn_domtrans(unconfined_t)
++ iptables_run(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+@@ -127,23 +192,25 @@
+ ')
+
+ optional_policy(`
+- lpd_run_checkpc(unconfined_t, unconfined_r)
++ kismet_run(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+- modutils_run_update_mods(unconfined_t, unconfined_r)
++ livecd_run(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+- mono_domtrans(unconfined_t)
++ lpd_run_checkpc(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+- mta_role(unconfined_r, unconfined_t)
++ modutils_run_update_mods(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+- oddjob_domtrans_mkhomedir(unconfined_t)
++ mono_role_template(unconfined, unconfined_r, unconfined_t)
++ unconfined_domain(unconfined_mono_t)
++ role system_r types unconfined_mono_t;
+ ')
+
+ optional_policy(`
+@@ -155,36 +222,38 @@
+ ')
+
+ optional_policy(`
+- postfix_run_map(unconfined_t, unconfined_r)
+- # cjp: this should probably be removed:
+- postfix_domtrans_master(unconfined_t)
+-')
++ qemu_role_notrans(unconfined_r, unconfined_t)
++ qemu_unconfined_role(unconfined_r)
+
+-optional_policy(`
+- pyzor_role(unconfined_r, unconfined_t)
++ tunable_policy(`allow_unconfined_qemu_transition',`
++ qemu_domtrans(unconfined_t)
++ ',`
++ qemu_domtrans_unconfined(unconfined_t)
+ ')
+-
+-optional_policy(`
+- # cjp: this should probably be removed:
+- rpc_domtrans_nfsd(unconfined_t)
+ ')
+
+ optional_policy(`
+ rpm_run(unconfined_t, unconfined_r)
++ # Allow SELinux aware applications to request rpm_script execution
++ rpm_transition_script(unconfined_t)
++ rpm_role_transition(unconfined_r)
+ ')
+
+ optional_policy(`
+- samba_run_net(unconfined_t, unconfined_r)
++ samba_role_notrans(unconfined_r)
++ samba_run_unconfined_net(unconfined_t, unconfined_r)
+ samba_run_winbind_helper(unconfined_t, unconfined_r)
++ samba_run_smbcontrol(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+- spamassassin_role(unconfined_r, unconfined_t)
++ sendmail_run_unconfined(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+ sysnet_run_dhcpc(unconfined_t, unconfined_r)
+ sysnet_dbus_chat_dhcpc(unconfined_t)
++ sysnet_role_transition_dhcpc(unconfined_r)
+ ')
+
+ optional_policy(`
+@@ -192,7 +261,7 @@
+ ')
+
+ optional_policy(`
+- usermanage_run_admin_passwd(unconfined_t, unconfined_r)
++ vbetool_run(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+@@ -204,11 +273,12 @@
+ ')
+
+ optional_policy(`
+- wine_domtrans(unconfined_t)
++ wine_run(unconfined_t, unconfined_r)
+ ')
+
+ optional_policy(`
+- xserver_domtrans(unconfined_t)
++ xserver_run(unconfined_t, unconfined_r)
++ xserver_rw_shm(unconfined_t)
+ ')
+
+ ########################################
+@@ -218,14 +288,58 @@
+
+ allow unconfined_execmem_t self:process { execstack execmem };
+ unconfined_domain_noaudit(unconfined_execmem_t)
++allow unconfined_execmem_t unconfined_t:process transition;
+
+ optional_policy(`
+- dbus_stub(unconfined_execmem_t)
+-
+ init_dbus_chat_script(unconfined_execmem_t)
++ dbus_system_bus_client(unconfined_execmem_t)
+ unconfined_dbus_chat(unconfined_execmem_t)
++ unconfined_dbus_connect(unconfined_execmem_t)
++')
++
++optional_policy(`
++ avahi_dbus_chat(unconfined_execmem_t)
++')
+
+ optional_policy(`
+ hal_dbus_chat(unconfined_execmem_t)
+ ')
++
++optional_policy(`
++ xserver_rw_shm(unconfined_execmem_t)
+ ')
++
++########################################
++#
++# Unconfined notrans Local policy
++#
++
++allow unconfined_notrans_t self:process { execstack execmem };
++unconfined_domain_noaudit(unconfined_notrans_t)
++domtrans_pattern(unconfined_t, unconfined_notrans_exec_t, unconfined_notrans_t)
++# Allow SELinux aware applications to request rpm_script execution
++rpm_transition_script(unconfined_notrans_t)
++domain_ptrace_all_domains(unconfined_notrans_t)
++
++optional_policy(`
++ gen_require(`
++ type mplayer_exec_t;
++ ')
++ domtrans_pattern(unconfined_t, mplayer_exec_t, unconfined_execmem_t)
++')
++
++tunable_policy(`allow_unconfined_nsplugin_transition',`', `
++ gen_require(`
++ type mozilla_exec_t;
++ ')
++ domtrans_pattern(unconfined_t, mozilla_exec_t, unconfined_execmem_t)
++')
++
++optional_policy(`
++ gen_require(`
++ type openoffice_exec_t;
++ ')
++ domtrans_pattern(unconfined_t, openoffice_exec_t, unconfined_execmem_t)
++')
++
++gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.1/policy/modules/system/userdomain.fc
+--- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-11-11 16:13:48.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/userdomain.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -1,4 +1,5 @@
+ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
++HOME_DIR -l gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
+ HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0)
+-
+ /tmp/gconfd-USER -d gen_context(system_u:object_r:user_tmp_t,s0)
++/root(/.*)? gen_context(system_u:object_r:admin_home_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.1/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if 2008-11-13 18:40:02.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/userdomain.if 2008-12-02 11:36:42.000000000 -0500
+@@ -30,8 +30,9 @@
+ ')
+
+ attribute $1_file_type;
++ attribute $1_usertype;
+
+- type $1_t, userdomain;
++ type $1_t, userdomain, $1_usertype;
+ domain_type($1_t)
+ corecmd_shell_entry_type($1_t)
+ corecmd_bin_entry_type($1_t)
+@@ -41,71 +42,85 @@
+ allow system_r $1_r;
+
+ term_user_pty($1_t, user_devpts_t)
+-
+ term_user_tty($1_t, user_tty_device_t)
+
+- allow $1_t self:process { signal_perms getsched setsched share getpgid setpgid setcap getsession getattr };
+- allow $1_t self:fd use;
+- allow $1_t self:fifo_file rw_fifo_file_perms;
+- allow $1_t self:unix_dgram_socket { create_socket_perms sendto };
+- allow $1_t self:unix_stream_socket { create_stream_socket_perms connectto };
+- allow $1_t self:shm create_shm_perms;
+- allow $1_t self:sem create_sem_perms;
+- allow $1_t self:msgq create_msgq_perms;
+- allow $1_t self:msg { send receive };
+- allow $1_t self:context contains;
+- dontaudit $1_t self:socket create;
++ allow $1_usertype $1_usertype:process { ptrace signal_perms getsched setsched share getpgid setpgid getcap setcap getsession getattr };
++ allow $1_usertype $1_usertype:fd use;
++ allow $1_usertype $1_t:key { create view read write search link setattr };
++
++ allow $1_usertype $1_usertype:fifo_file rw_fifo_file_perms;
++ allow $1_usertype $1_usertype:unix_dgram_socket { create_socket_perms sendto };
++ allow $1_usertype $1_usertype:unix_stream_socket { create_stream_socket_perms connectto };
++ allow $1_usertype $1_usertype:shm create_shm_perms;
++ allow $1_usertype $1_usertype:sem create_sem_perms;
++ allow $1_usertype $1_usertype:msgq create_msgq_perms;
++ allow $1_usertype $1_usertype:msg { send receive };
++ allow $1_usertype $1_usertype:context contains;
++ dontaudit $1_usertype $1_usertype:socket create;
+
+- allow $1_t user_devpts_t:chr_file { setattr rw_chr_file_perms };
+- term_create_pty($1_t, user_devpts_t)
++ allow $1_usertype user_devpts_t:chr_file { setattr rw_chr_file_perms };
++ term_create_pty($1_usertype, user_devpts_t)
+ # avoid annoying messages on terminal hangup on role change
+- dontaudit $1_t user_devpts_t:chr_file ioctl;
++ dontaudit $1_usertype user_devpts_t:chr_file ioctl;
+
+- allow $1_t user_tty_device_t:chr_file { setattr rw_chr_file_perms };
++ allow $1_usertype user_tty_device_t:chr_file { setattr rw_chr_file_perms };
+ # avoid annoying messages on terminal hangup on role change
+- dontaudit $1_t user_tty_device_t:chr_file ioctl;
++ dontaudit $1_usertype user_tty_device_t:chr_file ioctl;
++
++ application_exec_all($1_usertype)
++
++ files_exec_usr_files($1_t)
+
+- kernel_read_kernel_sysctls($1_t)
+- kernel_dontaudit_list_unlabeled($1_t)
+- kernel_dontaudit_getattr_unlabeled_files($1_t)
+- kernel_dontaudit_getattr_unlabeled_symlinks($1_t)
+- kernel_dontaudit_getattr_unlabeled_pipes($1_t)
+- kernel_dontaudit_getattr_unlabeled_sockets($1_t)
+- kernel_dontaudit_getattr_unlabeled_blk_files($1_t)
+- kernel_dontaudit_getattr_unlabeled_chr_files($1_t)
++ kernel_read_kernel_sysctls($1_usertype)
++ kernel_read_all_sysctls($1_usertype)
++ kernel_dontaudit_list_unlabeled($1_usertype)
++ kernel_dontaudit_getattr_unlabeled_files($1_usertype)
++ kernel_dontaudit_getattr_unlabeled_symlinks($1_usertype)
++ kernel_dontaudit_getattr_unlabeled_pipes($1_usertype)
++ kernel_dontaudit_getattr_unlabeled_sockets($1_usertype)
++ kernel_dontaudit_getattr_unlabeled_blk_files($1_usertype)
++ kernel_dontaudit_getattr_unlabeled_chr_files($1_usertype)
++ kernel_dontaudit_list_proc($1_usertype)
+
+- dev_dontaudit_getattr_all_blk_files($1_t)
+- dev_dontaudit_getattr_all_chr_files($1_t)
++ dev_dontaudit_getattr_all_blk_files($1_usertype)
++ dev_dontaudit_getattr_all_chr_files($1_usertype)
++ dev_getattr_mtrr_dev($1_t)
+
+ # When the user domain runs ps, there will be a number of access
+ # denials when ps tries to search /proc. Do not audit these denials.
+- domain_dontaudit_read_all_domains_state($1_t)
+- domain_dontaudit_getattr_all_domains($1_t)
+- domain_dontaudit_getsession_all_domains($1_t)
+-
+- files_read_etc_files($1_t)
+- files_read_etc_runtime_files($1_t)
+- files_read_usr_files($1_t)
++ domain_dontaudit_read_all_domains_state($1_usertype)
++ domain_dontaudit_getattr_all_domains($1_usertype)
++ domain_dontaudit_getsession_all_domains($1_usertype)
++
++ files_read_etc_files($1_usertype)
++ files_read_mnt_files($1_usertype)
++ files_read_etc_runtime_files($1_usertype)
++ files_read_usr_files($1_usertype)
+ # Read directories and files with the readable_t type.
+ # This type is a general type for "world"-readable files.
+- files_list_world_readable($1_t)
+- files_read_world_readable_files($1_t)
+- files_read_world_readable_symlinks($1_t)
+- files_read_world_readable_pipes($1_t)
+- files_read_world_readable_sockets($1_t)
++ files_list_world_readable($1_usertype)
++ files_read_world_readable_files($1_usertype)
++ files_read_world_readable_symlinks($1_usertype)
++ files_read_world_readable_pipes($1_usertype)
++ files_read_world_readable_sockets($1_usertype)
+ # old broswer_domain():
+- files_dontaudit_list_non_security($1_t)
+- files_dontaudit_getattr_non_security_files($1_t)
+- files_dontaudit_getattr_non_security_symlinks($1_t)
+- files_dontaudit_getattr_non_security_pipes($1_t)
+- files_dontaudit_getattr_non_security_sockets($1_t)
+-
+- libs_exec_ld_so($1_t)
+-
+- miscfiles_read_localization($1_t)
+- miscfiles_read_certs($1_t)
+-
+- sysnet_read_config($1_t)
++ files_dontaudit_getattr_all_dirs($1_usertype)
++ files_dontaudit_list_non_security($1_usertype)
++ files_dontaudit_getattr_non_security_files($1_usertype)
++ files_dontaudit_getattr_non_security_symlinks($1_usertype)
++ files_dontaudit_getattr_non_security_pipes($1_usertype)
++ files_dontaudit_getattr_non_security_sockets($1_usertype)
++
++ storage_rw_fuse($1_usertype)
++
++ auth_use_nsswitch($1_usertype)
++
++ libs_exec_ld_so($1_usertype)
++
++ miscfiles_read_certs($1_usertype)
++ miscfiles_read_localization($1_usertype)
++ miscfiles_read_man_pages($1_usertype)
++ miscfiles_read_public_files($1_usertype)
+
+ tunable_policy(`allow_execmem',`
+ # Allow loading DSOs that require executable stack.
+@@ -116,6 +131,11 @@
+ # Allow making the stack executable via mprotect.
+ allow $1_t self:process execstack;
+ ')
++
++ optional_policy(`
++ ssh_rw_stream_sockets($1_usertype)
++ ssh_delete_tmp($1_t)
++ ')
+ ')
+
+ #######################################
+@@ -174,9 +194,6 @@
+ fs_read_nfs_symlinks($2)
+ fs_read_nfs_named_sockets($2)
+ fs_read_nfs_named_pipes($2)
+- ',`
+- fs_dontaudit_list_nfs($2)
+- fs_dontaudit_read_nfs_files($2)
+ ')
+
+ tunable_policy(`use_samba_home_dirs',`
+@@ -185,9 +202,6 @@
+ fs_read_cifs_symlinks($2)
+ fs_read_cifs_named_sockets($2)
+ fs_read_cifs_named_pipes($2)
+- ',`
+- fs_dontaudit_list_cifs($2)
+- fs_dontaudit_read_cifs_files($2)
+ ')
+ ')
+
+@@ -232,7 +246,10 @@
+ type_member $2 user_home_dir_t:dir user_home_dir_t;
+
+ # full control of the home directory
++ allow $2 user_home_t:dir mounton;
+ allow $2 user_home_t:file entrypoint;
++
++ allow $2 user_home_t:dir_file_class_set { relabelto relabelfrom };
+ manage_dirs_pattern($2, { user_home_dir_t user_home_t }, user_home_t)
+ manage_files_pattern($2, { user_home_dir_t user_home_t }, user_home_t)
+ manage_lnk_files_pattern($2, { user_home_dir_t user_home_t }, user_home_t)
+@@ -250,25 +267,23 @@
+ allow $2 user_home_dir_t:dir { manage_dir_perms relabel_dir_perms };
+
+ tunable_policy(`use_nfs_home_dirs',`
++ fs_mount_nfs($2)
++ fs_mounton_nfs($2)
+ fs_manage_nfs_dirs($2)
+ fs_manage_nfs_files($2)
+ fs_manage_nfs_symlinks($2)
+ fs_manage_nfs_named_sockets($2)
+ fs_manage_nfs_named_pipes($2)
+- ',`
+- fs_dontaudit_manage_nfs_dirs($2)
+- fs_dontaudit_manage_nfs_files($2)
+ ')
+
+ tunable_policy(`use_samba_home_dirs',`
++ fs_mount_cifs($2)
++ fs_mounton_cifs($2)
+ fs_manage_cifs_dirs($2)
+ fs_manage_cifs_files($2)
+ fs_manage_cifs_symlinks($2)
+ fs_manage_cifs_named_sockets($2)
+ fs_manage_cifs_named_pipes($2)
+- ',`
+- fs_dontaudit_manage_cifs_dirs($2)
+- fs_dontaudit_manage_cifs_files($2)
+ ')
+ ')
+
+@@ -303,6 +318,7 @@
+ manage_sock_files_pattern($2, user_tmp_t, user_tmp_t)
+ manage_fifo_files_pattern($2, user_tmp_t, user_tmp_t)
+ files_tmp_filetrans($2, user_tmp_t, { dir file lnk_file sock_file fifo_file })
++ relabel_files_pattern($2, user_tmp_t, user_tmp_t)
+ ')
+
+ #######################################
+@@ -368,46 +384,41 @@
+
+ #######################################
+ ## <summary>
+-## The template allowing the user basic
++## The interface allowing the user basic
+ ## network permissions
+ ## </summary>
+-## <param name="userdomain_prefix">
++## <param name="userdomain">
+ ## <summary>
+-## The prefix of the user domain (e.g., user
+-## is the prefix for user_t).
++## The user domain
+ ## </summary>
+ ## </param>
+ ## <rolebase/>
+ #
+-template(`userdom_basic_networking_template',`
+- gen_require(`
+- type $1_t;
+- ')
+-
+- allow $1_t self:tcp_socket create_stream_socket_perms;
+- allow $1_t self:udp_socket create_socket_perms;
++interface(`userdom_basic_networking',`
+
+- corenet_all_recvfrom_unlabeled($1_t)
+- corenet_all_recvfrom_netlabel($1_t)
+- corenet_tcp_sendrecv_all_if($1_t)
+- corenet_udp_sendrecv_all_if($1_t)
+- corenet_tcp_sendrecv_all_nodes($1_t)
+- corenet_udp_sendrecv_all_nodes($1_t)
+- corenet_tcp_sendrecv_all_ports($1_t)
+- corenet_udp_sendrecv_all_ports($1_t)
+- corenet_tcp_connect_all_ports($1_t)
+- corenet_sendrecv_all_client_packets($1_t)
++ allow $1 self:tcp_socket create_stream_socket_perms;
++ allow $1 self:udp_socket create_socket_perms;
+
+- corenet_all_recvfrom_labeled($1_t, $1_t)
++ corenet_all_recvfrom_unlabeled($1)
++ corenet_all_recvfrom_netlabel($1)
++ corenet_tcp_sendrecv_all_if($1)
++ corenet_udp_sendrecv_all_if($1)
++ corenet_tcp_sendrecv_all_nodes($1)
++ corenet_udp_sendrecv_all_nodes($1)
++ corenet_tcp_sendrecv_all_ports($1)
++ corenet_udp_sendrecv_all_ports($1)
++ corenet_tcp_connect_all_ports($1)
++ corenet_sendrecv_all_client_packets($1)
+
+ optional_policy(`
+- init_tcp_recvfrom_all_daemons($1_t)
+- init_udp_recvfrom_all_daemons($1_t)
++ init_tcp_recvfrom_all_daemons($1)
++ init_udp_recvfrom_all_daemons($1)
+ ')
+
+ optional_policy(`
+- ipsec_match_default_spd($1_t)
++ ipsec_match_default_spd($1)
+ ')
++
+ ')
+
+ #######################################
+@@ -420,34 +431,39 @@
+ ## is the prefix for user_t).
+ ## </summary>
+ ## </param>
+-## <rolebase/>
++## <rolecap/>
+ #
+-template(`userdom_xwindows_client_template',`
++interface(`userdom_xwindows_client',`
+ gen_require(`
+- type $1_t, user_tmpfs_t;
++ type user_tmpfs_t;
+ ')
+
+- dev_rw_xserver_misc($1_t)
+- dev_rw_power_management($1_t)
+- dev_read_input($1_t)
+- dev_read_misc($1_t)
+- dev_write_misc($1_t)
++ dev_rwx_zero($1)
++ dev_rw_xserver_misc($1)
++ dev_rw_power_management($1)
++ dev_read_input($1)
++ dev_read_misc($1)
++ dev_write_misc($1)
+ # open office is looking for the following
+- dev_getattr_agp_dev($1_t)
+- dev_dontaudit_rw_dri($1_t)
++ dev_getattr_agp_dev($1)
++ dev_dontaudit_rw_dri($1)
+ # GNOME checks for usb and other devices:
+- dev_rw_usbfs($1_t)
++ dev_rw_usbfs($1)
++ dev_rw_generic_usb_dev($1)
+
+- xserver_user_client($1_t, user_tmpfs_t)
+- xserver_xsession_entry_type($1_t)
+- xserver_dontaudit_write_log($1_t)
+- xserver_stream_connect_xdm($1_t)
++ optional_policy(`
++ xserver_user_client($1, user_tmpfs_t)
++ xserver_xsession_entry_type($1)
++ xserver_dontaudit_write_log($1)
++ xserver_stream_connect_xdm($1)
+ # certain apps want to read xdm.pid file
+- xserver_read_xdm_pid($1_t)
++ xserver_read_xdm_pid($1)
+ # gnome-session creates socket under /tmp/.ICE-unix/
+- xserver_create_xdm_tmp_sockets($1_t)
++ xserver_create_xdm_tmp_sockets($1)
+ # Needed for escd, remove if we get escd policy
+- xserver_manage_xdm_tmp_files($1_t)
++ xserver_manage_xdm_tmp_files($1)
++ xserver_stream_connect($1)
++ ')
+ ')
+
+ #######################################
+@@ -497,11 +513,7 @@
+ attribute unpriv_userdomain;
+ ')
+
+- userdom_basic_networking_template($1)
+-
+- optional_policy(`
+- userdom_xwindows_client_template($1)
+- ')
++ userdom_basic_networking($1_usertype)
+
+ ##############################
+ #
+@@ -512,111 +524,115 @@
+ dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
+ dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
+
+- allow $1_t unpriv_userdomain:fd use;
++ allow $1_usertype unpriv_userdomain:fd use;
+
+- kernel_read_system_state($1_t)
+- kernel_read_network_state($1_t)
+- kernel_read_net_sysctls($1_t)
++ kernel_read_system_state($1_usertype)
++ kernel_read_network_state($1_usertype)
++ kernel_read_net_sysctls($1_usertype)
+ # Very permissive allowing every domain to see every type:
+- kernel_get_sysvipc_info($1_t)
++ kernel_get_sysvipc_info($1_usertype)
+ # Find CDROM devices:
+- kernel_read_device_sysctls($1_t)
+-
+- corecmd_exec_bin($1_t)
++ kernel_read_device_sysctls($1_usertype)
+
+- corenet_udp_bind_all_nodes($1_t)
+- corenet_udp_bind_generic_port($1_t)
++ corenet_udp_bind_all_nodes($1_usertype)
++ corenet_udp_bind_generic_port($1_usertype)
+
+- dev_read_rand($1_t)
+- dev_write_sound($1_t)
+- dev_read_sound($1_t)
+- dev_read_sound_mixer($1_t)
+- dev_write_sound_mixer($1_t)
++ dev_read_rand($1_usertype)
++ dev_write_sound($1_usertype)
++ dev_read_sound($1_usertype)
++ dev_read_sound_mixer($1_usertype)
++ dev_write_sound_mixer($1_usertype)
+
+- files_exec_etc_files($1_t)
+- files_search_locks($1_t)
++ files_exec_etc_files($1_usertype)
++ files_search_locks($1_usertype)
+ # Check to see if cdrom is mounted
+- files_search_mnt($1_t)
++ files_search_mnt($1_usertype)
+ # cjp: perhaps should cut back on file reads:
+- files_read_var_files($1_t)
+- files_read_var_symlinks($1_t)
+- files_read_generic_spool($1_t)
+- files_read_var_lib_files($1_t)
++ files_read_var_files($1_usertype)
++ files_read_var_symlinks($1_usertype)
++ files_read_generic_spool($1_usertype)
++ files_read_var_lib_files($1_usertype)
+ # Stat lost+found.
+- files_getattr_lost_found_dirs($1_t)
++ files_getattr_lost_found_dirs($1_usertype)
++ files_read_config_files($1_usertype)
++ fs_read_noxattr_fs_files($1_usertype)
++ fs_read_noxattr_fs_symlinks($1_usertype)
++
++ logging_send_syslog_msg($1_usertype)
++ logging_send_audit_msgs($1_usertype)
++ selinux_get_enforce_mode($1_usertype)
+
+ # cjp: some of this probably can be removed
+- selinux_get_fs_mount($1_t)
+- selinux_validate_context($1_t)
+- selinux_compute_access_vector($1_t)
+- selinux_compute_create_context($1_t)
+- selinux_compute_relabel_context($1_t)
+- selinux_compute_user_contexts($1_t)
++ selinux_get_fs_mount($1_usertype)
++ selinux_validate_context($1_usertype)
++ selinux_compute_access_vector($1_usertype)
++ selinux_compute_create_context($1_usertype)
++ selinux_compute_relabel_context($1_usertype)
++ selinux_compute_user_contexts($1_usertype)
+
+ # for eject
+- storage_getattr_fixed_disk_dev($1_t)
++ storage_getattr_fixed_disk_dev($1_usertype)
+
+- auth_use_nsswitch($1_t)
+- auth_read_login_records($1_t)
+- auth_search_pam_console_data($1_t)
++ auth_read_login_records($1_usertype)
+ auth_run_pam($1_t,$1_r)
+ auth_run_utempter($1_t,$1_r)
+
+- init_read_utmp($1_t)
++ init_read_utmp($1_usertype)
+
+- seutil_read_file_contexts($1_t)
+- seutil_read_default_contexts($1_t)
++ seutil_read_file_contexts($1_usertype)
++ seutil_read_default_contexts($1_usertype)
+ seutil_run_newrole($1_t,$1_r)
+ seutil_exec_checkpolicy($1_t)
+- seutil_exec_setfiles($1_t)
++ seutil_exec_setfiles($1_usertype)
+ # for when the network connection is killed
+ # this is needed when a login role can change
+ # to this one.
+ seutil_dontaudit_signal_newrole($1_t)
+
+ tunable_policy(`read_default_t',`
+- files_list_default($1_t)
+- files_read_default_files($1_t)
+- files_read_default_symlinks($1_t)
+- files_read_default_sockets($1_t)
+- files_read_default_pipes($1_t)
++ files_list_default($1_usertype)
++ files_read_default_files($1_usertype)
++ files_read_default_symlinks($1_usertype)
++ files_read_default_sockets($1_usertype)
++ files_read_default_pipes($1_usertype)
+ ')
+
+ tunable_policy(`user_direct_mouse',`
+- dev_read_mouse($1_t)
+- ')
+-
+- tunable_policy(`user_ttyfile_stat',`
+- term_getattr_all_user_ttys($1_t)
++ dev_read_mouse($1_usertype)
+ ')
+
+ optional_policy(`
+- alsa_read_rw_config($1_t)
++ alsa_read_rw_config($1_usertype)
+ ')
+
+ optional_policy(`
+ # Allow graphical boot to check battery lifespan
+- apm_stream_connect($1_t)
++ apm_stream_connect($1_usertype)
+ ')
+
+ optional_policy(`
+- canna_stream_connect($1_t)
++ canna_stream_connect($1_usertype)
+ ')
+
+ optional_policy(`
+ dbus_system_bus_client($1_t)
+
+ optional_policy(`
++ avahi_dbus_chat($1_t)
++ ')
++
++ optional_policy(`
+ bluetooth_dbus_chat($1_t)
+ ')
+
+ optional_policy(`
+- evolution_dbus_chat($1_t)
+- evolution_alarm_dbus_chat($1_t)
++ consolekit_dbus_chat($1_t)
++ consolekit_read_log($1_t)
+ ')
+
+ optional_policy(`
+- cups_dbus_chat_config($1_t)
++ evolution_dbus_chat($1_t)
++ evolution_alarm_dbus_chat($1_t)
+ ')
+
+ optional_policy(`
+@@ -626,75 +642,75 @@
+ optional_policy(`
+ networkmanager_dbus_chat($1_t)
+ ')
+- ')
+
+ optional_policy(`
+- inetd_use_fds($1_t)
+- inetd_rw_tcp_sockets($1_t)
++ vpnc_dbus_chat($1_t)
+ ')
+
+- optional_policy(`
+- inn_read_config($1_t)
+- inn_read_news_lib($1_t)
+- inn_read_news_spool($1_t)
+ ')
+
+ optional_policy(`
+- locate_read_lib_files($1_t)
++ inetd_use_fds($1_usertype)
++ inetd_rw_tcp_sockets($1_usertype)
+ ')
+
+- # for running depmod as part of the kernel packaging process
+ optional_policy(`
+- modutils_read_module_config($1_t)
++ inn_read_config($1_usertype)
++ inn_read_news_lib($1_usertype)
++ inn_read_news_spool($1_usertype)
+ ')
+
+ optional_policy(`
+- mta_rw_spool($1_t)
++ locate_read_lib_files($1_usertype)
+ ')
+
++ # for running depmod as part of the kernel packaging process
+ optional_policy(`
+- tunable_policy(`allow_user_mysql_connect',`
+- mysql_stream_connect($1_t)
+- ')
++ modutils_read_module_config($1_usertype)
+ ')
+
+ optional_policy(`
+- # to allow monitoring of pcmcia status
+- pcmcia_read_pid($1_t)
++ mta_rw_spool($1_usertype)
++ mta_manage_queue($1_usertype)
+ ')
+
+ optional_policy(`
+- pcscd_read_pub_files($1_t)
+- pcscd_stream_connect($1_t)
++ nsplugin_role($1_r, $1_t)
+ ')
+
+ optional_policy(`
+ tunable_policy(`allow_user_postgresql_connect',`
+- postgresql_stream_connect($1_t)
+- postgresql_tcp_connect($1_t)
++ postgresql_stream_connect($1_usertype)
+ ')
+ ')
+
+ optional_policy(`
+- resmgr_stream_connect($1_t)
++ # to allow monitoring of pcmcia status
++ pcmcia_read_pid($1_usertype)
+ ')
+
+ optional_policy(`
+- rpc_dontaudit_getattr_exports($1_t)
+- rpc_manage_nfs_rw_content($1_t)
++ pcscd_read_pub_files($1_usertype)
++ pcscd_stream_connect($1_usertype)
+ ')
+
+ optional_policy(`
+- samba_stream_connect_winbind($1_t)
++ resmgr_stream_connect($1_usertype)
+ ')
+
+ optional_policy(`
+- slrnpull_search_spool($1_t)
++ rpc_dontaudit_getattr_exports($1_usertype)
++ rpc_manage_nfs_rw_content($1_usertype)
+ ')
+
+ optional_policy(`
+- usernetctl_run($1_t,$1_r)
++ samba_stream_connect_winbind($1_usertype)
+ ')
++
++ optional_policy(`
++ slrnpull_search_spool($1_usertype)
++ ')
++
+ ')
+
+ #######################################
+@@ -722,15 +738,27 @@
+
+ userdom_base_user_template($1)
+
+- userdom_manage_home_role($1_r, $1_t)
++ userdom_change_password_template($1)
+
+- userdom_manage_tmp_role($1_r, $1_t)
+- userdom_manage_tmpfs_role($1_r, $1_t)
++ userdom_manage_home_role($1_r, $1_usertype)
+
+- userdom_exec_user_tmp_files($1_t)
+- userdom_exec_user_home_content_files($1_t)
++ userdom_manage_tmp_role($1_r, $1_usertype)
++ userdom_manage_tmpfs_role($1_r, $1_usertype)
+
+- userdom_change_password_template($1)
++ gen_tunable(allow_$1_exec_content, true)
++
++ tunable_policy(`allow_$1_exec_content',`
++ userdom_exec_user_tmp_files($1_usertype)
++ userdom_exec_user_home_content_files($1_usertype)
++ ')
++
++ tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
++ fs_exec_nfs_files($1_usertype)
++ ')
++
++ tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
++ fs_exec_cifs_files($1_usertype)
++ ')
+
+ ##############################
+ #
+@@ -746,70 +774,72 @@
+
+ allow $1_t self:context contains;
+
+- kernel_dontaudit_read_system_state($1_t)
++ kernel_dontaudit_read_system_state($1_usertype)
+
+- dev_read_sysfs($1_t)
+- dev_read_urand($1_t)
++ dev_read_sysfs($1_usertype)
++ dev_read_urand($1_usertype)
+
+- domain_use_interactive_fds($1_t)
++ domain_use_interactive_fds($1_usertype)
+ # Command completion can fire hundreds of denials
+- domain_dontaudit_exec_all_entry_files($1_t)
++ domain_dontaudit_exec_all_entry_files($1_usertype)
+
+- files_dontaudit_list_default($1_t)
+- files_dontaudit_read_default_files($1_t)
+ # Stat lost+found.
+- files_getattr_lost_found_dirs($1_t)
++ files_getattr_lost_found_dirs($1_usertype)
+
+- fs_get_all_fs_quotas($1_t)
+- fs_getattr_all_fs($1_t)
+- fs_getattr_all_dirs($1_t)
+- fs_search_auto_mountpoints($1_t)
+- fs_list_inotifyfs($1_t)
+- fs_rw_anon_inodefs_files($1_t)
++ files_dontaudit_list_default($1_usertype)
++ files_dontaudit_read_default_files($1_usertype)
+
+- auth_dontaudit_write_login_records($1_t)
++ fs_get_all_fs_quotas($1_usertype)
++ fs_getattr_all_fs($1_usertype)
++ fs_search_all($1_usertype)
++ fs_list_inotifyfs($1_usertype)
++ fs_rw_anon_inodefs_files($1_usertype)
+
+- application_exec_all($1_t)
++ auth_dontaudit_write_login_records($1_t)
++ auth_rw_cache($1_t)
+
+ # The library functions always try to open read-write first,
+ # then fall back to read-only if it fails.
+- init_dontaudit_rw_utmp($1_t)
++ init_dontaudit_rw_utmp($1_usertype)
+ # Stop warnings about access to /dev/console
+- init_dontaudit_use_fds($1_t)
+- init_dontaudit_use_script_fds($1_t)
++ init_dontaudit_use_fds($1_usertype)
++ init_dontaudit_use_script_fds($1_usertype)
+
+- libs_exec_lib_files($1_t)
++ libs_exec_lib_files($1_usertype)
+
+- logging_dontaudit_getattr_all_logs($1_t)
++ logging_dontaudit_getattr_all_logs($1_usertype)
+
+- miscfiles_read_man_pages($1_t)
+ # for running TeX programs
+- miscfiles_read_tetex_data($1_t)
+- miscfiles_exec_tetex_data($1_t)
++ miscfiles_read_tetex_data($1_usertype)
++ miscfiles_exec_tetex_data($1_usertype)
+
+- seutil_read_config($1_t)
++ seutil_read_config($1_usertype)
++ optional_policy(`
++ cups_read_config($1_usertype)
++ cups_stream_connect($1_usertype)
++ cups_stream_connect_ptal($1_usertype)
++ ')
+
+ optional_policy(`
+- cups_read_config($1_t)
+- cups_stream_connect($1_t)
+- cups_stream_connect_ptal($1_t)
++ kerberos_use($1_usertype)
++ kerberos_connect_524($1_usertype)
+ ')
+
+ optional_policy(`
+- kerberos_use($1_t)
++ mta_dontaudit_read_spool_symlinks($1_usertype)
+ ')
+
+ optional_policy(`
+- mta_dontaudit_read_spool_symlinks($1_t)
++ quota_dontaudit_getattr_db($1_usertype)
+ ')
+
+ optional_policy(`
+- quota_dontaudit_getattr_db($1_t)
++ rpm_read_db($1_usertype)
++ rpm_dontaudit_manage_db($1_usertype)
+ ')
+
+ optional_policy(`
+- rpm_read_db($1_t)
+- rpm_dontaudit_manage_db($1_t)
++ oddjob_run_mkhomedir($1_t, $1_r)
+ ')
+ ')
+
+@@ -846,6 +876,26 @@
+ # Local policy
+ #
+
++ tunable_policy(`user_rw_noexattrfile',`
++ fs_manage_noxattr_fs_files($1_usertype)
++ fs_manage_noxattr_fs_dirs($1_usertype)
++ fs_manage_dos_dirs($1_usertype)
++ fs_manage_dos_files($1_usertype)
++ ')
++
++ optional_policy(`
++ dbus_role_template($1, $1_r, $1_t)
++ dbus_system_bus_client($1_t)
++
++ optional_policy(`
++ consolekit_dbus_chat($1_t)
++ ')
++ optional_policy(`
++ cups_dbus_chat($1_t)
++ cups_dbus_chat_config($1_t)
++ ')
++ ')
++
+ optional_policy(`
+ loadkeys_run($1_t,$1_r)
+ ')
+@@ -876,7 +926,7 @@
+
+ userdom_restricted_user_template($1)
+
+- userdom_xwindows_client_template($1)
++ userdom_xwindows_client($1_usertype)
+
+ ##############################
+ #
+@@ -884,14 +934,16 @@
+ #
+
+ auth_role($1_r, $1_t)
+- auth_search_pam_console_data($1_t)
++ auth_search_pam_console_data($1_usertype)
+
+- dev_read_sound($1_t)
+- dev_write_sound($1_t)
++ dev_read_sound($1_usertype)
++ dev_write_sound($1_usertype)
+ # gnome keyring wants to read this.
+- dev_dontaudit_read_rand($1_t)
++ dev_dontaudit_read_rand($1_usertype)
++ # temporarily allow since openoffice requires this
++ dev_read_rand($1_usertype)
+
+- logging_send_syslog_msg($1_t)
++ logging_send_syslog_msg($1_usertype)
+ logging_dontaudit_send_audit_msgs($1_t)
+
+ # Need to to this just so screensaver will work. Should be moved to screensaver domain
+@@ -899,28 +951,19 @@
+ selinux_get_enforce_mode($1_t)
+
+ optional_policy(`
+- alsa_read_rw_config($1_t)
+- ')
+-
+- optional_policy(`
+- dbus_role_template($1, $1_r, $1_t)
+- dbus_system_bus_client($1_t)
+-
+- optional_policy(`
+- consolekit_dbus_chat($1_t)
++ alsa_read_rw_config($1_usertype)
+ ')
+
+ optional_policy(`
+- cups_dbus_chat($1_t)
+- ')
++ apache_role($1_r, $1_usertype)
+ ')
+
+ optional_policy(`
+- java_role($1_r, $1_t)
++ openoffice_role_template($1, $1_r, $1_usertype)
+ ')
+
+ optional_policy(`
+- setroubleshoot_dontaudit_stream_connect($1_t)
++ polkit_role($1_r, $1_usertype)
+ ')
+ ')
+
+@@ -931,8 +974,7 @@
+ ## </summary>
+ ## <desc>
+ ## <p>
+-## The template for creating a unprivileged user roughly
+-## equivalent to a regular linux user.
++## The template containing the most basic rules common to all users.
+ ## </p>
+ ## <p>
+ ## This template creates a user domain, types, and
+@@ -954,8 +996,8 @@
+ # Declarations
+ #
+
++ userdom_restricted_xwindows_user_template($1)
+ # Inherit rules for ordinary users.
+- userdom_restricted_user_template($1)
+ userdom_common_user_template($1)
+
+ ##############################
+@@ -964,11 +1006,10 @@
+ #
+
+ # port access is audited even if dac would not have allowed it, so dontaudit it here
+- corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
++# corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
+ # Need the following rule to allow users to run vpnc
+ corenet_tcp_bind_xserver_port($1_t)
+
+- files_exec_usr_files($1_t)
+ # cjp: why?
+ files_read_kernel_symbol_table($1_t)
+
+@@ -986,36 +1027,37 @@
+ ')
+ ')
+
+- tunable_policy(`user_dmesg',`
+- kernel_read_ring_buffer($1_t)
+- ',`
+- kernel_dontaudit_read_ring_buffer($1_t)
+- ')
+-
+ # Allow users to run TCP servers (bind to ports and accept connection from
+ # the same domain and outside users) disabling this forces FTP passive mode
+ # and may change other protocols
+ tunable_policy(`user_tcp_server',`
+ corenet_tcp_bind_all_nodes($1_t)
+- corenet_tcp_bind_generic_port($1_t)
++ corenet_tcp_bind_all_unreserved_ports($1_t)
+ ')
+
++ # Run pppd in pppd_t by default for user
+ optional_policy(`
+- netutils_run_ping_cond($1_t,$1_r)
+- netutils_run_traceroute_cond($1_t,$1_r)
++ ppp_run_cond($1_t, $1_r)
+ ')
+
+ optional_policy(`
+- postgresql_role($1_r,$1_t)
++ games_rw_data($1_usertype)
+ ')
+
+- # Run pppd in pppd_t by default for user
+ optional_policy(`
+- ppp_run_cond($1_t,$1_r)
++ mount_run($1_t, $1_r)
+ ')
+
+ optional_policy(`
+- setroubleshoot_stream_connect($1_t)
++ java_role_template($1, $1_r, $1_t)
++ ')
++
++ optional_policy(`
++ mono_role_template($1, $1_r, $1_t)
++ ')
++
++ optional_policy(`
++ gpg_role($1_r, $1_usertype)
+ ')
+ ')
+
+@@ -1050,7 +1092,7 @@
+ #
+ template(`userdom_admin_user_template',`
+ gen_require(`
+- class passwd { passwd chfn chsh rootok };
++ class passwd { passwd chfn chsh rootok crontab };
+ ')
+
+ ##############################
+@@ -1059,8 +1101,7 @@
+ #
+
+ # Inherit rules for ordinary users.
+- userdom_login_user_template($1)
+- userdom_common_user_template($1)
++ userdom_unpriv_user_template($1)
+
+ domain_obj_id_change_exemption($1_t)
+ role system_r types $1_t;
+@@ -1083,7 +1124,8 @@
+ # Skip authentication when pam_rootok is specified.
+ allow $1_t self:passwd rootok;
+
+- allow $1_t self:netlink_audit_socket nlmsg_readpriv;
++ # Manipulate other users crontab.
++ allow $1_t self:passwd crontab;
+
+ kernel_read_software_raid_state($1_t)
+ kernel_getattr_core_if($1_t)
+@@ -1106,8 +1148,6 @@
+
+ dev_getattr_generic_blk_files($1_t)
+ dev_getattr_generic_chr_files($1_t)
+- # for lsof
+- dev_getattr_mtrr_dev($1_t)
+ # Allow MAKEDEV to work
+ dev_create_all_blk_files($1_t)
+ dev_create_all_chr_files($1_t)
+@@ -1162,20 +1202,6 @@
+ # But presently necessary for installing the file_contexts file.
+ seutil_manage_bin_policy($1_t)
+
+- userdom_manage_user_home_content_dirs($1_t)
+- userdom_manage_user_home_content_files($1_t)
+- userdom_manage_user_home_content_symlinks($1_t)
+- userdom_manage_user_home_content_pipes($1_t)
+- userdom_manage_user_home_content_sockets($1_t)
+- userdom_user_home_dir_filetrans_user_home_content($1_t, { dir file lnk_file fifo_file sock_file })
+-
+- tunable_policy(`user_rw_noexattrfile',`
+- fs_manage_noxattr_fs_files($1_t)
+- fs_manage_noxattr_fs_dirs($1_t)
+- ',`
+- fs_read_noxattr_fs_files($1_t)
+- ')
+-
+ optional_policy(`
+ postgresql_unconfined($1_t)
+ ')
+@@ -1221,6 +1247,7 @@
+ dev_relabel_all_dev_nodes($1)
+
+ files_create_boot_flag($1)
++ files_create_default_dir($1)
+
+ # Necessary for managing /boot/efi
+ fs_manage_dos_files($1)
+@@ -1291,6 +1318,8 @@
+ allow $1 user_home_t:filesystem associate;
+ files_type($1)
+ ubac_constrained($1)
++
++ files_poly_member($1)
+ ')
+
+ ########################################
+@@ -1387,7 +1416,7 @@
+
+ ########################################
+ ## <summary>
+-## Search user home directories.
++## dontaudit Search user home directories.
+ ## </summary>
+ ## <param name="domain">
+ ## <summary>
+@@ -1420,6 +1449,14 @@
+
+ allow $1 user_home_dir_t:dir list_dir_perms;
+ files_search_home($1)
++
++ tunable_policy(`use_nfs_home_dirs',`
++ fs_list_nfs($1)
++ ')
++
++ tunable_policy(`use_samba_home_dirs',`
++ fs_list_cifs($1)
++ ')
+ ')
+
+ ########################################
+@@ -1435,9 +1472,11 @@
+ interface(`userdom_dontaudit_list_user_home_dirs',`
+ gen_require(`
+ type user_home_dir_t;
++ type user_home_t;
+ ')
+
+ dontaudit $1 user_home_dir_t:dir list_dir_perms;
++ dontaudit $1 user_home_t:dir list_dir_perms;
+ ')
+
+ ########################################
+@@ -1494,6 +1533,25 @@
+ allow $1 user_home_dir_t:dir relabelto;
+ ')
+
++
++########################################
++## <summary>
++## Relabel to user home files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_relabelto_user_home_files',`
++ gen_require(`
++ type user_home_t;
++ ')
++
++ allow $1 user_home_t:file relabelto;
++')
++
+ ########################################
+ ## <summary>
+ ## Create directories in the home dir root with
+@@ -1547,9 +1605,9 @@
+ type user_home_dir_t, user_home_t;
+ ')
+
+- domain_auto_trans($1, user_home_t, $2)
+- allow $1 user_home_dir_t:dir search_dir_perms;
+ files_search_home($1)
++ allow $1 user_home_dir_t:dir search_dir_perms;
++ domain_auto_trans($1, user_home_t, $2)
+ ')
+
+ ########################################
+@@ -1568,6 +1626,8 @@
+ ')
+
+ dontaudit $1 user_home_t:dir search_dir_perms;
++ fs_dontaudit_list_nfs($1)
++ fs_dontaudit_list_cifs($1)
+ ')
+
+ ########################################
+@@ -1741,6 +1801,62 @@
+
+ ########################################
+ ## <summary>
++## Delete user home subdirectory symbolic links.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_delete_user_home_content_symlinks',`
++ gen_require(`
++ type user_home_t;
++ ')
++
++ allow $1 user_home_t:lnk_file delete_lnk_file_perms;
++')
++
++########################################
++## <summary>
++## Delete files
++## in a user home subdirectory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_delete_user_home_content_files',`
++ gen_require(`
++ type user_home_t;
++ ')
++
++ allow $1 user_home_t:dir delete_file_perms;
++')
++
++########################################
++## <summary>
++## Dontaudit Delete files
++## in a user home subdirectory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_dontaudit_delete_user_home_content_files',`
++ gen_require(`
++ type user_home_t;
++ ')
++
++ allow $1 user_home_t:dir delete_file_perms;
++')
++
++########################################
++## <summary>
+ ## Execute user home files.
+ ## </summary>
+ ## <param name="domain">
+@@ -1757,14 +1873,6 @@
+
+ files_search_home($1)
+ exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
+-
+- tunable_policy(`use_nfs_home_dirs',`
+- fs_exec_nfs_files($1)
+- ')
+-
+- tunable_policy(`use_samba_home_dirs',`
+- fs_exec_cifs_files($1)
+- ')
+ ')
+
+ ########################################
+@@ -1787,6 +1895,46 @@
+
+ ########################################
+ ## <summary>
++## Delete directories
++## in a user home subdirectory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_delete_user_home_content_dirs',`
++ gen_require(`
++ type user_home_t;
++ ')
++
++ allow $1 user_home_t:dir delete_dir_perms;
++')
++
++########################################
++## <summary>
++## Append files
++## in a user home subdirectory.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_append_user_home_content_files',`
++ gen_require(`
++ type user_home_dir_t, user_home_t;
++ ')
++
++ append_files_pattern($1, user_home_t, user_home_t)
++ allow $1 user_home_dir_t:dir search_dir_perms;
++ files_search_home($1)
++')
++
++########################################
++## <summary>
+ ## Create, read, write, and delete files
+ ## in a user home subdirectory.
+ ## </summary>
+@@ -2819,6 +2967,24 @@
+
+ ########################################
+ ## <summary>
++## Delete all users files in /tmp
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_delete_user_tmp_files',`
++ gen_require(`
++ type user_tmp_t;
++ ')
++
++ allow $1 user_tmp_t:file delete_file_perms;
++')
++
++########################################
++## <summary>
+ ## Do not audit attempts to use user ttys.
+ ## </summary>
+ ## <param name="domain">
+@@ -2965,6 +3131,24 @@
+
+ ########################################
+ ## <summary>
++## Manage keys for all user domains.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_manage_all_users_keys',`
++ gen_require(`
++ attribute userdomain;
++ ')
++
++ allow $1 userdomain:key manage_key_perms;
++')
++
++########################################
++## <summary>
+ ## Send a dbus message to all user domains.
+ ## </summary>
+ ## <param name="domain">
+@@ -2981,3 +3165,226 @@
+
+ allow $1 userdomain:dbus send_msg;
+ ')
++
++########################################
++## <summary>
++## Allow apps to set rlimits on userdomain
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_set_rlimitnh',`
++ gen_require(`
++ attribute userdomain;
++ ')
++
++ allow $1 userdomain:process rlimitinh;
++')
++
++########################################
++## <summary>
++## Define this type as a Allow apps to set rlimits on userdomain
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++template(`userdom_unpriv_usertype',`
++ gen_require(`
++ attribute unpriv_userdomain, userdomain;
++ attribute $1_usertype;
++ ')
++ typeattribute $2 $1_usertype;
++ typeattribute $2 unpriv_userdomain;
++ typeattribute $2 userdomain;
++
++ ubac_constrained($2)
++')
++
++
++#######################################
++## <summary>
++## The template for creating a unprivileged user roughly
++## equivalent to a regular linux user.
++## </summary>
++## <desc>
++## <p>
++## The template for creating a unprivileged user roughly
++## equivalent to a regular linux user.
++## </p>
++## <p>
++## This template creates a user domain, types, and
++## rules for the user's tty, pty, home directories,
++## tmp, and tmpfs files.
++## </p>
++## </desc>
++## <param name="userdomain_prefix">
++## <summary>
++## The prefix of the user domain (e.g., user
++## is the prefix for user_t).
++## </summary>
++## </param>
++#
++template(`userdom_admin_login_user_template',`
++
++ userdom_unpriv_user_template($1)
++
++ domain_read_all_domains_state($1_t)
++ domain_getattr_all_domains($1_t)
++
++ files_read_kernel_modules($1_t)
++
++ kernel_read_fs_sysctls($1_t)
++
++ modutils_read_module_config($1_t)
++ modutils_read_module_deps($1_t)
++
++ miscfiles_read_hwdata($1_t)
++
++ sudo_role_template($1, $1_r, $1_t)
++
++ seutil_run_newrole($1_t, $1_r)
++
++ optional_policy(`
++ gnomeclock_dbus_chat($1_t)
++ ')
++
++ optional_policy(`
++ kerneloops_dbus_chat($1_t)
++ ')
++
++ optional_policy(`
++ rpm_dbus_chat($1_t)
++ ')
++
++ optional_policy(`
++ setroubleshoot_stream_connect($1_t)
++ ')
++')
++
++########################################
++## <summary>
++## Connect to users over an unix stream socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_stream_connect',`
++ gen_require(`
++ type user_tmp_t;
++ attribute userdomain;
++ ')
++
++ stream_connect_pattern($1, user_tmp_t, user_tmp_t, userdomain)
++')
++
++########################################
++## <summary>
++## Ptrace user domains.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++## <rolecap/>
++#
++interface(`userdom_ptrace_all_users',`
++ gen_require(`
++ attribute userdomain;
++ ')
++
++ allow $1 userdomain:process ptrace;
++')
++
++########################################
++## <summary>
++## dontaudit Search /root
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_dontaudit_search_admin_dir',`
++ gen_require(`
++ type admin_home_t;
++ ')
++
++ dontaudit $1 admin_home_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++## Allow Search /root
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_search_admin_dir',`
++ gen_require(`
++ type admin_home_t;
++ ')
++
++ allow $1 admin_home_t:dir search_dir_perms;
++')
++
++########################################
++## <summary>
++## RW unpriviledged user SysV sempaphores.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_rw_semaphores',`
++ gen_require(`
++ attribute unpriv_userdomain;
++ ')
++
++ allow $1 unpriv_userdomain:sem rw_sem_perms;
++')
++
++########################################
++## <summary>
++## Send a message to unpriv users over a unix domain
++## datagram socket.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed access.
++## </summary>
++## </param>
++#
++interface(`userdom_dgram_send',`
++ gen_require(`
++ attribute
++ ')
++
++ allow $1 unpriv_userdomain;:unix_dgram_socket sendto;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.1/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te 2008-11-13 18:40:02.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/userdomain.te 2008-11-25 09:45:43.000000000 -0500
+@@ -8,13 +8,6 @@
+
+ ## <desc>
+ ## <p>
+-## Allow users to connect to mysql
+-## </p>
+-## </desc>
+-gen_tunable(allow_user_mysql_connect,false)
+-
+-## <desc>
+-## <p>
+ ## Allow users to connect to PostgreSQL
+ ## </p>
+ ## </desc>
+@@ -29,13 +22,6 @@
+
+ ## <desc>
+ ## <p>
+-## Allow users to read system messages.
+-## </p>
+-## </desc>
+-gen_tunable(user_dmesg,false)
+-
+-## <desc>
+-## <p>
+ ## Allow user to r/w files on filesystems
+ ## that do not have extended attributes (FAT, CDROM, FLOPPY)
+ ## </p>
+@@ -58,6 +44,12 @@
+ attribute untrusted_content_type;
+ attribute untrusted_content_tmp_type;
+
++type admin_home_t;
++files_type(admin_home_t)
++files_associate_tmp(admin_home_t)
++fs_associate_tmpfs(admin_home_t)
++files_mountpoint(admin_home_t)
++
+ type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t secadm_home_dir_t auditadm_home_dir_t unconfined_home_dir_t };
+ fs_associate_tmpfs(user_home_dir_t)
+ files_type(user_home_dir_t)
+@@ -95,3 +87,7 @@
+ type user_tty_device_t alias { staff_tty_device_t sysadm_tty_device_t secadm_tty_device_t auditadm_tty_device_t unconfined_tty_device_t };
+ dev_node(user_tty_device_t)
+ ubac_constrained(user_tty_device_t)
++
++tunable_policy(`allow_console_login',`
++ term_use_console(userdomain)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.1/policy/modules/system/xen.fc
+--- nsaserefpolicy/policy/modules/system/xen.fc 2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/xen.fc 2008-11-25 09:45:43.000000000 -0500
+@@ -2,17 +2,10 @@
+
+ /usr/bin/virsh -- gen_context(system_u:object_r:xm_exec_t,s0)
+
+-ifdef(`distro_debian',`
+-/usr/lib/xen-[^/]*/bin/xenconsoled -- gen_context(system_u:object_r:xenconsoled_exec_t,s0)
+-/usr/lib/xen-[^/]*/bin/xend -- gen_context(system_u:object_r:xend_exec_t,s0)
+-/usr/lib/xen-[^/]*/bin/xenstored -- gen_context(system_u:object_r:xenstored_exec_t,s0)
+-/usr/lib/xen-[^/]*/bin/xm -- gen_context(system_u:object_r:xm_exec_t,s0)
+-',`
+ /usr/sbin/xenconsoled -- gen_context(system_u:object_r:xenconsoled_exec_t,s0)
+ /usr/sbin/xend -- gen_context(system_u:object_r:xend_exec_t,s0)
+ /usr/sbin/xenstored -- gen_context(system_u:object_r:xenstored_exec_t,s0)
+ /usr/sbin/xm -- gen_context(system_u:object_r:xm_exec_t,s0)
+-')
+
+ /var/lib/xen(/.*)? gen_context(system_u:object_r:xend_var_lib_t,s0)
+ /var/lib/xen/images(/.*)? gen_context(system_u:object_r:xen_image_t,s0)
+@@ -27,6 +20,7 @@
+ /var/run/xenconsoled\.pid -- gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
+ /var/run/xend(/.*)? gen_context(system_u:object_r:xend_var_run_t,s0)
+ /var/run/xend\.pid -- gen_context(system_u:object_r:xend_var_run_t,s0)
++/var/run/xenner(/.*)? gen_context(system_u:object_r:xend_var_run_t,s0)
+ /var/run/xenstore\.pid -- gen_context(system_u:object_r:xenstored_var_run_t,s0)
+ /var/run/xenstored(/.*)? gen_context(system_u:object_r:xenstored_var_run_t,s0)
+
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.1/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if 2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.1/policy/modules/system/xen.if 2008-11-25 09:45:43.000000000 -0500
+@@ -167,11 +167,14 @@
+ #
+ interface(`xen_stream_connect',`
+ gen_require(`
+- type xend_t, xend_var_run_t;
++ type xend_t, xend_var_run_t, xend_var_lib_t;
+ ')
+
+ files_search_pids($1)
+ stream_connect_pattern($1,xend_var_run_t,xend_var_run_t,xend_t)
++
++ files_search_var_lib($1)
++ stream_connect_pattern($1, xend_var_lib_t, xend_var_lib_t, xend_t)
+ ')
+
+ ########################################
+@@ -191,3 +194,24 @@
+
+ domtrans_pattern($1,xm_exec_t,xm_t)
+ ')
++
++########################################
++## <summary>
++## Allow the specified domain to read/write
++## xend image files.
++## </summary>
++## <param name="domain">
++## <summary>
++## Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`xen_rw_image_files',`
++ gen_require(`
++ type xen_image_t, xend_var_lib_t;
++ ')
++
++ files_list_var_lib($1)
++ allow $1 xend_var_lib_t:dir search_dir_perms;
++ rw_files_pattern($1, xen_image_t, xen_image_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.1/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te 2008-11-25 09:01:08.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/xen.te 2008-11-25 10:59:58.000000000 -0500
+@@ -1,11 +1,18 @@
+
+-policy_module(xen, 1.7.2)
++policy_module(xen, 1.7.1)
+
+ ########################################
+ #
+ # Declarations
+ #
+
++## <desc>
++## <p>
++## Allow xen to manage nfs files
++## </p>
++## </desc>
++gen_tunable(xen_use_nfs, false)
++
+ # console ptys
+ type xen_devpts_t;
+ term_pty(xen_devpts_t);
+@@ -42,25 +49,31 @@
+ # pid files
+ type xend_var_run_t;
+ files_pid_file(xend_var_run_t)
++files_mountpoint(xend_var_run_t)
+
+ type xenstored_t;
+ type xenstored_exec_t;
+-domain_type(xenstored_t)
+-domain_entry_file(xenstored_t,xenstored_exec_t)
+-role system_r types xenstored_t;
++init_daemon_domain(xenstored_t, xenstored_exec_t)
++
++# tmp files
++type xenstored_tmp_t;
++files_tmp_file(xenstored_tmp_t)
+
+ # var/lib files
+ type xenstored_var_lib_t;
+ files_type(xenstored_var_lib_t)
+
++# log files
++type xenstored_var_log_t;
++logging_log_file(xenstored_var_log_t)
++
+ # pid files
+ type xenstored_var_run_t;
+ files_pid_file(xenstored_var_run_t)
+
+ type xenconsoled_t;
+ type xenconsoled_exec_t;
+-domain_type(xenconsoled_t)
+-domain_entry_file(xenconsoled_t,xenconsoled_exec_t)
++init_daemon_domain(xenconsoled_t, xenconsoled_exec_t)
+ role system_r types xenconsoled_t;
+
+ # pid files
+@@ -95,7 +108,7 @@
+ read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t)
+ rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
+
+-allow xend_t xenctl_t:fifo_file manage_file_perms;
++allow xend_t xenctl_t:fifo_file manage_fifo_file_perms;
+ dev_filetrans(xend_t, xenctl_t, fifo_file)
+
+ manage_files_pattern(xend_t,xend_tmp_t,xend_tmp_t)
+@@ -103,14 +116,14 @@
+ files_tmp_filetrans(xend_t, xend_tmp_t, { file dir })
+
+ # pid file
+-allow xend_t xend_var_run_t:dir setattr;
++manage_dirs_pattern(xend_t, xend_var_run_t, xend_var_run_t)
+ manage_files_pattern(xend_t,xend_var_run_t,xend_var_run_t)
+ manage_sock_files_pattern(xend_t,xend_var_run_t,xend_var_run_t)
+ manage_fifo_files_pattern(xend_t,xend_var_run_t,xend_var_run_t)
+-files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file fifo_file })
++files_pid_filetrans(xend_t, xend_var_run_t, { file sock_file fifo_file dir })
+
+ # log files
+-allow xend_t xend_var_log_t:dir setattr;
++manage_dirs_pattern(xend_t, xend_var_log_t, xend_var_log_t)
+ manage_files_pattern(xend_t,xend_var_log_t,xend_var_log_t)
+ manage_sock_files_pattern(xend_t,xend_var_log_t,xend_var_log_t)
+ logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir })
+@@ -122,12 +135,13 @@
+ manage_fifo_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
+ files_var_lib_filetrans(xend_t,xend_var_lib_t,{ file dir })
+
++init_stream_connect_script(xend_t)
++
+ # transition to store
+ domtrans_pattern(xend_t, xenstored_exec_t, xenstored_t)
+
+ # transition to console
+-domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t)
+-allow xenconsoled_t xend_t:fd use;
++domtrans_pattern(xend_t, xenconsoled_exec_t, xenconsoled_t)
+
+ kernel_read_kernel_sysctls(xend_t)
+ kernel_read_system_state(xend_t)
+@@ -173,6 +187,7 @@
+ files_manage_etc_runtime_files(xend_t)
+ files_etc_filetrans_etc_runtime(xend_t,file)
+ files_read_usr_files(xend_t)
++files_read_default_symlinks(xend_t)
+
+ storage_raw_read_fixed_disk(xend_t)
+ storage_raw_write_fixed_disk(xend_t)
+@@ -208,6 +223,10 @@
+ netutils_domtrans(xend_t)
+
+ optional_policy(`
++ brctl_domtrans(xend_t)
++')
++
++optional_policy(`
+ consoletype_exec(xend_t)
+ ')
+
+@@ -239,6 +258,8 @@
+
+ files_read_usr_files(xenconsoled_t)
+
++fs_list_tmpfs(xenconsoled_t)
++
+ term_create_pty(xenconsoled_t,xen_devpts_t);
+ term_use_generic_ptys(xenconsoled_t)
+ term_use_console(xenconsoled_t)
+@@ -248,7 +269,7 @@
+
+ miscfiles_read_localization(xenconsoled_t)
+
+-xen_append_log(xenconsoled_t)
++xen_manage_log(xenconsoled_t)
+ xen_stream_connect_xenstore(xenconsoled_t)
+
+ ########################################
+@@ -256,15 +277,25 @@
+ # Xen store local policy
+ #
+
+-allow xenstored_t self:capability { dac_override mknod ipc_lock };
++allow xenstored_t self:capability { dac_override mknod ipc_lock sys_resource };
+ allow xenstored_t self:unix_stream_socket create_stream_socket_perms;
+ allow xenstored_t self:unix_dgram_socket create_socket_perms;
+
++manage_files_pattern(xenstored_t, xenstored_tmp_t, xenstored_tmp_t)
++manage_dirs_pattern(xenstored_t, xenstored_tmp_t, xenstored_tmp_t)
++files_tmp_filetrans(xenstored_t, xenstored_tmp_t, { file dir })
++
+ # pid file
+ manage_files_pattern(xenstored_t,xenstored_var_run_t,xenstored_var_run_t)
+ manage_sock_files_pattern(xenstored_t,xenstored_var_run_t,xenstored_var_run_t)
+ files_pid_filetrans(xenstored_t,xenstored_var_run_t, { file sock_file })
+
++# log files
++manage_dirs_pattern(xenstored_t, xenstored_var_log_t, xenstored_var_log_t)
++manage_files_pattern(xenstored_t, xenstored_var_log_t, xenstored_var_log_t)
++manage_sock_files_pattern(xenstored_t, xenstored_var_log_t, xenstored_var_log_t)
++logging_log_filetrans(xenstored_t, xenstored_var_log_t, { sock_file file dir })
++
+ # var/lib files for xenstored
+ manage_dirs_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t)
+ manage_files_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t)
+@@ -312,18 +343,21 @@
+
+ manage_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
+ manage_fifo_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
++manage_sock_files_pattern(xm_t, xend_var_lib_t, xend_var_lib_t)
+ files_search_var_lib(xm_t)
+
+ allow xm_t xen_image_t:dir rw_dir_perms;
+ allow xm_t xen_image_t:file read_file_perms;
+ allow xm_t xen_image_t:blk_file read_blk_file_perms;
+
+-kernel_read_system_state(xm_t)
+ kernel_read_kernel_sysctls(xm_t)
++kernel_read_sysctl(xm_t)
++kernel_read_system_state(xm_t)
+ kernel_read_xen_state(xm_t)
+ kernel_write_xen_state(xm_t)
+
+ corecmd_exec_bin(xm_t)
++corecmd_exec_shell(xm_t)
+
+ corenet_tcp_sendrecv_generic_if(xm_t)
+ corenet_tcp_sendrecv_all_nodes(xm_t)
+@@ -339,15 +373,37 @@
+
+ storage_raw_read_fixed_disk(xm_t)
+
++fs_getattr_all_fs(xm_t)
++
+ term_use_all_terms(xm_t)
+
++init_stream_connect_script(xm_t)
+ init_rw_script_stream_sockets(xm_t)
+ init_use_fds(xm_t)
+
+ miscfiles_read_localization(xm_t)
+
+-sysnet_read_config(xm_t)
++sysnet_dns_name_resolve(xm_t)
+
+ xen_append_log(xm_t)
+ xen_stream_connect(xm_t)
+ xen_stream_connect_xenstore(xm_t)
++
++optional_policy(`
++ virt_manage_images(xm_t)
++')
++
++#Should have a boolean wrapping these
++fs_list_auto_mountpoints(xend_t)
++files_search_mnt(xend_t)
++fs_getattr_all_fs(xend_t)
++fs_read_dos_files(xend_t)
++
++tunable_policy(`xen_use_nfs',`
++ fs_manage_nfs_files(xend_t)
++ fs_read_nfs_symlinks(xend_t)
++')
++
++optional_policy(`
++ unconfined_domain(xend_t)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.1/policy/support/obj_perm_sets.spt
+--- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.6.1/policy/support/obj_perm_sets.spt 2008-11-25 09:45:43.000000000 -0500
+@@ -312,3 +312,13 @@
+ #
+ define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
+ define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }')
++
++define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap }
++')
++
++define(`all_nscd_perms', `{ getserv getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost shmemserv } ')
++define(`all_dbus_perms', `{ acquire_svc send_msg } ')
++define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
++define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
++
++define(`manage_key_perms', `{ create link read search setattr view write } ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.1/policy/users
+--- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.1/policy/users 2008-11-25 09:45:43.000000000 -0500
+@@ -25,11 +25,8 @@
+ # permit any access to such users, then remove this entry.
+ #
+ gen_user(user_u, user, user_r, s0, s0)
+-gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
+-gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats)
+-
+-# Until order dependence is fixed for users:
+-gen_user(unconfined_u, unconfined, unconfined_r, s0, s0 - mls_systemhigh, mcs_allcats)
++gen_user(staff_u, user, staff_r system_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
++gen_user(sysadm_u, user, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats)
+
+ #
+ # The following users correspond to Unix identities.
+@@ -38,8 +35,4 @@
+ # role should use the staff_r role instead of the user_r role when
+ # not in the sysadm_r.
+ #
+-ifdef(`direct_sysadm_daemon',`
+- gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
+-',`
+- gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
+-')
++gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.1/support/Makefile.devel
+--- nsaserefpolicy/support/Makefile.devel 2008-11-11 16:13:50.000000000 -0500
++++ serefpolicy-3.6.1/support/Makefile.devel 2008-11-25 09:45:43.000000000 -0500
+@@ -185,8 +185,7 @@
+ tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
+ @$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"
+ @test -d $(@D) || mkdir -p $(@D)
+- $(call peruser-expansion,$(basename $(@F)),$@.role)
+- $(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
++ $(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp)
+ $(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
+
+ tmp/%.mod.fc: $(m4support) %.fc