diff --git a/policy-20080710.patch b/policy-20080710.patch index 5834d81..1024624 100644 --- a/policy-20080710.patch +++ b/policy-20080710.patch @@ -1,6 +1,6 @@ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.8/Makefile +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.9/Makefile --- nsaserefpolicy/Makefile 2008-08-07 11:15:00.000000000 -0400 -+++ serefpolicy-3.5.8/Makefile 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/Makefile 2008-09-25 08:33:18.000000000 -0400 @@ -311,20 +311,22 @@ # parse-rolemap modulename,outputfile @@ -45,9 +45,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Mak $(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.5.8/Rules.modular +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.9/Rules.modular --- nsaserefpolicy/Rules.modular 2008-08-07 11:15:00.000000000 -0400 -+++ serefpolicy-3.5.8/Rules.modular 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/Rules.modular 2008-09-25 08:33:18.000000000 -0400 @@ -73,8 +73,8 @@ $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te @echo "Compliling $(NAME) $(@F) module" @@ -77,9 +77,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rul $(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.5.8/config/appconfig-mcs/default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.9/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mcs/default_contexts 2008-09-22 15:25:07.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -101,15 +101,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con -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.5.8/config/appconfig-mcs/failsafe_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.9/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mcs/failsafe_context 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/failsafe_context 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/config/appconfig-mcs/guest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.9/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.5.8/config/appconfig-mcs/guest_u_default_contexts 2008-09-22 15:33:55.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/guest_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -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 @@ -117,9 +117,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con +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.5.8/config/appconfig-mcs/root_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.9/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mcs/root_default_contexts 2008-09-22 15:36:05.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/root_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,11 +1,7 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 +system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -134,9 +134,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con # -#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/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.9/config/appconfig-mcs/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mcs/staff_u_default_contexts 2008-09-22 15:33:36.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/staff_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -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 @@ -151,9 +151,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con 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.5.8/config/appconfig-mcs/unconfined_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.9/config/appconfig-mcs/unconfined_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mcs/unconfined_u_default_contexts 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/unconfined_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -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 @@ -161,9 +161,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con +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.5.8/config/appconfig-mcs/user_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.9/config/appconfig-mcs/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mcs/user_u_default_contexts 2008-09-22 15:33:49.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/user_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -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 @@ -176,15 +176,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con - +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.5.8/config/appconfig-mcs/userhelper_context +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.9/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mcs/userhelper_context 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/userhelper_context 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/config/appconfig-mcs/xguest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.9/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.5.8/config/appconfig-mcs/xguest_u_default_contexts 2008-09-22 15:34:01.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mcs/xguest_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -193,9 +193,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con +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.5.8/config/appconfig-mls/default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.9/config/appconfig-mls/default_contexts --- nsaserefpolicy/config/appconfig-mls/default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mls/default_contexts 2008-09-22 15:37:18.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mls/default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,15 +1,6 @@ -system_r:crond_t:s0 user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0 -system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 @@ -217,17 +217,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con -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.5.8/config/appconfig-mls/guest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.9/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.5.8/config/appconfig-mls/guest_u_default_contexts 2008-09-22 15:34:31.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mls/guest_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t:s0 guest_r:guest_t:s0 +system_r:remote_login_t:s0 guest_r:guest_t:s0 +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.5.8/config/appconfig-mls/root_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.9/config/appconfig-mls/root_default_contexts --- nsaserefpolicy/config/appconfig-mls/root_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mls/root_default_contexts 2008-09-22 15:47:13.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mls/root_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,11 +1,11 @@ -system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0 -system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -246,9 +246,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con # -#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/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/staff_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.9/config/appconfig-mls/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mls/staff_u_default_contexts 2008-09-22 15:34:13.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mls/staff_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,7 +1,7 @@ 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 @@ -258,9 +258,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con 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 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/user_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.9/config/appconfig-mls/user_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-mls/user_u_default_contexts 2008-09-22 15:34:21.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mls/user_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,7 +1,7 @@ system_r:local_login_t:s0 user_r:user_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 @@ -270,9 +270,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con 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 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-mls/xguest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.9/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.5.8/config/appconfig-mls/xguest_u_default_contexts 2008-09-22 15:37:37.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-mls/xguest_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,7 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 @@ -281,17 +281,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con +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-standard/guest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.9/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/config/appconfig-standard/guest_u_default_contexts 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-standard/guest_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,4 @@ +system_r:local_login_t guest_r:guest_t +system_r:remote_login_t guest_r:guest_t +system_r:sshd_t guest_r:guest_t +system_r:crond_t guest_r:guest_crond_t -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.9/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-standard/root_default_contexts 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-standard/root_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,11 +1,7 @@ system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t @@ -305,9 +305,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con # -#system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t +system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/staff_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.5.9/config/appconfig-standard/staff_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-standard/staff_u_default_contexts 2008-09-22 15:34:45.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-standard/staff_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,7 +1,7 @@ system_r:local_login_t staff_r:staff_t sysadm_r:sysadm_t system_r:remote_login_t staff_r:staff_t @@ -317,9 +317,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con system_r:xdm_t staff_r:staff_t staff_r:staff_su_t staff_r:staff_t staff_r:staff_sudo_t staff_r:staff_t -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/user_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.9/config/appconfig-standard/user_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.8/config/appconfig-standard/user_u_default_contexts 2008-09-22 15:34:52.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-standard/user_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -1,7 +1,7 @@ system_r:local_login_t user_r:user_t system_r:remote_login_t user_r:user_t @@ -329,18 +329,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con system_r:xdm_t user_r:user_t user_r:user_su_t user_r:user_t user_r:user_sudo_t user_r:user_t -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.9/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/config/appconfig-standard/xguest_u_default_contexts 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/config/appconfig-standard/xguest_u_default_contexts 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t +system_r:remote_login_t xguest_r:xguest_t +system_r:sshd_t xguest_r:xguest_t +system_r:crond_t xguest_r:xguest_crond_t +system_r:xdm_t xguest_r:xguest_t -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.5.8/policy/flask/access_vectors +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.5.9/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2008-08-07 11:15:00.000000000 -0400 -+++ serefpolicy-3.5.8/policy/flask/access_vectors 2008-09-22 13:22:25.000000000 -0400 ++++ serefpolicy-3.5.9/policy/flask/access_vectors 2008-09-25 08:33:18.000000000 -0400 @@ -616,6 +616,7 @@ nlmsg_write nlmsg_relay @@ -349,9 +349,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol } class netlink_ip6fw_socket -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.8/policy/global_tunables +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.9/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/global_tunables 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/global_tunables 2008-09-25 08:33:18.000000000 -0400 @@ -34,7 +34,7 @@ ## @@ -390,9 +390,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +gen_tunable(allow_console_login,false) + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.8/policy/mls ---- nsaserefpolicy/policy/mls 2008-09-05 10:28:20.000000000 -0400 -+++ serefpolicy-3.5.8/policy/mls 2008-09-17 08:49:08.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.9/policy/mls +--- nsaserefpolicy/policy/mls 2008-09-24 09:07:29.000000000 -0400 ++++ serefpolicy-3.5.9/policy/mls 2008-09-25 08:33:18.000000000 -0400 @@ -381,11 +381,18 @@ ( t1 == mlsxwinread )); @@ -413,9 +413,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # No MLS restrictions: x_drawable { show hide override } -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.8/policy/modules/admin/alsa.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.5.9/policy/modules/admin/alsa.te --- nsaserefpolicy/policy/modules/admin/alsa.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/alsa.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/alsa.te 2008-09-25 08:33:18.000000000 -0400 @@ -48,9 +48,12 @@ files_search_home(alsa_t) @@ -429,9 +429,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(alsa_t) libs_use_shared_libs(alsa_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.5.8/policy/modules/admin/amanda.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-3.5.9/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2008-08-14 10:07:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/amanda.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/amanda.te 2008-09-25 08:33:18.000000000 -0400 @@ -129,6 +129,8 @@ corenet_tcp_bind_all_nodes(amanda_t) corenet_udp_bind_all_nodes(amanda_t) @@ -441,9 +441,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol dev_getattr_all_blk_files(amanda_t) dev_getattr_all_chr_files(amanda_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.8/policy/modules/admin/anaconda.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.9/policy/modules/admin/anaconda.te --- nsaserefpolicy/policy/modules/admin/anaconda.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/anaconda.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/anaconda.te 2008-09-25 08:33:18.000000000 -0400 @@ -31,6 +31,7 @@ modutils_domtrans_insmod(anaconda_t) @@ -452,9 +452,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol unprivuser_home_dir_filetrans_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.5.8/policy/modules/admin/certwatch.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.9/policy/modules/admin/certwatch.te --- nsaserefpolicy/policy/modules/admin/certwatch.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/certwatch.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/certwatch.te 2008-09-25 08:33:18.000000000 -0400 @@ -15,8 +15,19 @@ # # Local policy @@ -491,9 +491,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + pcscd_stream_connect(certwatch_t) + pcscd_read_pub_files(certwatch_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.8/policy/modules/admin/consoletype.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.9/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/consoletype.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/consoletype.te 2008-09-25 08:33:18.000000000 -0400 @@ -8,9 +8,11 @@ type consoletype_t; @@ -517,13 +517,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol term_use_all_terms(consoletype_t) init_use_fds(consoletype_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.5.8/policy/modules/admin/firstboot.te ---- nsaserefpolicy/policy/modules/admin/firstboot.te 2008-08-25 09:12:31.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/firstboot.te 2008-09-17 08:49:08.000000000 -0400 -@@ -118,15 +118,7 @@ - usermanage_domtrans_admin_passwd(firstboot_t) - ') +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.5.9/policy/modules/admin/firstboot.te +--- nsaserefpolicy/policy/modules/admin/firstboot.te 2008-09-24 09:07:29.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/firstboot.te 2008-09-25 08:33:18.000000000 -0400 +@@ -120,17 +120,5 @@ + optional_policy(` + xserver_rw_xdm_xserver_shm(firstboot_t) ++ xserver_unconfined(firstboot_t) + ') +- -ifdef(`TODO',` -allow firstboot_t proc_t:file write; - @@ -534,14 +537,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -ifdef(`userhelper.te', ` - role system_r types sysadm_userhelper_t; - domain_auto_trans(firstboot_t, userhelper_exec_t, sysadm_userhelper_t) -+optional_policy(` -+ xserver_xdm_rw_shm(firstboot_t) -+ xserver_unconfined(firstboot_t) - ') +-') -') dnl end TODO -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.8/policy/modules/admin/kismet.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.9/policy/modules/admin/kismet.te --- nsaserefpolicy/policy/modules/admin/kismet.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/kismet.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/kismet.te 2008-09-25 08:33:18.000000000 -0400 @@ -26,7 +26,10 @@ # @@ -562,9 +562,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/admin/logrotate.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.5.9/policy/modules/admin/logrotate.te --- nsaserefpolicy/policy/modules/admin/logrotate.te 2008-09-03 10:17:00.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/logrotate.te 2008-09-23 08:33:35.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/logrotate.te 2008-09-25 08:33:18.000000000 -0400 @@ -97,6 +97,7 @@ files_read_etc_files(logrotate_t) files_read_etc_runtime_files(logrotate_t) @@ -590,9 +590,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - squid_domtrans(logrotate_t) + squid_signal(logrotate_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.5.8/policy/modules/admin/logwatch.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.5.9/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/logwatch.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/logwatch.te 2008-09-25 08:33:18.000000000 -0400 @@ -54,18 +54,19 @@ domain_read_all_domains_state(logwatch_t) @@ -622,9 +622,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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/mrtg.te serefpolicy-3.5.8/policy/modules/admin/mrtg.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.5.9/policy/modules/admin/mrtg.te --- nsaserefpolicy/policy/modules/admin/mrtg.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/mrtg.te 2008-09-23 10:04:14.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/mrtg.te 2008-09-25 08:33:18.000000000 -0400 @@ -78,6 +78,7 @@ dev_read_urand(mrtg_t) @@ -690,9 +690,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - dontaudit mrtg_t { boot_t device_t file_t lost_found_t }:dir getattr; - dontaudit mrtg_t root_t:lnk_file getattr; -') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.if serefpolicy-3.5.8/policy/modules/admin/netutils.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.if serefpolicy-3.5.9/policy/modules/admin/netutils.if --- nsaserefpolicy/policy/modules/admin/netutils.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/netutils.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/netutils.if 2008-09-25 08:33:18.000000000 -0400 @@ -70,7 +70,7 @@ ######################################## @@ -783,9 +783,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.5.8/policy/modules/admin/netutils.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.5.9/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/netutils.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/netutils.te 2008-09-25 08:33:18.000000000 -0400 @@ -50,6 +50,7 @@ files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir }) @@ -905,9 +905,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -optional_policy(` - nscd_socket_use(traceroute_t) -') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.5.8/policy/modules/admin/prelink.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.5.9/policy/modules/admin/prelink.te --- nsaserefpolicy/policy/modules/admin/prelink.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/prelink.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/prelink.te 2008-09-25 08:33:18.000000000 -0400 @@ -26,7 +26,7 @@ # Local policy # @@ -965,9 +965,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + unconfined_domain(prelink_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.5.8/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/readahead.te 2008-09-17 08:49:08.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.5.9/policy/modules/admin/readahead.te +--- nsaserefpolicy/policy/modules/admin/readahead.te 2008-09-24 09:07:29.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/readahead.te 2008-09-25 08:33:18.000000000 -0400 @@ -22,7 +22,7 @@ # Local policy # @@ -977,17 +977,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol dontaudit readahead_t self:capability sys_tty_config; allow readahead_t self:process signal_perms; -@@ -59,6 +59,7 @@ - fs_dontaudit_read_ramfs_pipes(readahead_t) - fs_dontaudit_read_ramfs_files(readahead_t) - fs_read_tmpfs_symlinks(readahead_t) -+fs_list_inotifyfs(readahead_t) - - mls_file_read_all_levels(readahead_t) - -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.5.8/policy/modules/admin/rpm.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.5.9/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/rpm.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/rpm.fc 2008-09-25 08:33:18.000000000 -0400 @@ -11,7 +11,8 @@ /usr/sbin/system-install-packages -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -1016,9 +1008,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # SuSE ifdef(`distro_suse', ` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.5.8/policy/modules/admin/rpm.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.5.9/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/rpm.if 2008-09-22 09:09:03.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/rpm.if 2008-09-25 08:33:18.000000000 -0400 @@ -152,6 +152,24 @@ ######################################## @@ -1324,9 +1316,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/admin/rpm.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.5.9/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/rpm.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/rpm.te 2008-09-25 08:33:18.000000000 -0400 @@ -31,6 +31,9 @@ files_type(rpm_var_lib_t) typealias rpm_var_lib_t alias var_lib_rpm_t; @@ -1479,9 +1471,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` usermanage_domtrans_groupadd(rpm_script_t) usermanage_domtrans_useradd(rpm_script_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.5.8/policy/modules/admin/su.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.5.9/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/su.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/su.if 2008-09-25 08:33:18.000000000 -0400 @@ -41,15 +41,13 @@ allow $2 $1_su_t:process signal; @@ -1637,9 +1629,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ####################################### -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.5.8/policy/modules/admin/sudo.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.5.9/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/sudo.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/sudo.if 2008-09-25 08:33:18.000000000 -0400 @@ -55,7 +55,7 @@ # @@ -1752,9 +1744,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/admin/tmpreaper.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.5.9/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/tmpreaper.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/tmpreaper.te 2008-09-25 08:33:18.000000000 -0400 @@ -22,12 +22,16 @@ dev_read_urand(tmpreaper_t) @@ -1799,9 +1791,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/admin/usermanage.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.5.9/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/usermanage.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/usermanage.te 2008-09-25 08:33:18.000000000 -0400 @@ -97,6 +97,7 @@ # allow checking if a shell is executable @@ -1872,9 +1864,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/admin/vbetool.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.if serefpolicy-3.5.9/policy/modules/admin/vbetool.if --- nsaserefpolicy/policy/modules/admin/vbetool.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/vbetool.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/vbetool.if 2008-09-25 08:33:18.000000000 -0400 @@ -18,3 +18,34 @@ corecmd_search_bin($1) domtrans_pattern($1, vbetool_exec_t, vbetool_t) @@ -1910,9 +1902,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + role $2 types vbetool_t; + allow vbetool_t $3:chr_file rw_term_perms; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.5.8/policy/modules/admin/vbetool.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.5.9/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/vbetool.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/vbetool.te 2008-09-25 08:33:18.000000000 -0400 @@ -23,6 +23,9 @@ dev_rwx_zero(vbetool_t) dev_read_sysfs(vbetool_t) @@ -1932,9 +1924,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/admin/vpn.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.if serefpolicy-3.5.9/policy/modules/admin/vpn.if --- nsaserefpolicy/policy/modules/admin/vpn.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/vpn.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/vpn.if 2008-09-25 08:33:18.000000000 -0400 @@ -48,6 +48,7 @@ vpn_domtrans($1) role $2 types vpnc_t; @@ -1943,9 +1935,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.5.8/policy/modules/admin/vpn.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.5.9/policy/modules/admin/vpn.te --- nsaserefpolicy/policy/modules/admin/vpn.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/admin/vpn.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/admin/vpn.te 2008-09-25 08:33:18.000000000 -0400 @@ -22,9 +22,10 @@ # Local policy # @@ -1967,18 +1959,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol sysnet_etc_filetrans_config(vpnc_t) sysnet_manage_config(vpnc_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.fc serefpolicy-3.5.8/policy/modules/apps/ethereal.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.fc serefpolicy-3.5.9/policy/modules/apps/ethereal.fc --- nsaserefpolicy/policy/modules/apps/ethereal.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/ethereal.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/ethereal.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,4 +1,4 @@ -HOME_DIR/\.ethereal(/.*)? gen_context(system_u:object_r:ROLE_ethereal_home_t,s0) +HOME_DIR/\.ethereal(/.*)? gen_context(system_u:object_r:ethereal_home_t,s0) /usr/sbin/ethereal.* -- gen_context(system_u:object_r:ethereal_exec_t,s0) /usr/sbin/tethereal.* -- gen_context(system_u:object_r:tethereal_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.if serefpolicy-3.5.8/policy/modules/apps/ethereal.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.if serefpolicy-3.5.9/policy/modules/apps/ethereal.if --- nsaserefpolicy/policy/modules/apps/ethereal.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/ethereal.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/ethereal.if 2008-09-25 08:33:18.000000000 -0400 @@ -35,6 +35,7 @@ template(`ethereal_per_role_template',` @@ -2082,9 +2074,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ####################################### -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.te serefpolicy-3.5.8/policy/modules/apps/ethereal.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.te serefpolicy-3.5.9/policy/modules/apps/ethereal.te --- nsaserefpolicy/policy/modules/apps/ethereal.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/ethereal.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/ethereal.te 2008-09-25 08:33:18.000000000 -0400 @@ -16,6 +16,13 @@ type tethereal_tmp_t; files_tmp_file(tethereal_tmp_t) @@ -2099,9 +2091,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # Tethereal policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.5.8/policy/modules/apps/games.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.5.9/policy/modules/apps/games.if --- nsaserefpolicy/policy/modules/apps/games.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/games.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/games.if 2008-09-25 08:33:18.000000000 -0400 @@ -130,10 +130,10 @@ sysnet_read_config($1_games_t) @@ -2141,9 +2133,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/apps/gnome.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.5.9/policy/modules/apps/gnome.fc --- nsaserefpolicy/policy/modules/apps/gnome.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/gnome.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/gnome.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,8 +1,10 @@ -HOME_DIR/\.config/gtk-.* gen_context(system_u:object_r:ROLE_gnome_home_t,s0) -HOME_DIR/\.gconf(d)?(/.*)? gen_context(system_u:object_r:ROLE_gconf_home_t,s0) @@ -2161,9 +2153,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +# Don't use because toolchain is broken +#/usr/libexec/gconfd-2 -- gen_context(system_u:object_r:gconfd_exec_t,s0) +HOME_DIR/.pulse(/.*)? gen_context(system_u:object_r:gnome_home_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.5.8/policy/modules/apps/gnome.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.5.9/policy/modules/apps/gnome.if --- nsaserefpolicy/policy/modules/apps/gnome.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/gnome.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/gnome.if 2008-09-25 08:33:18.000000000 -0400 @@ -36,6 +36,7 @@ gen_require(` type gconfd_exec_t, gconf_etc_t; @@ -2411,9 +2403,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + # 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.5.8/policy/modules/apps/gnome.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.5.9/policy/modules/apps/gnome.te --- nsaserefpolicy/policy/modules/apps/gnome.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/gnome.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/gnome.te 2008-09-25 08:33:18.000000000 -0400 @@ -8,8 +8,34 @@ attribute gnomedomain; @@ -2452,9 +2444,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +# Local Policy +# + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.5.8/policy/modules/apps/gpg.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.5.9/policy/modules/apps/gpg.fc --- nsaserefpolicy/policy/modules/apps/gpg.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/gpg.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/gpg.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,9 +1,9 @@ -HOME_DIR/\.gnupg(/.+)? gen_context(system_u:object_r:ROLE_gpg_secret_t,s0) +HOME_DIR/\.gnupg(/.+)? gen_context(system_u:object_r:gpg_secret_t,s0) @@ -2469,9 +2461,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -/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.if serefpolicy-3.5.8/policy/modules/apps/gpg.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.5.9/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/gpg.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/gpg.if 2008-09-25 08:33:18.000000000 -0400 @@ -37,6 +37,9 @@ template(`gpg_per_role_template',` gen_require(` @@ -2808,9 +2800,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.5.8/policy/modules/apps/gpg.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.5.9/policy/modules/apps/gpg.te --- nsaserefpolicy/policy/modules/apps/gpg.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/gpg.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/gpg.te 2008-09-25 08:33:18.000000000 -0400 @@ -15,15 +15,253 @@ gen_tunable(gpg_agent_env_file, false) @@ -3069,9 +3061,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + xserver_stream_connect_xdm_xserver(gpg_pinentry_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.5.8/policy/modules/apps/java.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.5.9/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/java.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/java.fc 2008-09-25 08:33:18.000000000 -0400 @@ -3,14 +3,15 @@ # /opt/(.*/)?bin/java[^/]* -- gen_context(system_u:object_r:java_exec_t,s0) @@ -3103,9 +3095,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.5.8/policy/modules/apps/java.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.5.9/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/java.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/java.if 2008-09-25 08:33:18.000000000 -0400 @@ -32,7 +32,7 @@ ## ## @@ -3379,9 +3371,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + ca_exec($1, java_exec_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.5.8/policy/modules/apps/java.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.5.9/policy/modules/apps/java.te --- nsaserefpolicy/policy/modules/apps/java.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/java.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/java.te 2008-09-25 08:33:18.000000000 -0400 @@ -6,16 +6,10 @@ # Declarations # @@ -3428,18 +3420,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + +optional_policy(` -+ xserver_xdm_rw_shm(java_t) ++ xserver_rw_xdm_xserver_shm(java_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.5.8/policy/modules/apps/livecd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.5.9/policy/modules/apps/livecd.fc --- nsaserefpolicy/policy/modules/apps/livecd.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/livecd.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/livecd.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/apps/livecd.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.if serefpolicy-3.5.9/policy/modules/apps/livecd.if --- nsaserefpolicy/policy/modules/apps/livecd.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/livecd.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/livecd.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,56 @@ + +## policy for livecd @@ -3497,9 +3489,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + seutil_run_setfiles_mac(livecd_t, $2, $3) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.5.8/policy/modules/apps/livecd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.5.9/policy/modules/apps/livecd.te --- nsaserefpolicy/policy/modules/apps/livecd.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/livecd.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/livecd.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,26 @@ +policy_module(livecd, 1.0.0) + @@ -3527,9 +3519,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + +seutil_domtrans_setfiles_mac(livecd_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.5.8/policy/modules/apps/loadkeys.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.5.9/policy/modules/apps/loadkeys.te --- nsaserefpolicy/policy/modules/apps/loadkeys.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/loadkeys.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/loadkeys.te 2008-09-25 08:33:18.000000000 -0400 @@ -32,7 +32,6 @@ term_dontaudit_use_console(loadkeys_t) term_use_unallocated_ttys(loadkeys_t) @@ -3546,9 +3538,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +unprivuser_dontaudit_write_home_content_files(loadkeys_t) +unprivuser_dontaudit_list_home_dirs(loadkeys_t) +sysadm_dontaudit_list_home_dirs(loadkeys_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.5.8/policy/modules/apps/mono.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.5.9/policy/modules/apps/mono.if --- nsaserefpolicy/policy/modules/apps/mono.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mono.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mono.if 2008-09-25 08:33:18.000000000 -0400 @@ -21,7 +21,106 @@ ######################################## @@ -3666,9 +3658,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') corecmd_search_bin($1) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.5.8/policy/modules/apps/mono.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.5.9/policy/modules/apps/mono.te --- nsaserefpolicy/policy/modules/apps/mono.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mono.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mono.te 2008-09-25 08:33:18.000000000 -0400 @@ -15,7 +15,7 @@ # Local policy # @@ -3684,11 +3676,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') + +optional_policy(` -+ xserver_xdm_rw_shm(mono_t) ++ xserver_rw_xdm_xserver_shm(mono_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.5.8/policy/modules/apps/mozilla.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.5.9/policy/modules/apps/mozilla.fc --- nsaserefpolicy/policy/modules/apps/mozilla.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mozilla.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mozilla.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,8 +1,8 @@ -HOME_DIR/\.galeon(/.*)? gen_context(system_u:object_r:ROLE_mozilla_home_t,s0) -HOME_DIR/\.java(/.*)? gen_context(system_u:object_r:ROLE_mozilla_home_t,s0) @@ -3717,9 +3709,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.5.8/policy/modules/apps/mozilla.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.5.9/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mozilla.if 2008-09-17 19:50:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mozilla.if 2008-09-25 08:33:18.000000000 -0400 @@ -35,7 +35,10 @@ template(`mozilla_per_role_template',` gen_require(` @@ -4197,9 +4189,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + allow $2 $1_mozilla_t:unix_stream_socket connectto; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.5.8/policy/modules/apps/mozilla.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.5.9/policy/modules/apps/mozilla.te --- nsaserefpolicy/policy/modules/apps/mozilla.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mozilla.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mozilla.te 2008-09-25 08:33:18.000000000 -0400 @@ -6,15 +6,20 @@ # Declarations # @@ -4228,9 +4220,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +typealias mozilla_tmp_t alias unconfined_mozilla_tmp_t; +typealias mozilla_home_t alias user_mozilla_home_t; +typealias mozilla_tmp_t alias user_mozilla_tmp_t; -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.5.8/policy/modules/apps/mplayer.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.5.9/policy/modules/apps/mplayer.fc --- nsaserefpolicy/policy/modules/apps/mplayer.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mplayer.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mplayer.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,13 +1,8 @@ # -# /etc @@ -4246,9 +4238,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -HOME_DIR/\.mplayer(/.*)? gen_context(system_u:object_r:ROLE_mplayer_home_t,s0) +HOME_DIR/\.mplayer(/.*)? gen_context(system_u:object_r:mplayer_home_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.5.8/policy/modules/apps/mplayer.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.5.9/policy/modules/apps/mplayer.if --- nsaserefpolicy/policy/modules/apps/mplayer.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mplayer.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mplayer.if 2008-09-25 08:33:18.000000000 -0400 @@ -34,7 +34,8 @@ # template(`mplayer_per_role_template',` @@ -4391,9 +4383,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - read_files_pattern($2, $1_mplayer_home_t, $1_mplayer_home_t) + read_files_pattern($2, mplayer_home_t, mplayer_home_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-3.5.8/policy/modules/apps/mplayer.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-3.5.9/policy/modules/apps/mplayer.te --- nsaserefpolicy/policy/modules/apps/mplayer.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/mplayer.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/mplayer.te 2008-09-25 08:33:18.000000000 -0400 @@ -22,3 +22,7 @@ type mplayer_exec_t; corecmd_executable_file(mplayer_exec_t) @@ -4402,9 +4394,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +type mplayer_home_t alias user_mplayer_rw_t; +userdom_user_home_content(user, mplayer_home_t) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.5.8/policy/modules/apps/nsplugin.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.5.9/policy/modules/apps/nsplugin.fc --- nsaserefpolicy/policy/modules/apps/nsplugin.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/nsplugin.fc 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,8 @@ + +/usr/lib(64)?/nspluginwrapper/npviewer.bin -- gen_context(system_u:object_r:nsplugin_exec_t,s0) @@ -4414,9 +4406,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.8/policy/modules/apps/nsplugin.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.9/policy/modules/apps/nsplugin.if --- nsaserefpolicy/policy/modules/apps/nsplugin.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.if 2008-09-22 15:35:16.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/nsplugin.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,293 @@ + +## policy for nsplugin @@ -4711,9 +4703,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.5.8/policy/modules/apps/nsplugin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.5.9/policy/modules/apps/nsplugin.te --- nsaserefpolicy/policy/modules/apps/nsplugin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/nsplugin.te 2008-09-22 14:52:12.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/nsplugin.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,234 @@ + +policy_module(nsplugin, 1.0.0) @@ -4872,7 +4864,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +optional_policy(` + xserver_stream_connect_xdm_xserver(nsplugin_t) -+ xserver_xdm_rw_shm(nsplugin_t) ++ xserver_rw_xdm_xserver_shm(nsplugin_t) + xserver_read_xdm_tmp_files(nsplugin_t) + xserver_read_xdm_pid(nsplugin_t) + xserver_read_user_xauth(user, nsplugin_t) @@ -4949,16 +4941,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + mozilla_read_user_home_files(user, nsplugin_config_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.5.8/policy/modules/apps/openoffice.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.5.9/policy/modules/apps/openoffice.fc --- nsaserefpolicy/policy/modules/apps/openoffice.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/openoffice.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/openoffice.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/apps/openoffice.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.5.9/policy/modules/apps/openoffice.if --- nsaserefpolicy/policy/modules/apps/openoffice.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/openoffice.if 2008-09-17 19:53:21.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/openoffice.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,106 @@ +## Openoffice + @@ -5066,9 +5058,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 $1_openoffice_t:process { signal sigkill }; + allow $1_openoffice_t $2:unix_stream_socket connectto; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.5.8/policy/modules/apps/openoffice.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.5.9/policy/modules/apps/openoffice.te --- nsaserefpolicy/policy/modules/apps/openoffice.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/openoffice.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/openoffice.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,14 @@ + +policy_module(openoffice, 1.0.0) @@ -5084,17 +5076,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.fc serefpolicy-3.5.8/policy/modules/apps/podsleuth.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.fc serefpolicy-3.5.9/policy/modules/apps/podsleuth.fc --- nsaserefpolicy/policy/modules/apps/podsleuth.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/podsleuth.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/apps/podsleuth.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.if serefpolicy-3.5.9/policy/modules/apps/podsleuth.if --- nsaserefpolicy/policy/modules/apps/podsleuth.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/podsleuth.if 2008-09-25 08:33:18.000000000 -0400 @@ -16,4 +16,38 @@ ') @@ -5134,9 +5126,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + dontaudit podsleuth_t $3:chr_file rw_term_perms; +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.5.8/policy/modules/apps/podsleuth.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.5.9/policy/modules/apps/podsleuth.te --- nsaserefpolicy/policy/modules/apps/podsleuth.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/podsleuth.te 2008-09-22 16:03:15.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/podsleuth.te 2008-09-25 08:33:18.000000000 -0400 @@ -11,24 +11,55 @@ application_domain(podsleuth_t, podsleuth_exec_t) role system_r types podsleuth_t; @@ -5195,18 +5187,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol miscfiles_read_localization(podsleuth_t) dbus_system_bus_client_template(podsleuth, podsleuth_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.5.8/policy/modules/apps/qemu.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.5.9/policy/modules/apps/qemu.fc --- nsaserefpolicy/policy/modules/apps/qemu.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/qemu.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/qemu.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/apps/qemu.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.5.9/policy/modules/apps/qemu.if --- nsaserefpolicy/policy/modules/apps/qemu.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/qemu.if 2008-09-17 08:49:08.000000000 -0400 -@@ -48,6 +48,48 @@ ++++ serefpolicy-3.5.9/policy/modules/apps/qemu.if 2008-09-25 08:43:07.000000000 -0400 +@@ -48,6 +48,91 @@ allow qemu_t $3:chr_file rw_file_perms; ') @@ -5252,259 +5244,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + xserver_common_app($1, qemu_t) +') + - ######################################## - ## - ## Allow the domain to read state files in /proc. -@@ -104,7 +146,71 @@ - - ######################################## - ## --## Execute a domain transition to run qemu unconfined. -+## Execute qemu programs in the qemu domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to allow the PAM domain. -+## -+## -+## -+## -+## The type of the terminal allow the PAM domain to use. -+## -+## -+# -+interface(`qemu_runas',` -+ gen_require(` -+ type qemu_t; -+ ') -+ -+ qemu_domtrans($1) -+ allow qemu_t $3:chr_file rw_file_perms; -+') -+ -+######################################## -+## -+## Execute qemu programs in the role. -+## -+## -+## -+## The role to allow the PAM domain. -+## -+## -+# -+interface(`qemu_role',` -+ gen_require(` -+ type qemu_t; -+ ') -+ role $1 types qemu_t; -+') -+ -+######################################## -+## -+## Execute qemu unconfined programs in the role. -+## -+## -+## -+## The role to allow the PAM domain. -+## -+## -+# -+interface(`qemu_unconfined_role',` -+ gen_require(` -+ type qemu_unconfined_t; -+ ') -+ role $1 types qemu_unconfined_t; -+') -+ -+ -+######################################## -+## -+## Execute a domain transition to run qemu. - ## - ## - ## -@@ -122,6 +228,36 @@ - - ######################################## - ## -+## Execute qemu programs in the qemu unconfined domain. -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to allow the PAM domain. -+## -+## -+## -+## -+## The type of the terminal allow the PAM domain to use. -+## -+## -+# -+interface(`qemu_runas_unconfined',` -+ gen_require(` -+ type qemu_unconfined_t; -+ ') -+ -+ qemu_domtrans_unconfined($1) -+ allow qemu_unconfined_t $3:chr_file rw_file_perms; -+') -+ -+ -+######################################## -+## - ## Creates types and rules for a basic - ## qemu process domain. - ## -@@ -132,86 +268,135 @@ - ## - # - template(`qemu_domain_template',` -+ gen_require(` -+ attribute qemutype; -+ ') - -- ############################## -- # -- # Local Policy -- # -- -- type $1_t; -+ type $1_t, qemutype; - domain_type($1_t) - - type $1_tmp_t; - files_tmp_file($1_tmp_t) - -- ############################## -- # -- # Local Policy -- # -+ type $1_tmpfs_t; -+ files_tmpfs_file($1_tmpfs_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; -+ type $1_image_t; -+ virt_image($1_image_t) -+ -+ 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) -+ 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_list_inotifyfs($1_t) -- fs_rw_anon_inodefs_files($1_t) -- fs_rw_tmpfs_files($1_t) -+######################################## -+## -+## Set the schedule on qemu. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`qemu_setsched',` -+ gen_require(` -+ type qemu_t; -+ ') - -- storage_raw_write_removable_device($1_t) -- storage_raw_read_removable_device($1_t) -+ allow $1 qemu_t:process setsched; -+ ') - -- term_use_ptmx($1_t) -- term_getattr_pty_fs($1_t) -- term_use_generic_ptys($1_t) -+######################################## -+## -+## 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(). -+## -+## -+##

-+## Execute qemu_exec_t -+## in the specified domain. This allows -+## the specified domain to qemu programs -+## on these filesystems in the specified -+## domain. -+##

-+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The type of the new process. -+## -+## -+# -+interface(`qemu_spec_domtrans',` -+ gen_require(` -+ type qemu_exec_t; -+ ') - -- libs_use_ld_so($1_t) -- libs_use_shared_libs($1_t) -+ read_lnk_files_pattern($1, qemu_exec_t, qemu_exec_t) -+ domain_transition_pattern($1, qemu_exec_t, $2) - -- miscfiles_read_localization($1_t) -+ allow $3 $1:fd use; -+ allow $3 $1:fifo_file rw_fifo_file_perms; -+ allow $3 $1:process sigchld; -+') - -- sysnet_read_config($1_t) +####################################### +## +## The per role template for the qemu module. @@ -5541,30 +5280,297 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + gen_require(` + type qemu_exec_t; + ') ++ ++ qemu_per_role_template_notrans($1, $2, $3) ++ ++ domtrans_pattern($2, qemu_exec_t, qemu_t) ++ domtrans_pattern($2, qemu_config_exec_t, qemu_config_t) ++ ') ++ + ######################################## + ## + ## Allow the domain to read state files in /proc. +@@ -68,6 +153,64 @@ + + ######################################## + ## ++## Set the schedule on qemu. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`qemu_setsched',` ++ gen_require(` ++ type qemu_t; ++ ') ++ ++ allow $1 qemu_t:process setsched; ++') ++ ++######################################## ++## ++## 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(). ++## ++## ++##

++## Execute qemu_exec_t ++## in the specified domain. This allows ++## the specified domain to qemu programs ++## on these filesystems in the specified ++## domain. ++##

++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The type of the new process. ++## ++## ++# ++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; ++') ++ ++######################################## ++## + ## Send a signal to qemu. + ## + ## +@@ -104,7 +247,71 @@ + + ######################################## + ## +-## Execute a domain transition to run qemu unconfined. ++## Execute qemu programs in the qemu domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to allow the PAM domain. ++## ++## ++## ++## ++## The type of the terminal allow the PAM domain to use. ++## ++## ++# ++interface(`qemu_runas',` ++ gen_require(` ++ type qemu_t; ++ ') ++ ++ qemu_domtrans($1) ++ allow qemu_t $3:chr_file rw_file_perms; ++') ++ ++######################################## ++## ++## Execute qemu programs in the role. ++## ++## ++## ++## The role to allow the PAM domain. ++## ++## ++# ++interface(`qemu_role',` ++ gen_require(` ++ type qemu_t; ++ ') ++ role $1 types qemu_t; ++') ++ ++######################################## ++## ++## Execute qemu unconfined programs in the role. ++## ++## ++## ++## The role to allow the PAM domain. ++## ++## ++# ++interface(`qemu_unconfined_role',` ++ gen_require(` ++ type qemu_unconfined_t; ++ ') ++ role $1 types qemu_unconfined_t; ++') ++ ++ ++######################################## ++## ++## Execute a domain transition to run qemu. + ## + ## + ## +@@ -122,6 +329,36 @@ + + ######################################## + ## ++## Execute qemu programs in the qemu unconfined domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to allow the PAM domain. ++## ++## ++## ++## ++## The type of the terminal allow the PAM domain to use. ++## ++## ++# ++interface(`qemu_runas_unconfined',` ++ gen_require(` ++ type qemu_unconfined_t; ++ ') ++ ++ qemu_domtrans_unconfined($1) ++ allow qemu_unconfined_t $3:chr_file rw_file_perms; ++') ++ ++ ++######################################## ++## + ## Creates types and rules for a basic + ## qemu process domain. + ## +@@ -133,85 +370,32 @@ + # + 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) + +- 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; ++ type $1_image_t; ++ virt_image($1_image_t) ++ ++ 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) +- +- libs_use_ld_so($1_t) +- libs_use_shared_libs($1_t) +- +- miscfiles_read_localization($1_t) +- +- sysnet_read_config($1_t) +- -# optional_policy(` -# samba_domtrans_smb($1_t) -# ') -+ qemu_per_role_template_notrans($1, $2, $3) - +- - optional_policy(` - virt_manage_images($1_t) - virt_read_config($1_t) - virt_read_lib_files($1_t) -+ domtrans_pattern($2, qemu_exec_t, qemu_t) -+ domtrans_pattern($2, qemu_config_exec_t, qemu_config_t) - ') - +- ') +- - optional_policy(` - xserver_stream_connect_xdm_xserver($1_t) - xserver_read_xdm_tmp_files($1_t) - xserver_read_xdm_pid($1_t) -# xserver_xdm_rw_shm($1_t) - ') --') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.8/policy/modules/apps/qemu.te ++ 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 }) + ') +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.9/policy/modules/apps/qemu.te --- nsaserefpolicy/policy/modules/apps/qemu.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/qemu.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/qemu.te 2008-09-25 08:33:18.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -5663,7 +5669,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + xserver_stream_connect_xdm_xserver(qemutype) + xserver_read_xdm_tmp_files(qemutype) + xserver_read_xdm_pid(qemutype) -+ xserver_xdm_rw_shm(qemutype) ++ xserver_rw_xdm_xserver_shm(qemutype) +') + ######################################## @@ -5708,9 +5714,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # qemu_unconfined local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.5.8/policy/modules/apps/screen.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.5.9/policy/modules/apps/screen.fc --- nsaserefpolicy/policy/modules/apps/screen.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/screen.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/screen.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,7 +1,7 @@ # # /home @@ -5720,9 +5726,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # # /usr -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.5.8/policy/modules/apps/screen.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.5.9/policy/modules/apps/screen.if --- nsaserefpolicy/policy/modules/apps/screen.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/screen.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/screen.if 2008-09-25 08:33:18.000000000 -0400 @@ -35,6 +35,7 @@ template(`screen_per_role_template',` gen_require(` @@ -5775,9 +5781,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_system_state($1_screen_t) kernel_read_kernel_sysctls($1_screen_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.te serefpolicy-3.5.8/policy/modules/apps/screen.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.te serefpolicy-3.5.9/policy/modules/apps/screen.te --- nsaserefpolicy/policy/modules/apps/screen.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/screen.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/screen.te 2008-09-25 08:33:18.000000000 -0400 @@ -11,3 +11,7 @@ type screen_exec_t; @@ -5786,18 +5792,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +type user_screen_ro_home_t; +userdom_user_home_content(user, user_screen_ro_home_t) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-3.5.8/policy/modules/apps/thunderbird.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-3.5.9/policy/modules/apps/thunderbird.fc --- nsaserefpolicy/policy/modules/apps/thunderbird.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/thunderbird.fc 2008-09-25 08:33:18.000000000 -0400 @@ -3,4 +3,4 @@ # /usr/bin/thunderbird.* -- gen_context(system_u:object_r:thunderbird_exec_t,s0) -HOME_DIR/\.thunderbird(/.*)? gen_context(system_u:object_r:ROLE_thunderbird_home_t,s0) +HOME_DIR/\.thunderbird(/.*)? gen_context(system_u:object_r:user_thunderbird_home_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-3.5.8/policy/modules/apps/thunderbird.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-3.5.9/policy/modules/apps/thunderbird.if --- nsaserefpolicy/policy/modules/apps/thunderbird.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/thunderbird.if 2008-09-25 08:33:18.000000000 -0400 @@ -43,9 +43,9 @@ application_domain($1_thunderbird_t, thunderbird_exec_t) role $3 types $1_thunderbird_t; @@ -5869,9 +5875,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol userdom_user_home_dir_filetrans($1, $1_thunderbird_t, $1_untrusted_content_tmp_t, { file dir }) userdom_user_home_content_filetrans($1, $1_thunderbird_t, $1_untrusted_content_tmp_t, { file dir }) ',` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.te serefpolicy-3.5.8/policy/modules/apps/thunderbird.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.te serefpolicy-3.5.9/policy/modules/apps/thunderbird.te --- nsaserefpolicy/policy/modules/apps/thunderbird.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/thunderbird.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/thunderbird.te 2008-09-25 08:33:18.000000000 -0400 @@ -8,3 +8,7 @@ type thunderbird_exec_t; @@ -5880,9 +5886,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +type user_thunderbird_home_t alias user_thunderbird_rw_t; +userdom_user_home_content(user, user_thunderbird_home_t) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.if serefpolicy-3.5.8/policy/modules/apps/tvtime.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.if serefpolicy-3.5.9/policy/modules/apps/tvtime.if --- nsaserefpolicy/policy/modules/apps/tvtime.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/tvtime.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/tvtime.if 2008-09-25 08:33:18.000000000 -0400 @@ -35,6 +35,7 @@ template(`tvtime_per_role_template',` gen_require(` @@ -5950,9 +5956,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # Allow the user domain to signal/ps. ps_process_pattern($2,$1_tvtime_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.te serefpolicy-3.5.8/policy/modules/apps/tvtime.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.te serefpolicy-3.5.9/policy/modules/apps/tvtime.te --- nsaserefpolicy/policy/modules/apps/tvtime.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/tvtime.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/tvtime.te 2008-09-25 08:33:18.000000000 -0400 @@ -11,3 +11,9 @@ type tvtime_dir_t; @@ -5963,9 +5969,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +type user_tvtime_tmp_t; +files_tmp_file(user_tvtime_tmp_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc serefpolicy-3.5.8/policy/modules/apps/uml.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc serefpolicy-3.5.9/policy/modules/apps/uml.fc --- nsaserefpolicy/policy/modules/apps/uml.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/uml.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/uml.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,7 +1,7 @@ # # HOME_DIR/ @@ -5975,9 +5981,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # # /usr -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.5.8/policy/modules/apps/vmware.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.5.9/policy/modules/apps/vmware.fc --- nsaserefpolicy/policy/modules/apps/vmware.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/vmware.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/vmware.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,9 +1,9 @@ # # HOME_DIR/ @@ -6036,9 +6042,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /var/run/vmware.* gen_context(system_u:object_r:vmware_var_run_t,s0) +/usr/lib/vmware-tools/sbin32/vmware.* -- gen_context(system_u:object_r:vmware_host_exec_t,s0) +/usr/lib/vmware-tools/sbin64/vmware.* -- gen_context(system_u:object_r:vmware_host_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-3.5.8/policy/modules/apps/vmware.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-3.5.9/policy/modules/apps/vmware.if --- nsaserefpolicy/policy/modules/apps/vmware.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/vmware.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/vmware.if 2008-09-25 08:33:18.000000000 -0400 @@ -47,11 +47,8 @@ domain_entry_file($1_vmware_t, vmware_exec_t) role $3 types $1_vmware_t; @@ -6068,9 +6074,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow $1_vmware_t $1_vmware_tmp_t:file execute; manage_dirs_pattern($1_vmware_t, $1_vmware_tmp_t, $1_vmware_tmp_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.5.8/policy/modules/apps/vmware.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.5.9/policy/modules/apps/vmware.te --- nsaserefpolicy/policy/modules/apps/vmware.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/vmware.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/vmware.te 2008-09-25 08:33:18.000000000 -0400 @@ -10,14 +10,14 @@ type vmware_exec_t; corecmd_executable_file(vmware_exec_t) @@ -6137,13 +6143,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + +optional_policy(` -+ xserver_xdm_rw_shm(vmware_host_t) ++ xserver_rw_xdm_xserver_shm(vmware_host_t) +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.5.8/policy/modules/apps/wine.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.5.9/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/wine.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/wine.if 2008-09-25 08:33:18.000000000 -0400 @@ -49,3 +49,53 @@ role $2 types wine_t; allow wine_t $3:chr_file rw_term_perms; @@ -6195,12 +6201,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + domtrans_pattern($2, wine_exec_t, $1_wine_t) + + optional_policy(` -+ xserver_xdm_rw_shm($1_wine_t) ++ xserver_rw_xdm_xserver_shm($1_wine_t) + ') +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.5.8/policy/modules/apps/wine.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.5.9/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/wine.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/wine.te 2008-09-25 08:33:18.000000000 -0400 @@ -9,6 +9,7 @@ type wine_t; type wine_exec_t; @@ -6225,11 +6231,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') + +optional_policy(` -+ xserver_xdm_rw_shm(wine_t) ++ xserver_rw_xdm_xserver_shm(wine_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wireshark.if serefpolicy-3.5.8/policy/modules/apps/wireshark.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wireshark.if serefpolicy-3.5.9/policy/modules/apps/wireshark.if --- nsaserefpolicy/policy/modules/apps/wireshark.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/apps/wireshark.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/wireshark.if 2008-09-25 08:33:18.000000000 -0400 @@ -134,7 +134,7 @@ sysnet_read_config($1_wireshark_t) @@ -6239,16 +6245,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs($1_wireshark_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.fc serefpolicy-3.5.8/policy/modules/apps/wm.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.fc serefpolicy-3.5.9/policy/modules/apps/wm.fc --- nsaserefpolicy/policy/modules/apps/wm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/wm.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/wm.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/apps/wm.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.if serefpolicy-3.5.9/policy/modules/apps/wm.if --- nsaserefpolicy/policy/modules/apps/wm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/wm.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/wm.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,160 @@ +## Window Manager. + @@ -6410,9 +6416,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + manage_lnk_files_pattern($1_wm_t, $2_xserver_tmp_t, $2_xserver_tmp_t) + allow $1_wm_t security_xext_t:x_extension { query use }; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.5.8/policy/modules/apps/wm.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.5.9/policy/modules/apps/wm.te --- nsaserefpolicy/policy/modules/apps/wm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/apps/wm.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/apps/wm.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,10 @@ +policy_module(wm,0.0.4) + @@ -6424,9 +6430,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +type wm_exec_t; + +wm_domain_template(user,xdm) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.5.8/policy/modules/kernel/corecommands.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.5.9/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/corecommands.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/corecommands.fc 2008-09-25 08:33:18.000000000 -0400 @@ -129,6 +129,8 @@ /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0) ') @@ -6463,9 +6469,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.5.8/policy/modules/kernel/corecommands.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.5.9/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/corecommands.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/corecommands.if 2008-09-25 08:33:18.000000000 -0400 @@ -894,6 +894,7 @@ read_lnk_files_pattern($1, bin_t, bin_t) @@ -6474,9 +6480,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.5.8/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-09-05 10:28:20.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/corenetwork.te.in 2008-09-17 08:49:08.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.5.9/policy/modules/kernel/corenetwork.te.in +--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-09-24 09:07:27.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/corenetwork.te.in 2008-09-25 08:33:18.000000000 -0400 @@ -75,6 +75,7 @@ network_port(aol, udp,5190,s0, tcp,5190,s0, udp,5191,s0, tcp,5191,s0, udp,5192,s0, tcp,5192,s0, udp,5193,s0, tcp,5193,s0) network_port(apcupsd, tcp,3551,s0, udp,3551,s0) @@ -6511,12 +6517,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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) -@@ -135,10 +140,13 @@ +@@ -135,11 +140,13 @@ network_port(pegasus_http, tcp,5988,s0) network_port(pegasus_https, tcp,5989,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(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) @@ -6525,7 +6531,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol network_port(printer, tcp,515,s0) network_port(ptal, tcp,5703,s0) network_port(pxe, udp,4011,s0) -@@ -156,7 +164,7 @@ +@@ -157,7 +164,7 @@ 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) @@ -6534,7 +6540,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol network_port(spamd, tcp,783,s0) network_port(ssh, tcp,22,s0) network_port(soundd, tcp,8000,s0, tcp,9433,s0, tcp, 16001, s0) -@@ -167,14 +175,18 @@ +@@ -168,13 +175,16 @@ network_port(syslogd, udp,514,s0) network_port(telnetd, tcp,23,s0) network_port(tftp, udp,69,s0) @@ -6545,19 +6551,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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) + 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(wccp, udp,2048,s0) network_port(xdmcp, udp,177,s0, tcp,177,s0) network_port(xen, tcp,8002,s0) - network_port(xfs, tcp,7100,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.8/policy/modules/kernel/devices.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.9/policy/modules/kernel/devices.fc --- nsaserefpolicy/policy/modules/kernel/devices.fc 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/devices.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/devices.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,7 +1,7 @@ /dev -d gen_context(system_u:object_r:device_t,s0) @@ -6677,9 +6680,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /dev/pts(/.*)? <> -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.5.8/policy/modules/kernel/devices.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.5.9/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/devices.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/devices.if 2008-09-25 08:33:18.000000000 -0400 @@ -65,7 +65,7 @@ relabelfrom_dirs_pattern($1, device_t, device_node) @@ -7147,9 +7150,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.5.8/policy/modules/kernel/devices.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.5.9/policy/modules/kernel/devices.te --- nsaserefpolicy/policy/modules/kernel/devices.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/devices.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/devices.te 2008-09-25 08:33:18.000000000 -0400 @@ -32,6 +32,12 @@ type apm_bios_t; dev_node(apm_bios_t) @@ -7215,9 +7218,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # 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.5.8/policy/modules/kernel/domain.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.5.9/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/domain.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/domain.if 2008-09-25 08:33:18.000000000 -0400 @@ -1247,18 +1247,34 @@ ## ## @@ -7256,9 +7259,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## 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.5.8/policy/modules/kernel/domain.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.5.9/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/domain.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/domain.te 2008-09-25 08:33:18.000000000 -0400 @@ -5,6 +5,13 @@ # # Declarations @@ -7339,9 +7342,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +# 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.5.8/policy/modules/kernel/files.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.5.9/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/files.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/files.fc 2008-09-25 08:33:18.000000000 -0400 @@ -32,6 +32,7 @@ /boot/lost\+found -d gen_context(system_u:object_r:lost_found_t,mls_systemhigh) /boot/lost\+found/.* <> @@ -7350,9 +7353,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # # /emul -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.5.8/policy/modules/kernel/files.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.5.9/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/files.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/files.if 2008-09-25 08:33:18.000000000 -0400 @@ -110,6 +110,11 @@ ## # @@ -7688,9 +7691,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.5.8/policy/modules/kernel/files.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.5.9/policy/modules/kernel/files.te --- nsaserefpolicy/policy/modules/kernel/files.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/files.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/files.te 2008-09-25 08:33:18.000000000 -0400 @@ -52,11 +52,14 @@ # # etc_t is the type of the system etc directories. @@ -7727,9 +7730,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.5.8/policy/modules/kernel/filesystem.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.5.9/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2008-08-14 13:08:27.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/filesystem.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/filesystem.if 2008-09-25 08:33:18.000000000 -0400 @@ -535,6 +535,24 @@ ######################################## @@ -8162,9 +8165,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.5.8/policy/modules/kernel/filesystem.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.5.9/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2008-08-14 13:08:27.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/filesystem.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/filesystem.te 2008-09-25 08:33:18.000000000 -0400 @@ -21,7 +21,6 @@ # Use xattrs for the following filesystem types. @@ -8193,9 +8196,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.5.8/policy/modules/kernel/kernel.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.5.9/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/kernel.if 2008-09-22 12:18:03.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/kernel.if 2008-09-25 08:33:18.000000000 -0400 @@ -1198,6 +1198,7 @@ ') @@ -8245,9 +8248,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Unconfined access to kernel module resources. ## ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.5.8/policy/modules/kernel/kernel.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.5.9/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/kernel.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/kernel.te 2008-09-25 08:33:18.000000000 -0400 @@ -63,6 +63,15 @@ genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0) @@ -8281,9 +8284,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/kernel/selinux.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.5.9/policy/modules/kernel/selinux.if --- nsaserefpolicy/policy/modules/kernel/selinux.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/selinux.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/selinux.if 2008-09-25 08:33:18.000000000 -0400 @@ -164,6 +164,7 @@ type security_t; ') @@ -8402,9 +8405,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/kernel/selinux.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-3.5.9/policy/modules/kernel/selinux.te --- nsaserefpolicy/policy/modules/kernel/selinux.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/selinux.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/selinux.te 2008-09-25 08:33:18.000000000 -0400 @@ -10,6 +10,7 @@ attribute can_setenforce; attribute can_setsecparam; @@ -8425,9 +8428,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/kernel/storage.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.5.9/policy/modules/kernel/storage.fc --- nsaserefpolicy/policy/modules/kernel/storage.fc 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/kernel/storage.fc 2008-09-22 15:56:42.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/kernel/storage.fc 2008-09-25 08:33:18.000000000 -0400 @@ -27,6 +27,7 @@ /dev/mcdx? -b gen_context(system_u:object_r:removable_device_t,s0) /dev/megadev.* -c gen_context(system_u:object_r:removable_device_t,s0) @@ -8436,14 +8439,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /dev/nb[^/]+ -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh) /dev/optcd -b gen_context(system_u:object_r:removable_device_t,s0) /dev/p[fg][0-3] -b gen_context(system_u:object_r:removable_device_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.5.8/policy/modules/roles/guest.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.5.9/policy/modules/roles/guest.fc --- nsaserefpolicy/policy/modules/roles/guest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/guest.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/guest.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/roles/guest.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.if serefpolicy-3.5.9/policy/modules/roles/guest.if --- nsaserefpolicy/policy/modules/roles/guest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/guest.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/guest.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,161 @@ +## Least privledge terminal user role + @@ -8606,9 +8609,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + read_files_pattern($1, { guest_home_dir_t guest_home_t }, guest_home_t) + read_lnk_files_pattern($1, { guest_home_dir_t guest_home_t }, guest_home_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.5.8/policy/modules/roles/guest.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.5.9/policy/modules/roles/guest.te --- nsaserefpolicy/policy/modules/roles/guest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/guest.te 2008-09-17 19:53:27.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/guest.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,34 @@ + +policy_module(guest, 1.0.0) @@ -8644,14 +8647,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + mozilla_per_role_template(xguest, xguest_t, xguest_r) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.5.8/policy/modules/roles/logadm.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.5.9/policy/modules/roles/logadm.fc --- nsaserefpolicy/policy/modules/roles/logadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/logadm.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/logadm.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/roles/logadm.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.if serefpolicy-3.5.9/policy/modules/roles/logadm.if --- nsaserefpolicy/policy/modules/roles/logadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/logadm.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/logadm.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,44 @@ +## Audit administrator role + @@ -8697,9 +8700,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +template(`logadm_role_change_to_template',` + userdom_role_change_template(logadm, $1) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.te serefpolicy-3.5.8/policy/modules/roles/logadm.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.te serefpolicy-3.5.9/policy/modules/roles/logadm.te --- nsaserefpolicy/policy/modules/roles/logadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/logadm.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/logadm.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,20 @@ + +policy_module(logadm, 1.0.0) @@ -8721,9 +8724,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +allow logadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice }; + +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t }) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.5.8/policy/modules/roles/staff.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.5.9/policy/modules/roles/staff.te --- nsaserefpolicy/policy/modules/roles/staff.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/roles/staff.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/staff.te 2008-09-25 08:33:18.000000000 -0400 @@ -8,23 +8,55 @@ role staff_r; @@ -8781,9 +8784,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + webadm_role_change_template(staff) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.5.8/policy/modules/roles/sysadm.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.5.9/policy/modules/roles/sysadm.if --- nsaserefpolicy/policy/modules/roles/sysadm.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/roles/sysadm.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/sysadm.if 2008-09-25 08:33:18.000000000 -0400 @@ -334,10 +334,10 @@ # interface(`sysadm_getattr_home_dirs',` @@ -8943,9 +8946,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.5.8/policy/modules/roles/sysadm.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.5.9/policy/modules/roles/sysadm.te --- nsaserefpolicy/policy/modules/roles/sysadm.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/roles/sysadm.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/sysadm.te 2008-09-25 08:33:18.000000000 -0400 @@ -171,6 +171,10 @@ ') @@ -8957,9 +8960,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kudzu_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t }) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.if serefpolicy-3.5.8/policy/modules/roles/unprivuser.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.if serefpolicy-3.5.9/policy/modules/roles/unprivuser.if --- nsaserefpolicy/policy/modules/roles/unprivuser.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/roles/unprivuser.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/unprivuser.if 2008-09-25 08:33:18.000000000 -0400 @@ -62,6 +62,26 @@ files_home_filetrans($1, user_home_dir_t, dir) ') @@ -9603,9 +9606,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + ') +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.5.8/policy/modules/roles/unprivuser.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.5.9/policy/modules/roles/unprivuser.te --- nsaserefpolicy/policy/modules/roles/unprivuser.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/roles/unprivuser.te 2008-09-17 09:15:05.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/unprivuser.te 2008-09-25 08:33:18.000000000 -0400 @@ -13,3 +13,19 @@ userdom_unpriv_user_template(user) @@ -9626,14 +9629,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/roles/webadm.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.fc serefpolicy-3.5.9/policy/modules/roles/webadm.fc --- nsaserefpolicy/policy/modules/roles/webadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/webadm.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/webadm.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/roles/webadm.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.if serefpolicy-3.5.9/policy/modules/roles/webadm.if --- nsaserefpolicy/policy/modules/roles/webadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/webadm.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/webadm.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,44 @@ +## Policy for webadm role + @@ -9679,9 +9682,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +template(`webadm_role_change_to_template',` + userdom_role_change_template(webadm, $1) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.te serefpolicy-3.5.8/policy/modules/roles/webadm.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.te serefpolicy-3.5.9/policy/modules/roles/webadm.te --- nsaserefpolicy/policy/modules/roles/webadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/webadm.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/webadm.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,65 @@ + +policy_module(webadm, 1.0.0) @@ -9748,14 +9751,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + unprivuser_write_tmp_files(webadm_t) +') +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.fc serefpolicy-3.5.8/policy/modules/roles/xguest.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.fc serefpolicy-3.5.9/policy/modules/roles/xguest.fc --- nsaserefpolicy/policy/modules/roles/xguest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/xguest.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/xguest.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/roles/xguest.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.if serefpolicy-3.5.9/policy/modules/roles/xguest.if --- nsaserefpolicy/policy/modules/roles/xguest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/xguest.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/xguest.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,161 @@ +## Least privledge X Windows user role + @@ -9918,9 +9921,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + read_files_pattern($1, { xguest_home_dir_t xguest_home_t }, xguest_home_t) + read_lnk_files_pattern($1, { xguest_home_dir_t xguest_home_t }, xguest_home_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.5.8/policy/modules/roles/xguest.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.5.9/policy/modules/roles/xguest.te --- nsaserefpolicy/policy/modules/roles/xguest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/roles/xguest.te 2008-09-17 19:45:13.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/roles/xguest.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,82 @@ + +policy_module(xguest, 1.0.0) @@ -10004,9 +10007,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + bluetooth_dbus_chat(xguest_t) + ') +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.if serefpolicy-3.5.8/policy/modules/services/aide.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.if serefpolicy-3.5.9/policy/modules/services/aide.if --- nsaserefpolicy/policy/modules/services/aide.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/aide.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/aide.if 2008-09-25 08:33:18.000000000 -0400 @@ -70,9 +70,11 @@ allow $1 aide_t:process { ptrace signal_perms }; ps_process_pattern($1, aide_t) @@ -10021,69 +10024,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - manage_files_pattern($1, aide_log_t, aide_log_t) + admin_pattern($1, aide_log_t, aide_log_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.fc serefpolicy-3.5.8/policy/modules/services/amavis.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.fc serefpolicy-3.5.9/policy/modules/services/amavis.fc --- nsaserefpolicy/policy/modules/services/amavis.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/amavis.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -1,8 +1,9 @@ ++++ serefpolicy-3.5.9/policy/modules/services/amavis.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,8 +1,10 @@ /etc/amavis\.conf -- gen_context(system_u:object_r:amavis_etc_t,s0) -/etc/amavisd(/.*)? -- gen_context(system_u:object_r:amavis_etc_t,s0) +/etc/amavisd(/.*)? gen_context(system_u:object_r:amavis_etc_t,s0) ++/etc/rc\.d/init\.d/amavis -- gen_context(system_u:object_r:amavis_initrc_exec_t,s0) /usr/sbin/amavisd.* -- gen_context(system_u:object_r:amavis_exec_t,s0) +/usr/lib(64)?/AntiVir/antivir -- gen_context(system_u:object_r:amavis_exec_t,s0) ifdef(`distro_debian',` /usr/sbin/amavisd-new-cronjob -- gen_context(system_u:object_r:amavis_exec_t,s0) -@@ -14,3 +15,5 @@ - /var/run/amavis(d)?(/.*)? gen_context(system_u:object_r:amavis_var_run_t,s0) - /var/spool/amavisd(/.*)? gen_context(system_u:object_r:amavis_spool_t,s0) - /var/virusmails(/.*)? gen_context(system_u:object_r:amavis_quarantine_t,s0) -+ -+/etc/rc\.d/init\.d/amavis -- gen_context(system_u:object_r:amavis_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-3.5.8/policy/modules/services/amavis.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-3.5.9/policy/modules/services/amavis.if --- nsaserefpolicy/policy/modules/services/amavis.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/amavis.if 2008-09-17 08:49:08.000000000 -0400 -@@ -189,6 +189,25 @@ - - ######################################## - ## -+## Execute amavis server in the amavis domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`amavis_script_domtrans',` -+ gen_require(` -+ type amavis_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, amavis_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an amavis environment - ## -@@ -204,28 +223,35 @@ ++++ serefpolicy-3.5.9/policy/modules/services/amavis.if 2008-09-25 08:33:18.000000000 -0400 +@@ -204,28 +204,34 @@ type amavis_t, amavis_tmp_t, amavis_var_log_t; type amavis_spool_t, amavis_var_lib_t, amavis_var_run_t; type amavis_etc_t, amavis_quarantine_t; -+ type amavis_script_exec_t; ++ type amavis_initrc_exec_t; ') allow $1 amavis_t:process { ptrace signal_perms }; ps_process_pattern($1, amavis_t) -+ # Allow amavis_t to restart the apache service -+ amavis_script_domtrans($1) ++ init_labeled_script_domtrans($1, amavis_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 amavis_script_exec_t system_r; ++ role_transition $2 amavis_initrc_exec_t system_r; + allow $2 system_r; + files_list_tmp($1) @@ -10113,28 +10084,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - manage_files_pattern($1, amavis_var_run_t, amavis_var_run_t) + admin_pattern($1, amavis_var_run_t, amavis_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.5.8/policy/modules/services/amavis.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.5.9/policy/modules/services/amavis.te --- nsaserefpolicy/policy/modules/services/amavis.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/amavis.te 2008-09-17 08:49:08.000000000 -0400 -@@ -13,7 +13,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/amavis.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,7 +13,10 @@ # configuration files type amavis_etc_t; -files_type(amavis_etc_t) +files_config_file(amavis_etc_t) ++ ++type amavis_initrc_exec_t; ++init_script_file(amavis_initrc_exec_t) # pid files type amavis_var_run_t; -@@ -38,6 +38,9 @@ - type amavis_spool_t; - files_type(amavis_spool_t) - -+type amavis_script_exec_t; -+init_script_file(amavis_script_exec_t) -+ - ######################################## - # - # amavis local policy @@ -52,6 +55,8 @@ allow amavis_t self:tcp_socket { listen accept }; allow amavis_t self:netlink_route_socket r_netlink_socket_perms; @@ -10144,10 +10108,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # configuration files allow amavis_t amavis_etc_t:dir list_dir_perms; read_files_pattern(amavis_t, amavis_etc_t, amavis_etc_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.8/policy/modules/services/apache.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.9/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/apache.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -1,10 +1,10 @@ ++++ serefpolicy-3.5.9/policy/modules/services/apache.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,12 +1,13 @@ -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0) +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) @@ -10160,8 +10124,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) -@@ -16,13 +16,13 @@ + + /srv/([^/]*/)?www(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) +@@ -16,13 +17,13 @@ /usr/lib/apache-ssl/.+ -- gen_context(system_u:object_r:httpd_exec_t,s0) /usr/lib/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) @@ -10176,7 +10143,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) -@@ -33,12 +33,14 @@ +@@ -33,12 +34,14 @@ /usr/sbin/httpd2-.* -- gen_context(system_u:object_r:httpd_exec_t,s0) ') @@ -10191,7 +10158,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) -@@ -48,6 +50,7 @@ +@@ -48,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) @@ -10199,7 +10166,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) -@@ -51,8 +54,10 @@ +@@ -51,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) @@ -10210,7 +10177,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) -@@ -65,11 +70,23 @@ +@@ -65,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) @@ -10233,11 +10200,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +#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) -+ -+/etc/rc\.d/init\.d/httpd -- gen_context(system_u:object_r:httpd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.5.8/policy/modules/services/apache.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.5.9/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/apache.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/apache.if 2008-09-25 08:47:59.000000000 -0400 @@ -13,21 +13,16 @@ # template(`apache_content_template',` @@ -10485,16 +10450,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + type httpd_user_content_t; + type httpd_user_script_exec_t; + type httpd_user_htaccess_t; -+ ') -+ -+ -+ ifelse(`$1',`user',`',` -+ typealias httpd_user_content_t alias httpd_$1_script_t; -+ typealias httpd_user_content_ra_t alias httpd_$1_script_ra_t; -+ typealias httpd_user_content_rw_t alias httpd_$1_script_rw_t; -+ typealias httpd_user_content_t alias httpd_$1_script_ro_t; -+ typealias httpd_user_script_exec_t alias httpd_$1_script_exec_t; -+ typealias httpd_user_htaccess_t alias httpd_$1_htaccess_t; ') - apache_content_template($1) @@ -10541,6 +10496,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - relabel_dirs_pattern($2, httpd_$1_script_exec_t, httpd_$1_script_exec_t) - relabel_files_pattern($2, httpd_$1_script_exec_t, httpd_$1_script_exec_t) - relabel_lnk_files_pattern($2, httpd_$1_script_exec_t, httpd_$1_script_exec_t) ++ ifelse(`$1',`user',`',` ++ typealias httpd_user_content_t alias httpd_$1_script_t; ++ typealias httpd_user_content_ra_t alias httpd_$1_script_ra_t; ++ typealias httpd_user_content_rw_t alias httpd_$1_script_rw_t; ++ typealias httpd_user_content_t alias httpd_$1_script_ro_t; ++ typealias httpd_user_script_exec_t alias httpd_$1_script_exec_t; ++ typealias httpd_user_htaccess_t alias httpd_$1_htaccess_t; ++ ') ++ ++ + role $3 types httpd_user_script_t; + + allow $2 httpd_user_content_t:{ dir file lnk_file } { relabelto relabelfrom }; @@ -10727,7 +10692,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1098,3 +1071,178 @@ +@@ -1098,3 +1071,160 @@ allow httpd_t $1:process signal; ') @@ -10772,24 +10737,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute apache server in the ntpd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`apache_script_domtrans',` -+ gen_require(` -+ type httpd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, httpd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate an apache environment +## +## @@ -10813,7 +10760,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +interface(`apache_admin',` + + gen_require(` -+ type httpd_t, httpd_script_exec_t, httpd_config_t; ++ 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; @@ -10826,11 +10773,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + ') + + allow $1 httpd_t:process { getattr ptrace signal_perms }; ++ ps_process_pattern($1, httpd_t) + -+ # Allow $1 to restart the apache service -+ apache_script_domtrans($1) ++ init_labeled_script_domtrans($1, httpd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 httpd_script_exec_t system_r; ++ role_transition $2 httpd_initrc_exec_t system_r; + allow $2 system_r; + + apache_manage_all_content($1) @@ -10906,9 +10853,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + ') + 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.5.8/policy/modules/services/apache.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.9/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/apache.te 2008-09-19 10:06:15.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/apache.te 2008-09-25 08:33:18.000000000 -0400 @@ -20,6 +20,8 @@ # Declarations # @@ -10992,16 +10939,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # user script domains attribute httpd_script_domains; -@@ -147,6 +184,9 @@ - type httpd_log_t; - logging_log_file(httpd_log_t) +@@ -141,6 +178,9 @@ + domain_entry_file(httpd_helper_t, httpd_helper_exec_t) + role system_r types httpd_helper_t; -+type httpd_script_exec_t; -+init_script_file(httpd_script_exec_t) ++type httpd_initrc_exec_t; ++init_script_file(httpd_initrc_exec_t) + - # httpd_modules_t is the type given to module files (libraries) - # that come with Apache /etc/httpd/modules and /usr/lib/apache - type httpd_modules_t; + type httpd_lock_t; + files_lock_file(httpd_lock_t) + @@ -180,6 +220,9 @@ # setup the system domain for system CGI scripts @@ -11547,44 +11494,25 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.5.8/policy/modules/services/apcupsd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.5.9/policy/modules/services/apcupsd.fc --- nsaserefpolicy/policy/modules/services/apcupsd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/apcupsd.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/apcupsd.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,3 +1,5 @@ -+/etc/rc\.d/init\.d/apcupsd -- gen_context(system_u:object_r:apcupsd_script_exec_t,s0) ++/etc/rc\.d/init\.d/apcupsd -- gen_context(system_u:object_r:apcupsd_initrc_exec_t,s0) + ifdef(`distro_debian',` /sbin/apcupsd -- gen_context(system_u:object_r:apcupsd_exec_t,s0) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.5.8/policy/modules/services/apcupsd.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.5.9/policy/modules/services/apcupsd.if --- nsaserefpolicy/policy/modules/services/apcupsd.if 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/apcupsd.if 2008-09-17 08:49:08.000000000 -0400 -@@ -97,3 +97,74 @@ ++++ serefpolicy-3.5.9/policy/modules/services/apcupsd.if 2008-09-25 08:33:18.000000000 -0400 +@@ -97,3 +97,49 @@ domtrans_pattern($1, httpd_apcupsd_cgi_script_exec_t, httpd_apcupsd_cgi_script_t) ') + +######################################## +## -+## Execute apcupsd server in the apcupsd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`apcupsd_script_domtrans',` -+ gen_require(` -+ type apcupsd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, apcupsd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an apcupsd environment +## @@ -11598,11 +11526,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the apcupsd domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`apcupsd_admin',` @@ -11610,43 +11533,42 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + type apcupsd_t, apcupsd_tmp_t; + type apcupsd_log_t, apcupsd_lock_t; + type apcupsd_var_run_t; -+ type apcupsd_script_exec_t; ++ type apcupsd_initrc_exec_t; + ') + + allow $1 apcupsd_t:process { ptrace signal_perms }; + ps_process_pattern($1, apcupsd_t) + -+ # Allow admin to restart the apcuspd service -+ apcupsd_script_domtrans($1) ++ init_labeled_script_domtrans($1, apcupsd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 apcupsd_script_exec_t system_r; ++ role_transition $2 apcupsd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, apcupsd_tmp_t) ++ admin_pattern($1, apcupsd_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, apcupsd_log_t) ++ admin_pattern($1, apcupsd_log_t) + + files_list_var($1) + admin_pattern($1, apcupsd_lock_t) + + files_list_pids($1) -+ admin_pattern($1, apcupsd_var_run_t) ++ admin_pattern($1, apcupsd_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-3.5.8/policy/modules/services/apcupsd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-3.5.9/policy/modules/services/apcupsd.te --- nsaserefpolicy/policy/modules/services/apcupsd.te 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/apcupsd.te 2008-09-17 08:49:08.000000000 -0400 -@@ -22,6 +22,9 @@ - type apcupsd_var_run_t; - files_pid_file(apcupsd_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/apcupsd.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,6 +13,9 @@ + type apcupsd_lock_t; + files_lock_file(apcupsd_lock_t) -+type apcupsd_script_exec_t; -+init_script_file(apcupsd_script_exec_t) ++type apcupsd_initrc_exec_t; ++init_script_file(apcupsd_initrc_exec_t) + - ######################################## - # - # apcupsd local policy + type apcupsd_log_t; + logging_log_file(apcupsd_log_t) + @@ -86,12 +89,18 @@ miscfiles_read_localization(apcupsd_t) @@ -11666,44 +11588,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.fc serefpolicy-3.5.8/policy/modules/services/arpwatch.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.fc serefpolicy-3.5.9/policy/modules/services/arpwatch.fc --- nsaserefpolicy/policy/modules/services/arpwatch.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/arpwatch.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -9,3 +9,5 @@ ++++ serefpolicy-3.5.9/policy/modules/services/arpwatch.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/arpwatch -- gen_context(system_u:object_r:arpwatch_initrc_exec_t,s0) + # - /var/arpwatch(/.*)? gen_context(system_u:object_r:arpwatch_data_t,s0) - /var/lib/arpwatch(/.*)? gen_context(system_u:object_r:arpwatch_data_t,s0) -+ -+/etc/rc\.d/init\.d/arpwatch -- gen_context(system_u:object_r:arpwatch_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.if serefpolicy-3.5.8/policy/modules/services/arpwatch.if + # /usr +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.if serefpolicy-3.5.9/policy/modules/services/arpwatch.if --- nsaserefpolicy/policy/modules/services/arpwatch.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/arpwatch.if 2008-09-17 08:49:08.000000000 -0400 -@@ -90,3 +90,73 @@ ++++ serefpolicy-3.5.9/policy/modules/services/arpwatch.if 2008-09-25 08:33:18.000000000 -0400 +@@ -90,3 +90,45 @@ dontaudit $1 arpwatch_t:packet_socket { read write }; ') + +######################################## +## -+## Execute arpwatch server in the arpwatch domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`arpwatch_script_domtrans',` -+ gen_require(` -+ type arpwatch_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, arpwatch_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an arpwatch environment +## @@ -11717,89 +11619,62 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the arpwatch domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`arpwatch_admin',` + gen_require(` -+ type arpwatch_t; -+ type arpwatch_script_exec_t; -+ type arpwatch_tmp_t; -+ type arpwatch_data_t; -+ type arpwatch_var_run_t; ++ type arpwatch_t, arpwatch_tmp_t; ++ type arpwatch_data_t, arpwatch_var_run_t; ++ type arpwatch_initrc_exec_t; + ') + + allow $1 arpwatch_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, arpwatch_t, arpwatch_t) ++ ps_process_pattern($1, arpwatch_t) + -+ # Allow arpwatch_t to restart the apache service -+ arpwatch_script_domtrans($1) ++ init_labeled_script_domtrans($1, arpwatch_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 arpwatch_script_exec_t system_r; ++ role_transition $2 arpwatch_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, arpwatch_tmp_t) ++ admin_pattern($1, arpwatch_tmp_t) + + files_list_var($1) -+ admin_pattern($1, arpwatch_data_t) ++ admin_pattern($1, arpwatch_data_t) + + files_list_pids($1) -+ admin_pattern($1, arpwatch_var_run_t) ++ admin_pattern($1, arpwatch_var_run_t) +') -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.5.8/policy/modules/services/arpwatch.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.5.9/policy/modules/services/arpwatch.te --- nsaserefpolicy/policy/modules/services/arpwatch.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/arpwatch.te 2008-09-17 08:49:08.000000000 -0400 -@@ -19,6 +19,9 @@ - type arpwatch_var_run_t; - files_pid_file(arpwatch_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/arpwatch.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,6 +13,9 @@ + type arpwatch_data_t; + files_type(arpwatch_data_t) -+type arpwatch_script_exec_t; -+init_script_file(arpwatch_script_exec_t) ++type arpwatch_initrc_exec_t; ++init_script_file(arpwatch_initrc_exec_t) + - ######################################## - # - # Local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.fc serefpolicy-3.5.8/policy/modules/services/asterisk.fc + type arpwatch_tmp_t; + files_tmp_file(arpwatch_tmp_t) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.fc serefpolicy-3.5.9/policy/modules/services/asterisk.fc --- nsaserefpolicy/policy/modules/services/asterisk.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/asterisk.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -6,3 +6,4 @@ - /var/log/asterisk(/.*)? gen_context(system_u:object_r:asterisk_log_t,s0) - /var/run/asterisk(/.*)? gen_context(system_u:object_r:asterisk_var_run_t,s0) - /var/spool/asterisk(/.*)? gen_context(system_u:object_r:asterisk_spool_t,s0) -+/etc/rc\.d/init\.d/asterisk -- gen_context(system_u:object_r:asterisk_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.5.8/policy/modules/services/asterisk.if ++++ serefpolicy-3.5.9/policy/modules/services/asterisk.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,4 +1,5 @@ + /etc/asterisk(/.*)? gen_context(system_u:object_r:asterisk_etc_t,s0) ++/etc/rc\.d/init\.d/asterisk -- gen_context(system_u:object_r:asterisk_initrc_exec_t,s0) + + /usr/sbin/asterisk -- gen_context(system_u:object_r:asterisk_exec_t,s0) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.5.9/policy/modules/services/asterisk.if --- nsaserefpolicy/policy/modules/services/asterisk.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/asterisk.if 2008-09-17 08:49:08.000000000 -0400 -@@ -1 +1,83 @@ ++++ serefpolicy-3.5.9/policy/modules/services/asterisk.if 2008-09-25 08:33:18.000000000 -0400 +@@ -1 +1,54 @@ ## Asterisk IP telephony server + +######################################## +## -+## Execute asterisk server in the asterisk domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`asterisk_script_domtrans',` -+ gen_require(` -+ type asterisk_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, asterisk_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an asterisk environment +## @@ -11813,78 +11688,68 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the asterisk domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`asterisk_admin',` + gen_require(` -+ type asterisk_t; -+ type asterisk_script_exec_t; -+ type asterisk_etc_t; -+ type asterisk_tmp_t; -+ type asterisk_log_t; -+ type asterisk_spool_t; ++ type asterisk_t, asterisk_var_run_t, asterisk_spool_t; ++ type asterisk_etc_t, asterisk_tmp_t, asterisk_log_t; + type asterisk_var_lib_t; -+ type asterisk_var_run_t; ++ type asterisk_initrc_exec_t; + ') + + allow $1 asterisk_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, asterisk_t, asterisk_t) ++ ps_process_pattern($1, asterisk_t) + -+ # Allow asterisk_t to restart the apache service -+ asterisk_script_domtrans($1) ++ init_labeled_script_domtrans($1, asterisk_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 asterisk_script_exec_t system_r; ++ role_transition $2 asterisk_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, asterisk_tmp_t) ++ admin_pattern($1, asterisk_tmp_t) + + files_list_etc($1) -+ admin_pattern($1, asterisk_etc_t) ++ admin_pattern($1, asterisk_etc_t) + + logging_list_logs($1) -+ admin_pattern($1, asterisk_log_t) ++ admin_pattern($1, asterisk_log_t) + + files_list_spool($1) + admin_pattern($1, asterisk_spool_t) + + files_list_var_lib($1) -+ admin_pattern($1, asterisk_var_lib_t) ++ admin_pattern($1, asterisk_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, asterisk_var_run_t) ++ admin_pattern($1, asterisk_var_run_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.5.8/policy/modules/services/asterisk.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.5.9/policy/modules/services/asterisk.te --- nsaserefpolicy/policy/modules/services/asterisk.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/asterisk.te 2008-09-17 08:49:08.000000000 -0400 -@@ -31,6 +31,9 @@ - type asterisk_var_run_t; - files_pid_file(asterisk_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/asterisk.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,6 +13,9 @@ + type asterisk_etc_t; + files_config_file(asterisk_etc_t) -+type asterisk_script_exec_t; -+init_script_file(asterisk_script_exec_t) ++type asterisk_initrc_exec_t; ++init_script_file(asterisk_initrc_exec_t) + - ######################################## - # - # Local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.fc serefpolicy-3.5.8/policy/modules/services/audioentropy.fc + type asterisk_log_t; + logging_log_file(asterisk_log_t) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.fc serefpolicy-3.5.9/policy/modules/services/audioentropy.fc --- nsaserefpolicy/policy/modules/services/audioentropy.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/audioentropy.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/audioentropy.fc 2008-09-25 08:33:18.000000000 -0400 @@ -2,3 +2,5 @@ # /usr # /usr/sbin/audio-entropyd -- gen_context(system_u:object_r:entropyd_exec_t,s0) + +/var/run/audio-entropyd\.pid -- gen_context(system_u:object_r:entropyd_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.5.8/policy/modules/services/audioentropy.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.5.9/policy/modules/services/audioentropy.te --- nsaserefpolicy/policy/modules/services/audioentropy.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/audioentropy.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/audioentropy.te 2008-09-25 08:33:18.000000000 -0400 @@ -35,6 +35,7 @@ dev_read_rand(entropyd_t) dev_write_rand(entropyd_t) @@ -11893,22 +11758,28 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol fs_getattr_all_fs(entropyd_t) fs_search_auto_mountpoints(entropyd_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-3.5.8/policy/modules/services/automount.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-3.5.9/policy/modules/services/automount.fc --- nsaserefpolicy/policy/modules/services/automount.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/automount.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -12,4 +12,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/automount.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -2,6 +2,7 @@ + # /etc + # + /etc/apm/event\.d/autofs -- gen_context(system_u:object_r:automount_exec_t,s0) ++/etc/rc\.d/init\.d/autofs -- gen_context(system_u:object_r:automount_initrc_exec_t,s0) + + # + # /usr +@@ -12,4 +13,5 @@ # /var # -/var/run/autofs(/.*)? gen_context(system_u:object_r:automount_var_run_t,s0) +/var/run/autofs.* gen_context(system_u:object_r:automount_var_run_t,s0) + -+/etc/rc\.d/init\.d/autofs -- gen_context(system_u:object_r:automount_script_exec_t,s0) -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-3.5.8/policy/modules/services/automount.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-3.5.9/policy/modules/services/automount.if --- nsaserefpolicy/policy/modules/services/automount.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/automount.if 2008-09-17 08:49:08.000000000 -0400 -@@ -74,3 +74,109 @@ ++++ serefpolicy-3.5.9/policy/modules/services/automount.if 2008-09-25 08:33:18.000000000 -0400 +@@ -74,3 +74,81 @@ dontaudit $1 automount_tmp_t:dir getattr; ') @@ -11949,26 +11820,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + dontaudit $1 automount_t:fifo_file write; +') + -+ -+######################################## -+## -+## Execute automount server in the automount domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`automount_script_domtrans',` -+ gen_require(` -+ type automount_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, automount_script_exec_t) -+') -+ +######################################## +## +## All of the rules required to administrate @@ -11984,53 +11835,45 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the automount domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`automount_admin',` + gen_require(` -+ type automount_t; -+ type automount_script_exec_t; -+ type automount_lock_t; -+ type automount_tmp_t; ++ type automount_t, automount_lock_t, automount_tmp_t; + type automount_var_run_t; ++ type automount_initrc_exec_t; + ') + + allow $1 automount_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, automount_t, automount_t) ++ ps_process_pattern($1, automount_t) + -+ # Allow automount_t to restart the apache service -+ automount_script_domtrans($1) ++ init_labeled_script_domtrans($1, automount_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 automount_script_exec_t system_r; ++ role_transition $2 automount_initrc_exec_t system_r; + allow $2 system_r; + + files_list_var($1) -+ admin_pattern($1, automount_lock_t) ++ admin_pattern($1, automount_lock_t) + + files_list_tmp($1) -+ admin_pattern($1, automount_tmp_t) ++ admin_pattern($1, automount_tmp_t) + + files_list_pids($1) -+ admin_pattern($1, automount_var_run_t) ++ admin_pattern($1, automount_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.5.8/policy/modules/services/automount.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.5.9/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/automount.te 2008-09-17 08:49:08.000000000 -0400 -@@ -20,6 +20,9 @@ - files_tmp_file(automount_tmp_t) - files_mountpoint(automount_tmp_t) ++++ serefpolicy-3.5.9/policy/modules/services/automount.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type automount_exec_t; + init_daemon_domain(automount_t, automount_exec_t) -+type automount_script_exec_t; -+init_script_file(automount_script_exec_t) ++type automount_initrc_exec_t; ++init_script_file(automount_initrc_exec_t) + - ######################################## - # - # Local policy + type automount_var_run_t; + files_pid_file(automount_var_run_t) + @@ -35,8 +38,6 @@ allow automount_t self:udp_socket create_socket_perms; allow automount_t self:rawip_socket create_socket_perms; @@ -12114,46 +11957,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.fc serefpolicy-3.5.8/policy/modules/services/avahi.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.fc serefpolicy-3.5.9/policy/modules/services/avahi.fc --- nsaserefpolicy/policy/modules/services/avahi.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/avahi.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -3,3 +3,7 @@ - /usr/sbin/avahi-dnsconfd -- gen_context(system_u:object_r:avahi_exec_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/avahi.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/avahi -- gen_context(system_u:object_r:avahi_initrc_exec_t,s0) - /var/run/avahi-daemon(/.*)? gen_context(system_u:object_r:avahi_var_run_t,s0) -+ -+ -+/etc/rc\.d/init\.d/avahi -- gen_context(system_u:object_r:avahi_script_exec_t,s0) -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.5.8/policy/modules/services/avahi.if + /usr/sbin/avahi-daemon -- gen_context(system_u:object_r:avahi_exec_t,s0) + /usr/sbin/avahi-dnsconfd -- gen_context(system_u:object_r:avahi_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.5.9/policy/modules/services/avahi.if --- nsaserefpolicy/policy/modules/services/avahi.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/avahi.if 2008-09-17 08:49:08.000000000 -0400 -@@ -57,3 +57,64 @@ ++++ serefpolicy-3.5.9/policy/modules/services/avahi.if 2008-09-25 08:33:18.000000000 -0400 +@@ -57,3 +57,38 @@ dontaudit $1 avahi_var_run_t:dir search_dir_perms; ') + +######################################## +## -+## Execute avahi server in the avahi domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`avahi_script_domtrans',` -+ gen_require(` -+ type avahi_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, avahi_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an avahi environment +## @@ -12167,45 +11988,38 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the avahi domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`avahi_admin',` + gen_require(` -+ type avahi_t; -+ type avahi_script_exec_t; -+ type avahi_var_run_t; ++ type avahi_t, avahi_var_run_t; ++ type avahi_initrc_exec_t; + ') + -+ allow $1 avahi_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, avahi_t, avahi_t) ++ allow $1 avahi_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, avahi_t) + -+ # Allow avahi_t to restart the apache service -+ avahi_script_domtrans($1) ++ init_labeled_script_domtrans($1, avahi_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 avahi_script_exec_t system_r; ++ role_transition $2 avahi_initrc_exec_t system_r; + allow $2 system_r; + + files_list_pids($1) -+ admin_pattern($1, avahi_var_run_t) ++ admin_pattern($1, avahi_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.5.8/policy/modules/services/avahi.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.5.9/policy/modules/services/avahi.te --- nsaserefpolicy/policy/modules/services/avahi.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/avahi.te 2008-09-17 08:49:08.000000000 -0400 -@@ -13,6 +13,9 @@ ++++ serefpolicy-3.5.9/policy/modules/services/avahi.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type avahi_exec_t; + init_daemon_domain(avahi_t, avahi_exec_t) + ++type avahi_initrc_exec_t; ++init_script_file(avahi_initrc_exec_t) ++ type avahi_var_run_t; files_pid_file(avahi_var_run_t) -+type avahi_script_exec_t; -+init_script_file(avahi_script_exec_t) -+ - ######################################## - # - # Local policy @@ -20,7 +23,7 @@ allow avahi_t self:capability { dac_override setgid chown fowner kill setuid sys_chroot }; @@ -12223,25 +12037,22 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.5.8/policy/modules/services/bind.fc ---- nsaserefpolicy/policy/modules/services/bind.fc 2008-09-03 10:17:00.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bind.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -51,3 +51,5 @@ - /var/named/chroot/var/log/named.* -- gen_context(system_u:object_r:named_log_t,s0) - /var/named/dynamic(/.*)? gen_context(system_u:object_r:named_cache_t,s0) - ') -+ -+/etc/rc\.d/init\.d/named -- gen_context(system_u:object_r:named_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.5.8/policy/modules/services/bind.if ---- nsaserefpolicy/policy/modules/services/bind.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bind.if 2008-09-17 08:49:08.000000000 -0400 -@@ -254,3 +254,86 @@ - interface(`bind_udp_chat_named',` - refpolicywarn(`$0($*) has been deprecated.') - ') -+ -+######################################## -+## +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.5.9/policy/modules/services/bind.fc +--- nsaserefpolicy/policy/modules/services/bind.fc 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/bind.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,4 +1,4 @@ +-/etc/rc.d/init.d/named -- gen_context(system_u:object_r:named_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/named -- gen_context(system_u:object_r:named_initrc_exec_t,s0) + /etc/rndc.* -- gen_context(system_u:object_r:named_conf_t,s0) + /etc/rndc\.key -- gen_context(system_u:object_r:dnssec_t,s0) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.5.9/policy/modules/services/bind.if +--- nsaserefpolicy/policy/modules/services/bind.if 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/bind.if 2008-09-25 08:33:18.000000000 -0400 +@@ -257,6 +257,25 @@ + + ######################################## + ## +## Execute bind server in the bind domain. +## +## @@ -12251,63 +12062,56 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +# +# -+interface(`bind_script_domtrans',` ++interface(`bind_initrc_domtrans',` + gen_require(` -+ type bind_script_exec_t; ++ type bind_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, bind_script_exec_t) ++ init_labeled_script_domtrans($1, bind_initrc_exec_t) +') + +######################################## +## -+## All of the rules required to administrate -+## an bind environment -+## -+## -+## -+## Domain allowed access. -+## -+## + ## All of the rules required to administrate + ## an bind environment + ## +@@ -265,11 +284,20 @@ + ## Domain allowed access. + ## + ## +## +## +## The role to be allowed to manage the bind domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## -+## -+# -+interface(`bind_admin',` -+ gen_require(` + ## + # + interface(`bind_admin',` + gen_require(` +- type named_t, ndc_t; + type named_t, named_tmp_t, named_log_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_script_exec_t; -+ ') -+ -+ allow $1 named_t:process { ptrace signal_perms }; -+ ps_process_pattern($1, named_t) -+ -+ allow $1 ndc_t:process { ptrace signal_perms }; -+ ps_process_pattern($1, ndc_t) -+ -+ bind_run_ndc($1, $2, $3) ++ type named_initrc_exec_t; + ') + + allow $1 named_t:process { ptrace signal_perms }; +@@ -279,4 +307,28 @@ + ps_process_pattern($1, ndc_t) + + bind_run_ndc($1, $2, $3) + -+ bind_script_domtrans($1) ++ bind_initrc_domtrans($1) + domain_system_change_exemption($1) -+ role_transition $2 named_script_exec_t system_r; ++ role_transition $2 named_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, named_tmp_t) ++ admin_pattern($1, named_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, named_log_t) ++ admin_pattern($1, named_log_t) + + files_list_etc($1) + admin_pattern($1, named_conf_t) @@ -12317,78 +12121,29 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + admin_pattern($1, dnssec_t) + + files_list_var_lib($1) -+ admin_pattern($1, named_var_lib_t) ++ 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.5.8/policy/modules/services/bind.te ---- nsaserefpolicy/policy/modules/services/bind.te 2008-09-03 10:17:00.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bind.te 2008-09-17 08:49:08.000000000 -0400 -@@ -53,6 +53,9 @@ - init_system_domain(ndc_t, ndc_exec_t) - role system_r types ndc_t; - -+type named_script_exec_t; -+init_script_file(named_script_exec_t) -+ - ######################################## - # - # Named local policy -@@ -60,7 +63,7 @@ - - allow named_t self:capability { chown dac_override fowner setgid setuid sys_chroot sys_nice sys_resource }; - dontaudit named_t self:capability sys_tty_config; --allow named_t self:process { setsched setcap setrlimit signal_perms }; -+allow named_t self:process { setsched getcap setcap setrlimit signal_perms }; - allow named_t self:fifo_file rw_fifo_file_perms; - allow named_t self:unix_stream_socket create_stream_socket_perms; - allow named_t self:unix_dgram_socket create_socket_perms; -@@ -223,6 +226,7 @@ - corenet_tcp_sendrecv_all_nodes(ndc_t) - corenet_tcp_sendrecv_all_ports(ndc_t) - corenet_tcp_connect_rndc_port(ndc_t) -+corenet_tcp_bind_all_nodes(ndc_t) - corenet_sendrecv_rndc_client_packets(ndc_t) - - domain_use_interactive_fds(ndc_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.fc serefpolicy-3.5.8/policy/modules/services/bitlbee.fc ++ admin_pattern($1, named_var_run_t) + ') +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.fc serefpolicy-3.5.9/policy/modules/services/bitlbee.fc --- nsaserefpolicy/policy/modules/services/bitlbee.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bitlbee.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/bitlbee.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,3 +1,6 @@ - /usr/sbin/bitlbee -- gen_context(system_u:object_r:bitlbee_exec_t,s0) +-/usr/sbin/bitlbee -- gen_context(system_u:object_r:bitlbee_exec_t,s0) ++/etc/rc\.d/init\.d/bitlbee -- gen_context(system_u:object_r:bitlbee_initrc_exec_t,s0) /etc/bitlbee(/.*)? gen_context(system_u:object_r:bitlbee_conf_t,s0) - /var/lib/bitlbee(/.*)? gen_context(system_u:object_r:bitlbee_var_t,s0) + ++/usr/sbin/bitlbee -- gen_context(system_u:object_r:bitlbee_exec_t,s0) + -+/etc/rc\.d/init\.d/bitlbee -- gen_context(system_u:object_r:bitlbee_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.if serefpolicy-3.5.8/policy/modules/services/bitlbee.if + /var/lib/bitlbee(/.*)? gen_context(system_u:object_r:bitlbee_var_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.if serefpolicy-3.5.9/policy/modules/services/bitlbee.if --- nsaserefpolicy/policy/modules/services/bitlbee.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bitlbee.if 2008-09-17 08:49:08.000000000 -0400 -@@ -20,3 +20,70 @@ ++++ serefpolicy-3.5.9/policy/modules/services/bitlbee.if 2008-09-25 08:33:18.000000000 -0400 +@@ -20,3 +20,40 @@ allow $1 bitlbee_conf_t:file { read getattr }; ') -+ -+######################################## -+## -+## Execute bitlbee server in the bitlbee domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`bitlbee_script_domtrans',` -+ gen_require(` -+ type bitlbee_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, bitlbee_script_exec_t) -+') -+ +######################################## +## +## All of the rules required to administrate @@ -12404,51 +12159,44 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the bitlbee domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`bitlbee_admin',` + gen_require(` -+ type bitlbee_t; -+ type bitlbee_script_exec_t; -+ type bitlbee_conf_t; -+ type bitlbee_var_t; ++ type bitlbee_t; type bitlbee_conf_t; type bitlbee_var_t; ++ type bitlbee_initrc_exec_t; + ') + -+ allow $1 bitlbee_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, bitlbee_t, bitlbee_t) ++ allow $1 bitlbee_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, bitlbee_t) + -+ # Allow bitlbee_t to restart the apache service -+ bitlbee_script_domtrans($1) ++ init_labeled_script_domtrans($1, bitlbee_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 bitlbee_script_exec_t system_r; ++ role_transition $2 bitlbee_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, bitlbee_conf_t) ++ admin_pattern($1, bitlbee_conf_t) + + files_list_var($1) -+ admin_pattern($1, bitlbee_var_t) -+ ++ admin_pattern($1, bitlbee_var_t) +') -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.5.8/policy/modules/services/bitlbee.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.5.9/policy/modules/services/bitlbee.te --- nsaserefpolicy/policy/modules/services/bitlbee.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bitlbee.te 2008-09-17 08:49:08.000000000 -0400 -@@ -17,6 +17,12 @@ ++++ serefpolicy-3.5.9/policy/modules/services/bitlbee.te 2008-09-25 08:33:18.000000000 -0400 +@@ -14,9 +14,15 @@ + type bitlbee_conf_t; + files_config_file(bitlbee_conf_t) + ++type bitlbee_initrc_exec_t; ++init_script_file(bitlbee_initrc_exec_t) ++ type bitlbee_var_t; files_type(bitlbee_var_t) +type bitlbee_tmp_t; +files_tmp_file(bitlbee_tmp_t) + -+type bitlbee_script_exec_t; -+init_script_file(bitlbee_script_exec_t) -+ ######################################## # # Local policy @@ -12490,47 +12238,34 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol sysnet_dns_name_resolve(bitlbee_t) optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.5.8/policy/modules/services/bluetooth.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.5.9/policy/modules/services/bluetooth.fc --- nsaserefpolicy/policy/modules/services/bluetooth.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bluetooth.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -22,3 +22,8 @@ ++++ serefpolicy-3.5.9/policy/modules/services/bluetooth.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -3,6 +3,9 @@ + # + /etc/bluetooth(/.*)? gen_context(system_u:object_r:bluetooth_conf_t,s0) + /etc/bluetooth/link_key gen_context(system_u:object_r:bluetooth_conf_rw_t,s0) ++/etc/rc\.d/init\.d/bluetooth -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/dund -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/pand -- gen_context(system_u:object_r:bluetooth_initrc_exec_t,s0) + + # + # /usr +@@ -22,3 +25,4 @@ # /var/lib/bluetooth(/.*)? gen_context(system_u:object_r:bluetooth_var_lib_t,s0) /var/run/sdp -s gen_context(system_u:object_r:bluetooth_var_run_t,s0) +/var/run/bluetoothd_address gen_context(system_u:object_r:bluetooth_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/bluetooth -- gen_context(system_u:object_r:bluetooth_script_exec_t,s0) -+/etc/rc\.d/init\.d/dund -- gen_context(system_u:object_r:bluetooth_script_exec_t,s0) -+/etc/rc\.d/init\.d/pand -- gen_context(system_u:object_r:bluetooth_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.5.8/policy/modules/services/bluetooth.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.5.9/policy/modules/services/bluetooth.if --- nsaserefpolicy/policy/modules/services/bluetooth.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bluetooth.if 2008-09-17 08:49:08.000000000 -0400 -@@ -226,3 +226,88 @@ ++++ serefpolicy-3.5.9/policy/modules/services/bluetooth.if 2008-09-25 08:33:18.000000000 -0400 +@@ -226,3 +226,56 @@ dontaudit $1 bluetooth_helper_domain:dir search; dontaudit $1 bluetooth_helper_domain:file { read getattr }; ') + +######################################## +## -+## Execute bluetooth server in the bluetooth domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`bluetooth_script_domtrans',` -+ gen_require(` -+ type bluetooth_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, bluetooth_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an bluetooth environment +## @@ -12544,68 +12279,57 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the bluetooth domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`bluetooth_admin',` + gen_require(` -+ type bluetooth_t; -+ type bluetooth_script_exec_t; -+ type bluetooth_tmp_t; -+ type bluetooth_lock_t; -+ type bluetooth_spool_t; -+ type bluetooth_var_lib_t; -+ type bluetooth_var_run_t; -+ type bluetooth_conf_t; -+ type bluetooth_conf_rw_t; -+ ++ type bluetooth_t, bluetooth_tmp_t, bluetooth_lock_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; + ') + -+ allow $1 bluetooth_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, bluetooth_t, bluetooth_t) ++ allow $1 bluetooth_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, bluetooth_t) + -+ # Allow bluetooth_t to restart the apache service -+ bluetooth_script_domtrans($1) ++ init_labeled_script_domtrans($1, bluetooth_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 bluetooth_script_exec_t system_r; ++ role_transition $2 bluetooth_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, bluetooth_tmp_t) ++ admin_pattern($1, bluetooth_tmp_t) + + files_list_var($1) -+ admin_pattern($1, bluetooth_lock_t) ++ admin_pattern($1, bluetooth_lock_t) + + files_list_etc($1) -+ admin_pattern($1, bluetooth_conf_t) -+ admin_pattern($1, bluetooth_conf_rw_t) ++ 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) ++ admin_pattern($1, bluetooth_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, bluetooth_var_run_t) ++ admin_pattern($1, bluetooth_var_run_t) +') -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.5.8/policy/modules/services/bluetooth.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.5.9/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/bluetooth.te 2008-09-17 08:49:08.000000000 -0400 -@@ -32,19 +32,22 @@ - type bluetooth_var_run_t; - files_pid_file(bluetooth_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/bluetooth.te 2008-09-25 08:33:18.000000000 -0400 +@@ -20,6 +20,9 @@ + type bluetooth_helper_exec_t; + application_executable_file(bluetooth_helper_exec_t) -+type bluetooth_script_exec_t; -+init_script_file(bluetooth_script_exec_t) ++type bluetooth_initrc_exec_t; ++init_script_file(bluetooth_initrc_exec_t) + - ######################################## - # + type bluetooth_lock_t; + files_lock_file(bluetooth_lock_t) + +@@ -37,14 +40,14 @@ # Bluetooth services local policy # @@ -12669,44 +12393,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.fc serefpolicy-3.5.8/policy/modules/services/canna.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.fc serefpolicy-3.5.9/policy/modules/services/canna.fc --- nsaserefpolicy/policy/modules/services/canna.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/canna.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -20,3 +20,5 @@ - /var/run/\.iroha_unix -d gen_context(system_u:object_r:canna_var_run_t,s0) - /var/run/\.iroha_unix/.* -s gen_context(system_u:object_r:canna_var_run_t,s0) - /var/run/wnn-unix(/.*) gen_context(system_u:object_r:canna_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/canna -- gen_context(system_u:object_r:canna_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.if serefpolicy-3.5.8/policy/modules/services/canna.if ++++ serefpolicy-3.5.9/policy/modules/services/canna.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/canna -- gen_context(system_u:object_r:canna_initrc_exec_t,s0) + + # + # /usr +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.if serefpolicy-3.5.9/policy/modules/services/canna.if --- nsaserefpolicy/policy/modules/services/canna.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/canna.if 2008-09-17 08:49:08.000000000 -0400 -@@ -18,3 +18,74 @@ ++++ serefpolicy-3.5.9/policy/modules/services/canna.if 2008-09-25 08:33:18.000000000 -0400 +@@ -18,3 +18,47 @@ files_search_pids($1) stream_connect_pattern($1, canna_var_run_t, canna_var_run_t,canna_t) ') + +######################################## +## -+## Execute canna server in the canna domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`canna_script_domtrans',` -+ gen_require(` -+ type canna_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, canna_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an canna environment +## @@ -12720,59 +12424,56 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the canna domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`canna_admin',` + gen_require(` -+ type canna_t; -+ type canna_script_exec_t; -+ type canna_log_t; -+ type canna_var_lib_t; ++ type canna_t, canna_log_t, canna_var_lib_t; + type canna_var_run_t; ++ type canna_initrc_exec_t; + ') + -+ allow $1 canna_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, canna_t, canna_t) ++ allow $1 canna_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, canna_t) + -+ # Allow canna_t to restart the apache service -+ canna_script_domtrans($1) ++ init_labeled_script_domtrans($1, canna_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 canna_script_exec_t system_r; ++ role_transition $2 canna_initrc_exec_t system_r; + allow $2 system_r; + + logging_list_logs($1) -+ admin_pattern($1, canna_log_t) ++ admin_pattern($1, canna_log_t) + + files_list_var_lib($1) -+ admin_pattern($1, canna_var_lib_t) ++ admin_pattern($1, canna_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, canna_var_run_t) ++ admin_pattern($1, canna_var_run_t) +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.te serefpolicy-3.5.8/policy/modules/services/canna.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.te serefpolicy-3.5.9/policy/modules/services/canna.te --- nsaserefpolicy/policy/modules/services/canna.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/canna.te 2008-09-17 08:49:08.000000000 -0400 -@@ -19,6 +19,9 @@ - type canna_var_run_t; - files_pid_file(canna_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/canna.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type canna_exec_t; + init_daemon_domain(canna_t, canna_exec_t) -+type canna_script_exec_t; -+init_script_file(canna_script_exec_t) ++type canna_initrc_exec_t; ++init_script_file(canna_initrc_exec_t) + - ######################################## - # - # Local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.5.8/policy/modules/services/clamav.fc + type canna_log_t; + logging_log_file(canna_log_t) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.5.9/policy/modules/services/clamav.fc --- nsaserefpolicy/policy/modules/services/clamav.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/clamav.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -5,16 +5,18 @@ ++++ serefpolicy-3.5.9/policy/modules/services/clamav.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,20 +1,21 @@ + /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) @@ -12794,11 +12495,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) -+ -+/etc/rc\.d/init\.d/clamd-wrapper -- gen_context(system_u:object_r:clamd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-3.5.8/policy/modules/services/clamav.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-3.5.9/policy/modules/services/clamav.if --- nsaserefpolicy/policy/modules/services/clamav.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/clamav.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/clamav.if 2008-09-25 08:33:18.000000000 -0400 @@ -38,6 +38,27 @@ ######################################## @@ -12827,7 +12526,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Read clamav configuration files. ## ## -@@ -91,3 +112,116 @@ +@@ -91,3 +112,87 @@ domtrans_pattern($1, clamscan_exec_t, clamscan_t) ') @@ -12853,25 +12552,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute clamav server in the clamav domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`clamav_script_domtrans',` -+ gen_require(` -+ type clamd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, clamd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an clamav environment +## @@ -12885,87 +12565,70 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the clamav domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`clamav_admin',` + gen_require(` -+ type clamd_t; -+ type clamd_script_exec_t; -+ type clamd_etc_t; -+ type clamd_tmp_t; -+ type clamd_var_log_t; -+ type clamd_var_lib_t; ++ 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; -+ type clamscan_tmp_t; ++ type clamscan_t, clamscan_tmp_t; + -+ type freshclam_t; -+ type freshclam_var_log_t; ++ type freshclam_t, freshclam_var_log_t; ++ ++ type clamd_initrc_exec_t; + ') + -+ allow $1 clamd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, clamd_t, clamd_t) ++ allow $1 clamd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, clamd_t) + -+ allow $1 clamscan_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, clamscan_t, clamscan_t) ++ allow $1 clamscan_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, clamscan_t) + -+ allow $1 freshclam_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, freshclam_t, freshclam_t) ++ allow $1 freshclam_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, freshclam_t) + -+ # Allow clamd_t to restart the apache service -+ clamav_script_domtrans($1) ++ init_labeled_script_domtrans($1, clamd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 clamd_script_exec_t system_r; ++ role_transition $2 clamd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, clamd_tmp_t) ++ admin_pattern($1, clamd_tmp_t) + + files_list_etc($1) -+ admin_pattern($1, clamd_etc_t) ++ admin_pattern($1, clamd_etc_t) + + logging_list_logs($1) -+ admin_pattern($1, clamd_var_log_t) ++ admin_pattern($1, clamd_var_log_t) + + files_list_var_lib($1) -+ admin_pattern($1, clamd_var_lib_t) ++ admin_pattern($1, clamd_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, clamd_var_run_t) ++ admin_pattern($1, clamd_var_run_t) + -+ admin_pattern($1, clamscan_tmp_t) ++ admin_pattern($1, clamscan_tmp_t) + -+ admin_pattern($1, freshclam_var_log_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.5.8/policy/modules/services/clamav.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.5.9/policy/modules/services/clamav.te --- nsaserefpolicy/policy/modules/services/clamav.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/clamav.te 2008-09-17 08:49:08.000000000 -0400 -@@ -13,7 +13,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/clamav.te 2008-09-25 08:33:18.000000000 -0400 +@@ -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; -@@ -48,6 +48,9 @@ - type freshclam_var_log_t; - logging_log_file(freshclam_var_log_t) - -+type clamd_script_exec_t; -+init_script_file(clamd_script_exec_t) -+ - ######################################## - # - # clamd local policy @@ -87,6 +90,9 @@ kernel_dontaudit_list_proc(clamd_t) kernel_read_sysctl(clamd_t) @@ -13043,9 +12706,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/services/consolekit.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.5.9/policy/modules/services/consolekit.fc --- nsaserefpolicy/policy/modules/services/consolekit.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/consolekit.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/consolekit.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,3 +1,6 @@ /usr/sbin/console-kit-daemon -- gen_context(system_u:object_r:consolekit_exec_t,s0) @@ -13053,9 +12716,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.5.8/policy/modules/services/consolekit.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.5.9/policy/modules/services/consolekit.if --- nsaserefpolicy/policy/modules/services/consolekit.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/consolekit.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/consolekit.if 2008-09-25 08:33:18.000000000 -0400 @@ -38,3 +38,24 @@ allow $1 consolekit_t:dbus send_msg; allow consolekit_t $1:dbus send_msg; @@ -13081,9 +12744,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.5.8/policy/modules/services/consolekit.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.5.9/policy/modules/services/consolekit.te --- nsaserefpolicy/policy/modules/services/consolekit.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/consolekit.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/consolekit.te 2008-09-25 08:33:18.000000000 -0400 @@ -13,6 +13,9 @@ type consolekit_var_run_t; files_pid_file(consolekit_var_run_t) @@ -13198,9 +12861,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + fs_dontaudit_rw_cifs_files(consolekit_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.fc serefpolicy-3.5.8/policy/modules/services/courier.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.fc serefpolicy-3.5.9/policy/modules/services/courier.fc --- nsaserefpolicy/policy/modules/services/courier.fc 2008-08-14 13:08:27.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/courier.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/courier.fc 2008-09-25 08:33:18.000000000 -0400 @@ -19,5 +19,5 @@ /var/lib/courier(/.*)? -- gen_context(system_u:object_r:courier_var_lib_t,s0) @@ -13208,9 +12871,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - /var/spool/courier(/.*)? gen_context(system_u:object_r:courier_spool_t,s0) +/var/spool/authdaemon(/.*)? gen_context(system_u:object_r:courier_spool_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.5.8/policy/modules/services/courier.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.5.9/policy/modules/services/courier.te --- nsaserefpolicy/policy/modules/services/courier.te 2008-09-12 10:48:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/courier.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/courier.te 2008-09-25 08:33:18.000000000 -0400 @@ -10,6 +10,7 @@ type courier_etc_t; @@ -13229,9 +12892,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # Calendar (PCP) local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.5.8/policy/modules/services/cron.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.5.9/policy/modules/services/cron.fc --- nsaserefpolicy/policy/modules/services/cron.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cron.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/cron.fc 2008-09-25 08:33:18.000000000 -0400 @@ -17,6 +17,8 @@ /var/run/fcron\.fifo -s gen_context(system_u:object_r:crond_var_run_t,s0) /var/run/fcron\.pid -- gen_context(system_u:object_r:crond_var_run_t,s0) @@ -13246,9 +12909,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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_crond_var_lib_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.5.8/policy/modules/services/cron.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.5.9/policy/modules/services/cron.if --- nsaserefpolicy/policy/modules/services/cron.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cron.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/cron.if 2008-09-25 08:33:18.000000000 -0400 @@ -35,39 +35,24 @@ # template(`cron_per_role_template',` @@ -13598,9 +13261,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + read_files_pattern($1, system_crond_var_lib_t, system_crond_var_lib_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.5.8/policy/modules/services/cron.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.5.9/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cron.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/cron.te 2008-09-25 08:33:18.000000000 -0400 @@ -12,14 +12,6 @@ ## @@ -13872,18 +13535,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + userdom_priveleged_home_dir_manager(system_crond_t) ') -') dnl end TODO -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.5.8/policy/modules/services/cups.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.5.9/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cups.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -8,6 +8,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/cups.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -8,24 +8,31 @@ /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/hp(/.*)? gen_context(system_u:object_r:hplip_etc_t,s0) -@@ -16,16 +17,21 @@ /etc/printcap.* -- 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) @@ -13908,7 +13573,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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 +39,7 @@ +@@ -33,7 +40,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) @@ -13917,7 +13582,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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 +49,22 @@ +@@ -43,10 +50,20 @@ /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) @@ -13939,11 +13604,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) -+ -+/etc/rc\.d/init\.d/cups -- gen_context(system_u:object_r:cups_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.5.8/policy/modules/services/cups.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.5.9/policy/modules/services/cups.if --- nsaserefpolicy/policy/modules/services/cups.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cups.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/cups.if 2008-09-25 08:33:18.000000000 -0400 @@ -20,6 +20,30 @@ ######################################## @@ -14001,32 +13664,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Write cups log files. ## ## -@@ -247,3 +290,99 @@ +@@ -247,3 +290,67 @@ files_search_pids($1) stream_connect_pattern($1, ptal_var_run_t, ptal_var_run_t, ptal_t) ') + +######################################## +## -+## Execute cups server in the cups domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`cups_script_domtrans',` -+ gen_require(` -+ type cups_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, cups_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an cups environment +## @@ -14040,71 +13684,68 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the cups domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`cups_admin',` + gen_require(` -+ type cups_t; -+ type cups_script_exec_t; -+ type cups_tmp_t; -+ type cups_lpd_tmp_t; -+ type cups_etc_t; -+ type cups_log_t; -+ type cups_spool_t; -+ type cups_config_var_run_t; -+ type cups_lpd_var_run_t; -+ type cups_var_run_t; -+ type ptal_etc_t; -+ type ptal_var_run_t; -+ type hplip_var_run_t; -+ ') -+ -+ allow $1 cups_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, cups_t, cups_t) ++ 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) + -+ # Allow cups_t to restart the apache service -+ cups_script_domtrans($1) ++ init_labeled_script_domtrans($1, cupsd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 cups_script_exec_t system_r; ++ role_transition $2 cupsd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, cups_tmp_t) ++ admin_pattern($1, cupsd_tmp_t) + -+ admin_pattern($1, cups_lpd_tmp_t) ++ admin_pattern($1, cupsd_lpd_tmp_t) + + files_list_etc($1) -+ admin_pattern($1, cups_etc_t) ++ admin_pattern($1, cupsd_etc_t) + -+ admin_pattern($1, ptal_etc_t) ++ admin_pattern($1, ptal_etc_t) + + files_list_spool($1) -+ admin_pattern($1, cups_spool_t) ++ admin_pattern($1, cupsd_spool_t) + + logging_list_logs($1) -+ admin_pattern($1, cups_log_t) ++ admin_pattern($1, cupsd_log_t) + + files_list_pids($1) -+ admin_pattern($1, cups_var_run_t) ++ admin_pattern($1, cupsd_var_run_t) + -+ admin_pattern($1, ptal_var_run_t) ++ admin_pattern($1, ptal_var_run_t) + -+ admin_pattern($1, cups_config_var_run_t) ++ admin_pattern($1, cupsd_config_var_run_t) + -+ admin_pattern($1, cups_lpd_var_run_t) ++ admin_pattern($1, cupsd_lpd_var_run_t) + -+ admin_pattern($1, hplip_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.5.8/policy/modules/services/cups.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.5.9/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2008-09-03 07:59:15.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cups.te 2008-09-22 14:18:53.000000000 -0400 -@@ -48,6 +48,10 @@ ++++ serefpolicy-3.5.9/policy/modules/services/cups.te 2008-09-25 08:33:18.000000000 -0400 +@@ -20,6 +20,9 @@ + type cupsd_etc_t; + files_config_file(cupsd_etc_t) + ++type cupsd_initrc_exec_t; ++init_script_file(cupsd_initrc_exec_t) ++ + type cupsd_rw_etc_t; + files_config_file(cupsd_rw_etc_t) + +@@ -48,6 +51,10 @@ type hplip_t; type hplip_exec_t; init_daemon_domain(hplip_t, hplip_exec_t) @@ -14115,13 +13756,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type hplip_etc_t; files_config_file(hplip_etc_t) -@@ -65,6 +69,19 @@ +@@ -65,6 +72,16 @@ type ptal_var_run_t; files_pid_file(ptal_var_run_t) -+type cups_script_exec_t; -+init_script_file(cups_script_exec_t) -+ +type cups_pdf_t; +type cups_pdf_exec_t; +domain_type(cups_pdf_t) @@ -14465,9 +14103,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +sysadm_dontaudit_read_home_content_files(cups_pdf_t) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.fc serefpolicy-3.5.8/policy/modules/services/cvs.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.fc serefpolicy-3.5.9/policy/modules/services/cvs.fc --- nsaserefpolicy/policy/modules/services/cvs.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cvs.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/cvs.fc 2008-09-25 08:33:18.000000000 -0400 @@ -5,3 +5,6 @@ /var/cvs(/.*)? gen_context(system_u:object_r:cvs_data_t,s0) @@ -14475,124 +14113,36 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +#CVSWeb file context +/usr/share/cvsweb/cvsweb\.cgi -- gen_context(system_u:object_r:httpd_cvs_script_exec_t,s0) +/var/www/cgi-bin/cvsweb\.cgi -- gen_context(system_u:object_r:httpd_cvs_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.if serefpolicy-3.5.8/policy/modules/services/cvs.if ---- nsaserefpolicy/policy/modules/services/cvs.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cvs.if 2008-09-17 08:49:08.000000000 -0400 -@@ -36,3 +36,70 @@ - - can_exec($1, cvs_exec_t) - ') -+ -+######################################## -+## -+## Execute cvs server in the cvs domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`cvs_script_domtrans',` -+ gen_require(` -+ type cvs_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, cvs_script_exec_t) -+') -+ -+######################################## -+## -+## All of the rules required to administrate -+## an cvs environment -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to be allowed to manage the cvs domain. -+## -+## -+## -+## -+## The type of the user terminal. -+## -+## -+## -+# -+interface(`cvs_admin',` -+ gen_require(` -+ type cvs_t, cvs_tmp_t; -+ type cvs_data_t, cvs_var_run_t; -+ type cvs_script_exec_t; -+ ') -+ -+ allow $1 cvs_t:process { ptrace signal_perms }; -+ ps_process_pattern($1, cvs_t) -+ -+ # Allow cvs_t to restart the apache service -+ cvs_script_domtrans($1) -+ domain_system_change_exemption($1) -+ role_transition $2 cvs_script_exec_t system_r; -+ allow $2 system_r; +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.if serefpolicy-3.5.9/policy/modules/services/cvs.if +--- nsaserefpolicy/policy/modules/services/cvs.if 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/cvs.if 2008-09-25 08:33:18.000000000 -0400 +@@ -69,4 +69,13 @@ + domain_system_change_exemption($1) + role_transition $2 cvs_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, cvs_tmp_t) ++ admin_pattern($1, cvs_tmp_t) + + admin_pattern($1, cvs_data_t) + + files_list_pids($1) -+ admin_pattern($1, cvs_var_run_t) -+') -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.5.8/policy/modules/services/cvs.te ---- nsaserefpolicy/policy/modules/services/cvs.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cvs.te 2008-09-17 08:49:08.000000000 -0400 -@@ -28,6 +28,9 @@ - type cvs_var_run_t; - files_pid_file(cvs_var_run_t) - -+type cvs_script_exec_t; -+init_script_file(cvs_script_exec_t) ++ admin_pattern($1, cvs_var_run_t) + ') + - ######################################## - # - # Local policy -@@ -69,6 +72,7 @@ - fs_getattr_xattr_fs(cvs_t) - - auth_domtrans_chk_passwd(cvs_t) -+auth_use_nsswitch(cvs_t) - - corecmd_exec_bin(cvs_t) - corecmd_exec_shell(cvs_t) -@@ -86,8 +90,6 @@ - - miscfiles_read_localization(cvs_t) - --sysnet_read_config(cvs_t) -- - mta_send_mail(cvs_t) - - # cjp: typeattribute doesnt work in conditionals yet -@@ -97,16 +99,18 @@ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.5.9/policy/modules/services/cvs.te +--- nsaserefpolicy/policy/modules/services/cvs.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/cvs.te 2008-09-25 08:33:18.000000000 -0400 +@@ -99,7 +99,17 @@ ') optional_policy(` -- kerberos_use(cvs_t) - kerberos_read_keytab(cvs_t) + kerberos_keytab_template(cvs, cvs_t) kerberos_read_config(cvs_t) kerberos_dontaudit_write_config(cvs_t) ') - --optional_policy(` -- nis_use_ypbind(cvs_t) --') ++ +######################################## +# CVSWeb policy + @@ -14602,48 +14152,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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 }) - --optional_policy(` -- nscd_socket_use(cvs_t) --') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.fc serefpolicy-3.5.8/policy/modules/services/cyrus.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.fc serefpolicy-3.5.9/policy/modules/services/cyrus.fc --- nsaserefpolicy/policy/modules/services/cyrus.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cyrus.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -2,3 +2,5 @@ ++++ serefpolicy-3.5.9/policy/modules/services/cyrus.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/cyrus -- gen_context(system_u:object_r:cyrus_initrc_exec_t,s0) + /usr/lib(64)?/cyrus-imapd/cyrus-master -- gen_context(system_u:object_r:cyrus_exec_t,s0) - /var/lib/imap(/.*)? gen_context(system_u:object_r:cyrus_var_lib_t,s0) -+ -+/etc/rc\.d/init\.d/cyrus -- gen_context(system_u:object_r:cyrus_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.if serefpolicy-3.5.8/policy/modules/services/cyrus.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.if serefpolicy-3.5.9/policy/modules/services/cyrus.if --- nsaserefpolicy/policy/modules/services/cyrus.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cyrus.if 2008-09-17 08:49:08.000000000 -0400 -@@ -39,3 +39,74 @@ ++++ serefpolicy-3.5.9/policy/modules/services/cyrus.if 2008-09-25 08:33:18.000000000 -0400 +@@ -39,3 +39,47 @@ files_search_var_lib($1) stream_connect_pattern($1, cyrus_var_lib_t, cyrus_var_lib_t, cyrus_t) ') + +######################################## +## -+## Execute cyrus server in the cyrus domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`cyrus_script_domtrans',` -+ gen_require(` -+ type cyrus_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, cyrus_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an cyrus environment +## @@ -14657,55 +14183,47 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the cyrus domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`cyrus_admin',` + gen_require(` -+ type cyrus_t; -+ type cyrus_script_exec_t; -+ type cyrus_tmp_t; -+ type cyrus_var_lib_t; ++ type cyrus_t, cyrus_tmp_t, cyrus_var_lib_t; + type cyrus_var_run_t; ++ type cyrus_initrc_exec_t; + ') + -+ allow $1 cyrus_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, cyrus_t, cyrus_t) ++ allow $1 cyrus_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, cyrus_t) + -+ # Allow cyrus_t to restart the apache service -+ cyrus_script_domtrans($1) ++ init_labeled_script_domtrans($1, cyrus_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 cyrus_script_exec_t system_r; ++ role_transition $2 cyrus_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, cyrus_tmp_t) ++ admin_pattern($1, cyrus_tmp_t) + + files_list_var_lib($1) -+ admin_pattern($1, cyrus_var_lib_t) ++ admin_pattern($1, cyrus_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, cyrus_var_run_t) ++ admin_pattern($1, cyrus_var_run_t) +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.5.8/policy/modules/services/cyrus.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.5.9/policy/modules/services/cyrus.te --- nsaserefpolicy/policy/modules/services/cyrus.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/cyrus.te 2008-09-17 08:49:08.000000000 -0400 -@@ -19,6 +19,9 @@ - type cyrus_var_run_t; - files_pid_file(cyrus_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/cyrus.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type cyrus_exec_t; + init_daemon_domain(cyrus_t, cyrus_exec_t) -+type cyrus_script_exec_t; -+init_script_file(cyrus_script_exec_t) ++type cyrus_initrc_exec_t; ++init_script_file(cyrus_initrc_exec_t) + - ######################################## - # - # Local policy + type cyrus_tmp_t; + files_tmp_file(cyrus_tmp_t) + @@ -120,7 +123,7 @@ ') @@ -14715,9 +14233,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.5.8/policy/modules/services/dbus.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.5.9/policy/modules/services/dbus.fc --- nsaserefpolicy/policy/modules/services/dbus.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dbus.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/dbus.fc 2008-09-25 08:33:18.000000000 -0400 @@ -4,6 +4,9 @@ /usr/bin/dbus-daemon(-1)? -- gen_context(system_u:object_r:system_dbusd_exec_t,s0) /bin/dbus-daemon -- gen_context(system_u:object_r:system_dbusd_exec_t,s0) @@ -14728,9 +14246,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.5.8/policy/modules/services/dbus.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.5.9/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dbus.if 2008-09-23 15:34:03.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/dbus.if 2008-09-25 08:33:18.000000000 -0400 @@ -53,6 +53,7 @@ gen_require(` type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t; @@ -15029,9 +14547,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/dbus.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.5.9/policy/modules/services/dbus.te --- nsaserefpolicy/policy/modules/services/dbus.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dbus.te 2008-09-23 15:32:31.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/dbus.te 2008-09-25 08:33:18.000000000 -0400 @@ -9,9 +9,10 @@ # # Delcarations @@ -15126,7 +14644,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + +optional_policy(` -+ networkmanager_script_domtrans(system_dbusd_t) ++ networkmanager_initrc_domtrans(system_dbusd_t) +') + +optional_policy(` @@ -15150,12 +14668,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + unconfined_execmem_domtrans(unconfined_dbusd_t) + + optional_policy(` -+ xserver_xdm_rw_shm(unconfined_dbusd_t) ++ xserver_rw_xdm_xserver_shm(unconfined_dbusd_t) + ') +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.if serefpolicy-3.5.8/policy/modules/services/dcc.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.if serefpolicy-3.5.9/policy/modules/services/dcc.if --- nsaserefpolicy/policy/modules/services/dcc.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dcc.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/dcc.if 2008-09-25 08:33:18.000000000 -0400 @@ -72,6 +72,24 @@ ######################################## @@ -15181,9 +14699,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Execute dcc_client in the dcc_client domain, and ## allow the specified role the dcc_client domain. ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.5.8/policy/modules/services/dcc.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.5.9/policy/modules/services/dcc.te --- nsaserefpolicy/policy/modules/services/dcc.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dcc.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/dcc.te 2008-09-25 08:33:18.000000000 -0400 @@ -105,6 +105,8 @@ files_read_etc_files(cdcc_t) files_read_etc_runtime_files(cdcc_t) @@ -15353,44 +14871,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_sigchld_newrole(dccm_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.fc serefpolicy-3.5.8/policy/modules/services/ddclient.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.fc serefpolicy-3.5.9/policy/modules/services/ddclient.fc --- nsaserefpolicy/policy/modules/services/ddclient.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ddclient.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -9,3 +9,5 @@ - /var/log/ddtcd\.log.* -- gen_context(system_u:object_r:ddclient_log_t,s0) - /var/run/ddclient\.pid -- gen_context(system_u:object_r:ddclient_var_run_t,s0) - /var/run/ddtcd\.pid -- gen_context(system_u:object_r:ddclient_var_run_t,s0) -+/etc/rc\.d/init\.d/ddclient -- gen_context(system_u:object_r:ddclient_script_exec_t,s0) -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.if serefpolicy-3.5.8/policy/modules/services/ddclient.if ++++ serefpolicy-3.5.9/policy/modules/services/ddclient.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,5 +1,6 @@ + /etc/ddclient\.conf -- gen_context(system_u:object_r:ddclient_etc_t,s0) + /etc/ddtcd\.conf -- gen_context(system_u:object_r:ddclient_etc_t,s0) ++/etc/rc\.d/init\.d/ddclient -- gen_context(system_u:object_r:ddclient_initrc_exec_t,s0) + + /usr/sbin/ddclient -- gen_context(system_u:object_r:ddclient_exec_t,s0) + /usr/sbin/ddtcd -- gen_context(system_u:object_r:ddclient_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.if serefpolicy-3.5.9/policy/modules/services/ddclient.if --- nsaserefpolicy/policy/modules/services/ddclient.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ddclient.if 2008-09-17 08:49:08.000000000 -0400 -@@ -18,3 +18,81 @@ ++++ serefpolicy-3.5.9/policy/modules/services/ddclient.if 2008-09-25 08:33:18.000000000 -0400 +@@ -18,3 +18,52 @@ corecmd_search_bin($1) domtrans_pattern($1, ddclient_exec_t, ddclient_t) ') + +######################################## +## -+## Execute ddclient server in the ddclient domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`ddclient_script_domtrans',` -+ gen_require(` -+ type ddclient_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, ddclient_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an ddclient environment +## @@ -15404,85 +14904,66 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the ddclient domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`ddclient_admin',` + gen_require(` -+ type ddclient_t; -+ type ddclient_script_exec_t; -+ type ddclient_etc_t; -+ type ddclient_log_t; -+ type ddclient_var_t; -+ type ddclient_var_lib_t; ++ type ddclient_t, ddclient_etc_t, ddclient_log_t; ++ type ddclient_var_t, ddclient_var_lib_t; + type ddclient_var_run_t; ++ type ddclient_initrc_exec_t; + ') + -+ allow $1 ddclient_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, ddclient_t, ddclient_t) ++ allow $1 ddclient_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, ddclient_t) + -+ # Allow ddclient_t to restart the apache service -+ ddclient_script_domtrans($1) ++ init_labeled_script_domtrans($1, ddclient_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 ddclient_script_exec_t system_r; ++ role_transition $2 ddclient_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, ddclient_etc_t) ++ admin_pattern($1, ddclient_etc_t) + + files_list_var($1) -+ admin_pattern($1, ddclient_var_t) ++ admin_pattern($1, ddclient_var_t) + + logging_list_logs($1) -+ admin_pattern($1, ddclient_log_t) ++ admin_pattern($1, ddclient_log_t) + + files_list_var_lib($1) -+ admin_pattern($1, ddclient_var_lib_t) ++ admin_pattern($1, ddclient_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, ddclient_var_run_t) -+ ++ admin_pattern($1, ddclient_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.te serefpolicy-3.5.8/policy/modules/services/ddclient.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.te serefpolicy-3.5.9/policy/modules/services/ddclient.te --- nsaserefpolicy/policy/modules/services/ddclient.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ddclient.te 2008-09-17 08:49:08.000000000 -0400 -@@ -11,7 +11,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/ddclient.te 2008-09-25 08:33:18.000000000 -0400 +@@ -11,7 +11,10 @@ init_daemon_domain(ddclient_t, ddclient_exec_t) type ddclient_etc_t; -files_type(ddclient_etc_t) +files_config_file(ddclient_etc_t) ++ ++type ddclient_initrc_exec_t; ++init_script_file(ddclient_initrc_exec_t) type ddclient_log_t; logging_log_file(ddclient_log_t) -@@ -25,6 +25,9 @@ - type ddclient_var_run_t; - files_pid_file(ddclient_var_run_t) - -+type ddclient_script_exec_t; -+init_script_file(ddclient_script_exec_t) -+ - ######################################## - # - # Declarations -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.fc serefpolicy-3.5.8/policy/modules/services/dhcp.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.fc serefpolicy-3.5.9/policy/modules/services/dhcp.fc --- nsaserefpolicy/policy/modules/services/dhcp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dhcp.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -5,3 +5,6 @@ - /var/lib/dhcp(3)?/dhcpd\.leases.* -- gen_context(system_u:object_r:dhcpd_state_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/dhcp.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/dhcpd -- gen_context(system_u:object_r:dhcpd_initrc_exec_t,s0) - /var/run/dhcpd\.pid -- gen_context(system_u:object_r:dhcpd_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/dhcpd -- gen_context(system_u:object_r:dhcpd_script_exec_t,s0) -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.5.8/policy/modules/services/dhcp.if + /usr/sbin/dhcpd.* -- gen_context(system_u:object_r:dhcpd_exec_t,s0) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.5.9/policy/modules/services/dhcp.if --- nsaserefpolicy/policy/modules/services/dhcp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dhcp.if 2008-09-17 08:49:08.000000000 -0400 -@@ -19,3 +19,71 @@ ++++ serefpolicy-3.5.9/policy/modules/services/dhcp.if 2008-09-25 08:33:18.000000000 -0400 +@@ -19,3 +19,63 @@ sysnet_search_dhcp_state($1) allow $1 dhcpd_state_t:file setattr; ') @@ -15498,12 +14979,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +# +# -+interface(`dhcpd_script_domtrans',` ++interface(`dhcpd_initrc_domtrans',` + gen_require(` -+ type dhcpd_script_exec_t; ++ type dhcpd_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, dhcpd_script_exec_t) ++ init_labeled_script_domtrans($1, dhcpd_initrc_exec_t) +') + +######################################## @@ -15521,29 +15002,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the dhcp domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`dhcpd_admin',` + gen_require(` -+ type dhcpd_t; -+ type dhcpd_script_exec_t; -+ type dhcpd_tmp_t; -+ type dhcpd_state_t; ++ type dhcpd_t; type dhcpd_tmp_t; type dhcpd_state_t; + type dhcpd_var_run_t; ++ type dhcpd_initrc_exec_t; + ') + -+ allow $1 dhcpd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, dhcpd_t, dhcpd_t) ++ allow $1 dhcpd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, dhcpd_t) + -+ # Allow dhcpd_t to restart the apache service -+ dhcpd_script_domtrans($1) ++ init_labeled_script_domtrans($1, dhcpd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 dhcpd_script_exec_t system_r; ++ role_transition $2 dhcpd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) @@ -15554,18 +15027,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_list_pids($1) + admin_pattern($1, dhcpd_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.5.8/policy/modules/services/dhcp.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.5.9/policy/modules/services/dhcp.te --- nsaserefpolicy/policy/modules/services/dhcp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dhcp.te 2008-09-17 08:49:08.000000000 -0400 -@@ -19,18 +19,20 @@ - type dhcpd_var_run_t; - files_pid_file(dhcpd_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/dhcp.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type dhcpd_exec_t; + init_daemon_domain(dhcpd_t, dhcpd_exec_t) -+type dhcpd_script_exec_t; -+init_script_file(dhcpd_script_exec_t) ++type dhcpd_initrc_exec_t; ++init_script_file(dhcpd_initrc_exec_t) + - ######################################## - # + type dhcpd_state_t; + files_type(dhcpd_state_t) + +@@ -24,13 +27,12 @@ # Local policy # @@ -15620,45 +15095,29 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_sigchld_newrole(dhcpd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.fc serefpolicy-3.5.8/policy/modules/services/dictd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.fc serefpolicy-3.5.9/policy/modules/services/dictd.fc --- nsaserefpolicy/policy/modules/services/dictd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dictd.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -4,3 +4,6 @@ ++++ serefpolicy-3.5.9/policy/modules/services/dictd.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,6 +1,9 @@ ++/etc/rc\.d/init\.d/dictd -- gen_context(system_u:object_r:dictd_initrc_exec_t,s0) + + /etc/dictd\.conf -- gen_context(system_u:object_r:dictd_etc_t,s0) + /usr/sbin/dictd -- gen_context(system_u:object_r:dictd_exec_t,s0) /var/lib/dictd(/.*)? gen_context(system_u:object_r:dictd_var_lib_t,s0) +/var/run/dictd\.pid -- gen_context(system_u:object_r:dictd_var_run_t,s0) + -+/etc/rc\.d/init\.d/dictd -- gen_context(system_u:object_r:dictd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.if serefpolicy-3.5.8/policy/modules/services/dictd.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.if serefpolicy-3.5.9/policy/modules/services/dictd.if --- nsaserefpolicy/policy/modules/services/dictd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dictd.if 2008-09-17 08:49:08.000000000 -0400 -@@ -14,3 +14,73 @@ ++++ serefpolicy-3.5.9/policy/modules/services/dictd.if 2008-09-25 08:33:18.000000000 -0400 +@@ -14,3 +14,46 @@ interface(`dictd_tcp_connect',` refpolicywarn(`$0($*) has been deprecated.') ') + +######################################## +## -+## Execute dictd server in the dictd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`dictd_script_domtrans',` -+ gen_require(` -+ type dictd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, dictd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an dictd environment +## @@ -15672,54 +15131,49 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the dictd domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`dictd_admin',` + gen_require(` -+ type dictd_t; -+ type dictd_script_exec_t; -+ type dictd_etc_t; -+ type dictd_var_lib_t; ++ type dictd_t, dictd_etc_t, dictd_var_lib_t; + type dictd_var_run_t; ++ type dictd_initrc_exec_t; + ') + -+ allow $1 dictd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, dictd_t, dictd_t) ++ allow $1 dictd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, dictd_t) + -+ # Allow dictd_t to restart the apache service -+ dictd_script_domtrans($1) ++ init_labeled_script_domtrans($1, dictd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 dictd_script_exec_t system_r; ++ role_transition $2 dictd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, dictd_etc_t) ++ admin_pattern($1, dictd_etc_t) + + files_list_var_lib($1) -+ admin_pattern($1, dictd_var_lib_t) ++ admin_pattern($1, dictd_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, dictd_var_run_t) ++ admin_pattern($1, dictd_var_run_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.te serefpolicy-3.5.8/policy/modules/services/dictd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dictd.te serefpolicy-3.5.9/policy/modules/services/dictd.te --- nsaserefpolicy/policy/modules/services/dictd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dictd.te 2008-09-17 08:49:08.000000000 -0400 -@@ -16,6 +16,12 @@ ++++ serefpolicy-3.5.9/policy/modules/services/dictd.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,9 +13,15 @@ + type dictd_etc_t; + files_config_file(dictd_etc_t) + ++type dictd_initrc_exec_t; ++init_script_file(dictd_initrc_exec_t) ++ type dictd_var_lib_t alias var_lib_dictd_t; files_type(dictd_var_lib_t) +type dictd_var_run_t; +files_pid_file(dictd_var_run_t) + -+type dictd_script_exec_t; -+init_script_file(dictd_script_exec_t) -+ ######################################## # # Local policy @@ -15733,21 +15187,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_system_state(dictd_t) kernel_read_kernel_sysctls(dictd_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.fc serefpolicy-3.5.8/policy/modules/services/dnsmasq.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.fc serefpolicy-3.5.9/policy/modules/services/dnsmasq.fc --- nsaserefpolicy/policy/modules/services/dnsmasq.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/dnsmasq.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,4 +1,7 @@ ++/etc/rc\.d/init\.d/dnsmasq -- gen_context(system_u:object_r:dnsmasq_initrc_exec_t,s0) ++ /usr/sbin/dnsmasq -- gen_context(system_u:object_r:dnsmasq_exec_t,s0) /var/lib/misc/dnsmasq\.leases -- gen_context(system_u:object_r:dnsmasq_lease_t,s0) +/var/lib/dnsmasq(/.*)? gen_context(system_u:object_r:dnsmasq_lease_t,s0) /var/run/dnsmasq\.pid -- gen_context(system_u:object_r:dnsmasq_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/dnsmasq -- gen_context(system_u:object_r:dnsmasq_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.5.8/policy/modules/services/dnsmasq.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.5.9/policy/modules/services/dnsmasq.if --- nsaserefpolicy/policy/modules/services/dnsmasq.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.if 2008-09-17 08:49:08.000000000 -0400 -@@ -1 +1,125 @@ ++++ serefpolicy-3.5.9/policy/modules/services/dnsmasq.if 2008-09-25 08:33:18.000000000 -0400 +@@ -1 +1,117 @@ ## dnsmasq DNS forwarder and DHCP server + +######################################## @@ -15782,12 +15236,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +# +# -+interface(`dnsmasq_script_domtrans',` ++interface(`dnsmasq_initrc_domtrans',` + gen_require(` -+ type dnsmasq_script_exec_t; ++ type dnsmasq_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, dnsmasq_script_exec_t) ++ init_labeled_script_domtrans($1, dnsmasq_initrc_exec_t) +') + +######################################## @@ -15843,49 +15297,41 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the dnsmasq domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`dnsmasq_admin',` + gen_require(` -+ type dnsmasq_t; -+ type dnsmasq_script_exec_t; -+ type dnsmasq_lease_t; -+ type dnsmasq_var_run_t; ++ type dnsmasq_t, dnsmasq_lease_t, dnsmasq_var_run_t; ++ type dnsmasq_initrc_exec_t; + ') + -+ allow $1 dnsmasq_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, dnsmasq_t, dnsmasq_t) ++ allow $1 dnsmasq_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, dnsmasq_t) + -+ # Allow dnsmasq_t to restart the apache service -+ dnsmasq_script_domtrans($1) ++ init_labeled_script_domtrans($1, dnsmasq_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 dnsmasq_script_exec_t system_r; ++ role_transition $2 dnsmasq_initrc_exec_t system_r; + allow $2 system_r; + + files_list_var_lib($1) -+ admin_pattern($1, dnsmasq_lease_t) ++ admin_pattern($1, dnsmasq_lease_t) + + files_list_pids($1) -+ admin_pattern($1, dnsmasq_var_run_t) ++ admin_pattern($1, dnsmasq_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.5.8/policy/modules/services/dnsmasq.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.5.9/policy/modules/services/dnsmasq.te --- nsaserefpolicy/policy/modules/services/dnsmasq.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dnsmasq.te 2008-09-17 08:49:08.000000000 -0400 -@@ -16,6 +16,9 @@ - type dnsmasq_var_run_t; - files_pid_file(dnsmasq_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/dnsmasq.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type dnsmasq_exec_t; + init_daemon_domain(dnsmasq_t, dnsmasq_exec_t) -+type dnsmasq_script_exec_t; -+init_script_file(dnsmasq_script_exec_t) ++type dnsmasq_initrc_exec_t; ++init_script_file(dnsmasq_initrc_exec_t) + - ######################################## - # - # Local policy + type dnsmasq_lease_t; + files_type(dnsmasq_lease_t) + @@ -23,7 +26,7 @@ allow dnsmasq_t self:capability { net_admin setgid setuid net_bind_service net_raw }; @@ -15921,10 +15367,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + virt_manage_lib_files(dnsmasq_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.5.8/policy/modules/services/dovecot.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.5.9/policy/modules/services/dovecot.fc --- nsaserefpolicy/policy/modules/services/dovecot.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dovecot.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -17,23 +17,24 @@ ++++ serefpolicy-3.5.9/policy/modules/services/dovecot.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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,23 +18,22 @@ ifdef(`distro_debian', ` /usr/lib/dovecot/dovecot-auth -- gen_context(system_u:object_r:dovecot_auth_exec_t,s0) @@ -15949,14 +15403,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -/var/spool/dovecot(/.*)? gen_context(system_u:object_r:dovecot_spool_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) - -+/etc/rc\.d/init\.d/dovecot -- gen_context(system_u:object_r:dovecot_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.5.8/policy/modules/services/dovecot.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.5.9/policy/modules/services/dovecot.if --- nsaserefpolicy/policy/modules/services/dovecot.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dovecot.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/dovecot.if 2008-09-25 08:33:18.000000000 -0400 @@ -21,7 +21,46 @@ ######################################## @@ -16005,32 +15458,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## ## ## -@@ -36,3 +75,89 @@ +@@ -36,3 +75,60 @@ dontaudit $1 dovecot_var_lib_t:file unlink; ') + +######################################## +## -+## Execute dovecot server in the dovecot domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`dovecot_script_domtrans',` -+ gen_require(` -+ type dovecot_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, dovecot_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an dovecot environment +## @@ -16044,61 +15478,51 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the dovecot domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`dovecot_admin',` + gen_require(` -+ type dovecot_t; -+ type dovecot_script_exec_t; -+ type dovecot_etc_t; -+ type dovecot_log_t; -+ type dovecot_spool_t; -+ type dovecot_var_lib_t; ++ 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; -+ type dovecot_passwd_t; ++ type dovecot_cert_t, dovecot_passwd_t; ++ type dovecot_initrc_exec_t; + ') + -+ allow $1 dovecot_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, dovecot_t, dovecot_t) ++ allow $1 dovecot_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, dovecot_t) + -+ # Allow dovecot_t to restart the apache service -+ dovecot_script_domtrans($1) ++ init_labeled_script_domtrans($1, dovecot_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 dovecot_script_exec_t system_r; ++ role_transition $2 dovecot_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, dovecot_etc_t) ++ admin_pattern($1, dovecot_etc_t) + + logging_list_logs($1) -+ admin_pattern($1, dovecot_log_t) ++ 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) ++ admin_pattern($1, dovecot_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, dovecot_var_run_t) ++ admin_pattern($1, dovecot_var_run_t) + -+ admin_pattern($1, dovecot_cert_t) ++ admin_pattern($1, dovecot_cert_t) + -+ admin_pattern($1, dovecot_passwd_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.5.8/policy/modules/services/dovecot.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.5.9/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/dovecot.te 2008-09-17 08:49:08.000000000 -0400 -@@ -15,6 +15,12 @@ ++++ serefpolicy-3.5.9/policy/modules/services/dovecot.te 2008-09-25 08:33:18.000000000 -0400 +@@ -15,12 +15,21 @@ domain_entry_file(dovecot_auth_t, dovecot_auth_exec_t) role system_r types dovecot_auth_t; @@ -16111,7 +15535,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type dovecot_cert_t; files_type(dovecot_cert_t) -@@ -31,9 +37,18 @@ + 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) @@ -16124,9 +15557,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +type dovecot_auth_tmp_t; +files_tmp_file(dovecot_auth_tmp_t) + -+type dovecot_script_exec_t; -+init_script_file(dovecot_script_exec_t) -+ ######################################## # # dovecot local policy @@ -16261,9 +15691,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/exim.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.5.9/policy/modules/services/exim.if --- nsaserefpolicy/policy/modules/services/exim.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/exim.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/exim.if 2008-09-25 08:33:18.000000000 -0400 @@ -97,6 +97,26 @@ ######################################## @@ -16315,9 +15745,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/exim.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.5.9/policy/modules/services/exim.te --- nsaserefpolicy/policy/modules/services/exim.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/exim.te 2008-09-17 08:56:24.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/exim.te 2008-09-25 08:33:18.000000000 -0400 @@ -21,9 +21,20 @@ ## gen_tunable(exim_manage_user_files, false) @@ -16339,15 +15769,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type exim_log_t; logging_log_file(exim_log_t) -@@ -37,15 +48,20 @@ - type exim_var_run_t; - files_pid_file(exim_var_run_t) - -+type exim_script_exec_t; -+init_script_file(exim_script_exec_t) -+ - ######################################## - # +@@ -42,10 +53,12 @@ # exim local policy # @@ -16362,7 +15784,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol can_exec(exim_t,exim_exec_t) -@@ -66,12 +82,15 @@ +@@ -66,12 +79,15 @@ files_pid_filetrans(exim_t, exim_var_run_t, { file dir }) kernel_read_kernel_sysctls(exim_t) @@ -16379,7 +15801,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_tcp_sendrecv_all_if(exim_t) corenet_tcp_sendrecv_all_nodes(exim_t) corenet_tcp_sendrecv_all_ports(exim_t) -@@ -82,6 +101,8 @@ +@@ -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) @@ -16388,7 +15810,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol dev_read_rand(exim_t) dev_read_urand(exim_t) -@@ -89,6 +110,8 @@ +@@ -89,6 +107,8 @@ # Init script handling domain_use_interactive_fds(exim_t) @@ -16397,7 +15819,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_read_etc_files(exim_t) auth_use_nsswitch(exim_t) -@@ -99,23 +122,86 @@ +@@ -99,23 +119,86 @@ logging_send_syslog_msg(exim_t) miscfiles_read_localization(exim_t) @@ -16491,9 +15913,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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/fail2ban.fc serefpolicy-3.5.8/policy/modules/services/fail2ban.fc ---- nsaserefpolicy/policy/modules/services/fail2ban.fc 2008-09-08 10:18:37.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/fail2ban.fc 2008-09-19 11:19:25.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.5.9/policy/modules/services/fail2ban.fc +--- nsaserefpolicy/policy/modules/services/fail2ban.fc 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/fail2ban.fc 2008-09-25 08:33:18.000000000 -0400 @@ -3,5 +3,5 @@ /usr/bin/fail2ban -- gen_context(system_u:object_r:fail2ban_exec_t,s0) /usr/bin/fail2ban-server -- gen_context(system_u:object_r:fail2ban_exec_t,s0) @@ -16502,35 +15924,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -/var/run/fail2ban\.sock -s gen_context(system_u:object_r:fail2ban_var_run_t,s0) + +/var/run/fail2ban.* gen_context(system_u:object_r:fail2ban_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.5.8/policy/modules/services/fail2ban.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.5.9/policy/modules/services/fail2ban.if --- nsaserefpolicy/policy/modules/services/fail2ban.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/fail2ban.if 2008-09-17 08:49:08.000000000 -0400 -@@ -78,3 +78,67 @@ ++++ serefpolicy-3.5.9/policy/modules/services/fail2ban.if 2008-09-25 08:33:18.000000000 -0400 +@@ -78,3 +78,42 @@ files_search_pids($1) allow $1 fail2ban_var_run_t:file read_file_perms; ') + +######################################## +## -+## Execute fail2ban server in the fail2ban domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`fail2ban_script_domtrans',` -+ gen_require(` -+ type fail2ban_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, fail2ban_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an fail2ban environment +## @@ -16544,38 +15947,32 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the fail2ban domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`fail2ban_admin',` + gen_require(` + type fail2ban_t, fail2ban_log_t; + type fail2ban_var_run_t; -+ type fail2ban_script_exec_t; ++ type fail2ban_initrc_exec_t; + ') + + allow $1 fail2ban_t:process { ptrace signal_perms }; + ps_process_pattern($1, fail2ban_t) + -+ # Allow fail2ban_t to restart the apache service -+ fail2ban_script_domtrans($1) ++ init_labeled_script_domtrans($1, rbcbind_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 fail2ban_script_exec_t system_r; ++ role_transition $2 fail2ban_initrc_exec_t system_r; + allow $2 system_r; + + logging_list_logs($1) -+ admin_pattern($1, fail2ban_log_t) ++ admin_pattern($1, fail2ban_log_t) + + files_list_pids($1) -+ admin_pattern($1, fail2ban_var_run_t) ++ admin_pattern($1, fail2ban_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.5.8/policy/modules/services/fail2ban.te ---- nsaserefpolicy/policy/modules/services/fail2ban.te 2008-09-05 10:28:20.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/fail2ban.te 2008-09-19 11:19:16.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.5.9/policy/modules/services/fail2ban.te +--- nsaserefpolicy/policy/modules/services/fail2ban.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/fail2ban.te 2008-09-25 08:33:18.000000000 -0400 @@ -37,9 +37,10 @@ logging_log_filetrans(fail2ban_t, fail2ban_log_t, file) @@ -16588,26 +15985,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_system_state(fail2ban_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.8/policy/modules/services/fetchmail.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.9/policy/modules/services/fetchmail.if --- nsaserefpolicy/policy/modules/services/fetchmail.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/fetchmail.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/fetchmail.if 2008-09-25 08:33:18.000000000 -0400 @@ -21,10 +21,10 @@ ps_process_pattern($1, fetchmail_t) files_list_etc($1) - manage_files_pattern($1, fetchmail_etc_t, fetchmail_etc_t) -+ admin_pattern($1, fetchmail_etc_t) ++ admin_pattern($1, fetchmail_etc_t) - manage_files_pattern($1, fetchmail_uidl_cache_t, fetchmail_uidl_cache_t) -+ admin_pattern($1, fetchmail_uidl_cache_t) ++ admin_pattern($1, fetchmail_uidl_cache_t) files_list_pids($1) - manage_files_pattern($1, fetchmail_var_run_t, fetchmail_var_run_t) -+ admin_pattern($1, fetchmail_var_run_t) ++ admin_pattern($1, fetchmail_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.5.8/policy/modules/services/fetchmail.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.5.9/policy/modules/services/fetchmail.te --- nsaserefpolicy/policy/modules/services/fetchmail.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/fetchmail.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/fetchmail.te 2008-09-25 08:33:18.000000000 -0400 @@ -91,6 +91,10 @@ ') @@ -16619,19 +16016,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_sigchld_newrole(fetchmail_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.fc serefpolicy-3.5.8/policy/modules/services/ftp.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.fc serefpolicy-3.5.9/policy/modules/services/ftp.fc --- nsaserefpolicy/policy/modules/services/ftp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ftp.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -27,3 +27,6 @@ - /var/log/vsftpd.* -- gen_context(system_u:object_r:xferlog_t,s0) - /var/log/xferlog.* -- gen_context(system_u:object_r:xferlog_t,s0) - /var/log/xferreport.* -- gen_context(system_u:object_r:xferlog_t,s0) -+ -+/etc/rc\.d/init\.d/vsftpd -- gen_context(system_u:object_r:ftp_script_exec_t,s0) -+/etc/rc\.d/init\.d/proftpd -- gen_context(system_u:object_r:ftp_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.5.8/policy/modules/services/ftp.if ++++ serefpolicy-3.5.9/policy/modules/services/ftp.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -3,6 +3,8 @@ + # + /etc/proftpd\.conf -- gen_context(system_u:object_r:ftpd_etc_t,s0) + /etc/cron\.monthly/proftpd -- gen_context(system_u:object_r:ftpd_exec_t,s0) ++/etc/rc\.d/init\.d/vsftpd -- gen_context(system_u:object_r:ftpd_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/proftpd -- gen_context(system_u:object_r:ftpd_initrc_exec_t,s0) + + # + # /usr +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.5.9/policy/modules/services/ftp.if --- nsaserefpolicy/policy/modules/services/ftp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ftp.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/ftp.if 2008-09-25 08:33:18.000000000 -0400 @@ -28,11 +28,13 @@ type ftpd_t; ') @@ -16651,32 +16050,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -155,3 +157,94 @@ +@@ -155,3 +157,64 @@ role $2 types ftpdctl_t; allow ftpdctl_t $3:chr_file rw_term_perms; ') + +######################################## +## -+## Execute ftp server in the ftp domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`ftp_script_domtrans',` -+ gen_require(` -+ type ftp_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, ftp_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an ftp environment +## @@ -16690,75 +16070,64 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the ftp domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`ftp_admin',` + gen_require(` -+ type ftp_t; -+ type ftpdctl_t; -+ type ftp_script_exec_t; -+ type ftp_tmp_t; -+ type ftp_log_t; -+ type ftp_etc_t; -+ type ftp_lock_t; -+ type ftp_var_lib_t; -+ type ftp_var_run_t; ++ type ftpd_t, ftpdctl_t, ftpd_tmp_t; ++ type ftpd_log_t, ftpd_etc_t, ftpd_lock_t; ++ type ftpd_var_lib_t, ftpd_var_run_t; + type xferlog_t; ++ type ftpd_initrc_exec_t; + ') + -+ ps_process_pattern($1, ftp_t) -+ allow $1 ftp_t:process { ptrace signal_perms }; ++ allow $1 ftpd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, ftpd_t) + -+ # Allow ftp_t to restart the apache service -+ ftp_script_domtrans($1) ++ init_labeled_script_domtrans($1, ftpd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 ftp_script_exec_t system_r; ++ role_transition $2 ftpd_initrc_exec_t system_r; + allow $2 system_r; + + ps_process_pattern($1, ftpdctl_t) + -+ ftp_run_ftpdctl($1, $2, $3) ++ ftpd_run_ftpdctl($1, $2, $3) + + miscfiles_manage_public_files($1) + + files_list_tmp($1) -+ admin_pattern($1, ftp_tmp_t) ++ admin_pattern($1, ftpd_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, ftp_log_t) ++ admin_pattern($1, ftpd_log_t) + -+ admin_pattern($1, xferlog_t) ++ admin_pattern($1, xferlog_t) + + files_list_etc($1) -+ admin_pattern($1, ftp_etc_t) ++ admin_pattern($1, ftpd_etc_t) + + files_list_var($1) -+ admin_pattern($1, ftp_lock_t) ++ admin_pattern($1, ftpd_lock_t) + + files_list_var_lib($1) -+ admin_pattern($1, ftp_var_lib_t) ++ admin_pattern($1, ftpd_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, ftp_var_run_t) ++ admin_pattern($1, ftpd_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.5.8/policy/modules/services/ftp.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.5.9/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ftp.te 2008-09-17 08:49:08.000000000 -0400 -@@ -75,6 +75,9 @@ - type xferlog_t; - logging_log_file(xferlog_t) ++++ serefpolicy-3.5.9/policy/modules/services/ftp.te 2008-09-25 08:33:18.000000000 -0400 +@@ -53,6 +53,9 @@ + type ftpd_etc_t; + files_config_file(ftpd_etc_t) -+type ftp_script_exec_t; -+init_script_file(ftp_script_exec_t) ++type ftpd_initrc_exec_t; ++init_script_file(ftpd_initrc_exec_t) + - ######################################## - # - # ftpd local policy + type ftpd_lock_t; + files_lock_file(ftpd_lock_t) + @@ -106,9 +109,10 @@ manage_sock_files_pattern(ftpd_t, ftpd_tmpfs_t, ftpd_tmpfs_t) fs_tmpfs_filetrans(ftpd_t, ftpd_tmpfs_t, { dir file lnk_file sock_file fifo_file }) @@ -16827,15 +16196,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_sigchld_newrole(ftpd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.5.8/policy/modules/services/gamin.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.5.9/policy/modules/services/gamin.fc --- nsaserefpolicy/policy/modules/services/gamin.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/gamin.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/gamin.fc 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,2 @@ + +/usr/libexec/gam_server -- gen_context(system_u:object_r:gamin_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.if serefpolicy-3.5.8/policy/modules/services/gamin.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.if serefpolicy-3.5.9/policy/modules/services/gamin.if --- nsaserefpolicy/policy/modules/services/gamin.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/gamin.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/gamin.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,57 @@ + +## policy for gamin @@ -16894,9 +16263,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + allow $1 gamin_t:unix_stream_socket connectto; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.5.8/policy/modules/services/gamin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.5.9/policy/modules/services/gamin.te --- nsaserefpolicy/policy/modules/services/gamin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/gamin.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/gamin.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,39 @@ +policy_module(gamin, 1.0.0) + @@ -16937,16 +16306,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +miscfiles_read_localization(gamin_t) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.fc serefpolicy-3.5.8/policy/modules/services/gnomeclock.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.fc serefpolicy-3.5.9/policy/modules/services/gnomeclock.fc --- nsaserefpolicy/policy/modules/services/gnomeclock.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/gnomeclock.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/services/gnomeclock.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.if serefpolicy-3.5.9/policy/modules/services/gnomeclock.if --- nsaserefpolicy/policy/modules/services/gnomeclock.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/gnomeclock.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,75 @@ + +## policy for gnomeclock @@ -17023,9 +16392,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/gnomeclock.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.te serefpolicy-3.5.9/policy/modules/services/gnomeclock.te --- nsaserefpolicy/policy/modules/services/gnomeclock.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/gnomeclock.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/gnomeclock.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,55 @@ +policy_module(gnomeclock, 1.0.0) +######################################## @@ -17082,9 +16451,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + polkit_read_lib(gnomeclock_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.5.8/policy/modules/services/hal.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.5.9/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/hal.fc 2008-09-18 14:35:46.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/hal.fc 2008-09-25 08:33:18.000000000 -0400 @@ -9,6 +9,7 @@ /usr/libexec/hal-system-sonypic -- gen_context(system_u:object_r:hald_sonypic_exec_t,s0) /usr/libexec/hald-addon-macbookpro-backlight -- gen_context(system_u:object_r:hald_mac_exec_t,s0) @@ -17102,9 +16471,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /var/run/hald(/.*)? gen_context(system_u:object_r:hald_var_run_t,s0) /var/run/haldaemon\.pid -- gen_context(system_u:object_r:hald_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.5.8/policy/modules/services/hal.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.5.9/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/hal.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/hal.if 2008-09-25 08:33:18.000000000 -0400 @@ -302,3 +302,42 @@ files_search_pids($1) allow $1 hald_var_run_t:file rw_file_perms; @@ -17148,9 +16517,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + read_lnk_files_pattern($1, hald_t, hald_t) + dontaudit $1 hald_t:process ptrace; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.5.8/policy/modules/services/hal.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.5.9/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/hal.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/hal.te 2008-09-25 08:33:18.000000000 -0400 @@ -49,6 +49,9 @@ type hald_var_lib_t; files_type(hald_var_lib_t) @@ -17259,9 +16628,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # Should be removed when this is fixed -#cron_read_system_job_lib_files(hald_t) +cron_read_system_job_lib_files(hald_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.5.8/policy/modules/services/inetd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.5.9/policy/modules/services/inetd.fc --- nsaserefpolicy/policy/modules/services/inetd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/inetd.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/inetd.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,6 +1,8 @@ /usr/sbin/identd -- gen_context(system_u:object_r:inetd_child_exec_t,s0) @@ -17271,18 +16640,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /usr/sbin/inetd -- gen_context(system_u:object_r:inetd_exec_t,s0) /usr/sbin/rlinetd -- gen_context(system_u:object_r:inetd_exec_t,s0) /usr/sbin/xinetd -- gen_context(system_u:object_r:inetd_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.fc serefpolicy-3.5.8/policy/modules/services/inn.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.fc serefpolicy-3.5.9/policy/modules/services/inn.fc --- nsaserefpolicy/policy/modules/services/inn.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/inn.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -64,3 +64,5 @@ - /var/run/news(/.*)? gen_context(system_u:object_r:innd_var_run_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/inn.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -4,6 +4,7 @@ + # + /etc/news(/.*)? gen_context(system_u:object_r:innd_etc_t,s0) + /etc/news/boot -- gen_context(system_u:object_r:innd_exec_t,s0) ++/etc/rc\.d/init\.d/innd -- gen_context(system_u:object_r:innd_initrc_exec_t,s0) - /var/spool/news(/.*)? gen_context(system_u:object_r:news_spool_t,s0) -+ -+/etc/rc\.d/init\.d/innd -- gen_context(system_u:object_r:innd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.if serefpolicy-3.5.8/policy/modules/services/inn.if + # + # /usr +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.if serefpolicy-3.5.9/policy/modules/services/inn.if --- nsaserefpolicy/policy/modules/services/inn.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/inn.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/inn.if 2008-09-25 08:33:18.000000000 -0400 @@ -54,8 +54,7 @@ ') @@ -17293,32 +16664,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -176,3 +175,80 @@ +@@ -176,3 +175,52 @@ corecmd_search_bin($1) domtrans_pattern($1, innd_exec_t, innd_t) ') + +######################################## +## -+## Execute inn server in the inn domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`inn_script_domtrans',` -+ gen_require(` -+ type innd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, innd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an inn environment +## @@ -17332,100 +16684,80 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the inn domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`inn_admin',` + gen_require(` -+ type innd_t; -+ type innd_script_exec_t; -+ type innd_etc_t; -+ type innd_log_t; -+ type news_spool_t; -+ type innd_var_lib_t; ++ type innd_t, innd_etc_t, innd_log_t; ++ type news_spool_t, innd_var_lib_t; + type innd_var_run_t; ++ type innd_initrc_exec_t; + ') + -+ allow $1 innd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, innd_t, innd_t) ++ allow $1 innd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, innd_t) + -+ # Allow innd_t to restart the apache service -+ inn_script_domtrans($1) ++ init_labeled_script_domtrans($1, innd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 innd_script_exec_t system_r; ++ role_transition $2 innd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, innd_etc_t) ++ admin_pattern($1, innd_etc_t) + + logging_list_logs($1) -+ admin_pattern($1, innd_log_t) ++ admin_pattern($1, innd_log_t) + + files_list_spool($1) + admin_pattern($1, news_spool_t) + + files_list_var_lib($1) -+ admin_pattern($1, innd_var_lib_t) ++ admin_pattern($1, innd_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, innd_var_run_t) ++ admin_pattern($1, innd_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-3.5.8/policy/modules/services/inn.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.te serefpolicy-3.5.9/policy/modules/services/inn.te --- nsaserefpolicy/policy/modules/services/inn.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/inn.te 2008-09-17 08:49:08.000000000 -0400 -@@ -22,7 +22,10 @@ ++++ serefpolicy-3.5.9/policy/modules/services/inn.te 2008-09-25 08:33:18.000000000 -0400 +@@ -12,6 +12,9 @@ + type innd_etc_t; + files_config_file(innd_etc_t) + ++type innd_initrc_exec_t; ++init_script_file(innd_initrc_exec_t) ++ + type innd_log_t; + logging_log_file(innd_log_t) + +@@ -22,7 +25,7 @@ files_pid_file(innd_var_run_t) type news_spool_t; -files_type(news_spool_t) +files_mountpoint(news_spool_t) -+ -+type innd_script_exec_t; -+init_script_file(innd_script_exec_t) ######################################## # -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.fc serefpolicy-3.5.8/policy/modules/services/jabber.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.fc serefpolicy-3.5.9/policy/modules/services/jabber.fc --- nsaserefpolicy/policy/modules/services/jabber.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/jabber.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -2,3 +2,4 @@ ++++ serefpolicy-3.5.9/policy/modules/services/jabber.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,5 @@ ++/etc/rc\.d/init\.d/jabber -- gen_context(system_u:object_r:jabber_initrc_exec_t,s0) ++ + /usr/sbin/jabberd -- gen_context(system_u:object_r:jabberd_exec_t,s0) /var/lib/jabber(/.*)? gen_context(system_u:object_r:jabberd_var_lib_t,s0) - /var/log/jabber(/.*)? gen_context(system_u:object_r:jabberd_log_t,s0) -+/etc/rc\.d/init\.d/jabber -- gen_context(system_u:object_r:jabber_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.if serefpolicy-3.5.8/policy/modules/services/jabber.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.if serefpolicy-3.5.9/policy/modules/services/jabber.if --- nsaserefpolicy/policy/modules/services/jabber.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/jabber.if 2008-09-17 08:49:08.000000000 -0400 -@@ -13,3 +13,73 @@ ++++ serefpolicy-3.5.9/policy/modules/services/jabber.if 2008-09-25 08:33:18.000000000 -0400 +@@ -13,3 +13,46 @@ interface(`jabber_tcp_connect',` refpolicywarn(`$0($*) has been deprecated.') ') + +######################################## +## -+## Execute jabber server in the jabber domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`jabber_script_domtrans',` -+ gen_require(` -+ type jabber_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, jabber_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an jabber environment +## @@ -17439,58 +16771,57 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the jabber domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`jabber_admin',` + gen_require(` -+ type jabber_t; -+ type jabber_script_exec_t; -+ type jabber_log_t; -+ type jabber_var_lib_t; ++ type jabber_t, jabber_log_t, jabber_var_lib_t; + type jabber_var_run_t; ++ type jabber_initrc_exec_t; + ') + -+ allow $1 jabber_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, jabber_t, jabber_t) ++ allow $1 jabber_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, jabber_t) + -+ # Allow jabber_t to restart the apache service -+ jabber_script_domtrans($1) ++ init_labeled_script_domtrans($1, jabber_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 jabber_script_exec_t system_r; ++ role_transition $2 jabber_initrc_exec_t system_r; + allow $2 system_r; + + logging_list_logs($1) -+ admin_pattern($1, jabber_log_t) ++ admin_pattern($1, jabber_log_t) + + files_list_var_lib($1) -+ admin_pattern($1, jabber_var_lib_t) ++ admin_pattern($1, jabber_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, jabber_var_run_t) ++ admin_pattern($1, jabber_var_run_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.te serefpolicy-3.5.8/policy/modules/services/jabber.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/jabber.te serefpolicy-3.5.9/policy/modules/services/jabber.te --- nsaserefpolicy/policy/modules/services/jabber.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/jabber.te 2008-09-17 08:49:08.000000000 -0400 -@@ -19,6 +19,9 @@ - type jabberd_var_run_t; - files_pid_file(jabberd_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/jabber.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type jabberd_exec_t; + init_daemon_domain(jabberd_t, jabberd_exec_t) -+type jabber_script_exec_t; -+init_script_file(jabber_script_exec_t) ++type jabber_initrc_exec_t; ++init_script_file(jabber_initrc_exec_t) + - ######################################## - # - # Local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.5.8/policy/modules/services/kerberos.fc + type jabberd_log_t; + logging_log_file(jabberd_log_t) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.5.9/policy/modules/services/kerberos.fc --- nsaserefpolicy/policy/modules/services/kerberos.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/kerberos.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -7,12 +7,21 @@ ++++ serefpolicy-3.5.9/policy/modules/services/kerberos.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -4,15 +4,23 @@ + /etc/krb5kdc(/.*)? gen_context(system_u:object_r:krb5kdc_conf_t,s0) + /etc/krb5kdc/kadm5\.keytab -- gen_context(system_u:object_r:krb5_keytab_t,s0) + /etc/krb5kdc/principal.* gen_context(system_u:object_r:krb5kdc_principal_t,s0) ++/etc/rc\.d/init\.d/kadmind -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/krb524d -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/kpropd -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/krb5kdc -- gen_context(system_u:object_r:kerberos_initrc_exec_t,s0) /usr/(local/)?(kerberos/)?sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0) /usr/(local/)?(kerberos/)?sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0) @@ -17507,14 +16838,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) +/var/tmp/host_0 -- gen_context(system_u:object_r:krb5_host_rcache_t,s0) -+ -+/etc/rc\.d/init\.d/kadmind -- gen_context(system_u:object_r:kerberos_script_exec_t,s0) -+/etc/rc\.d/init\.d/krb524d -- gen_context(system_u:object_r:kerberos_script_exec_t,s0) -+/etc/rc\.d/init\.d/kpropd -- gen_context(system_u:object_r:kerberos_script_exec_t,s0) -+/etc/rc\.d/init\.d/krb5kdc -- gen_context(system_u:object_r:kerberos_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.5.8/policy/modules/services/kerberos.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.5.9/policy/modules/services/kerberos.if --- nsaserefpolicy/policy/modules/services/kerberos.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/kerberos.if 2008-09-17 08:53:26.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/kerberos.if 2008-09-25 08:33:18.000000000 -0400 @@ -23,6 +23,25 @@ ######################################## @@ -17601,7 +16927,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Read the kerberos kdc configuration file (/etc/krb5kdc.conf). ## ## -@@ -168,6 +216,193 @@ +@@ -168,6 +216,145 @@ ') files_search_etc($1) @@ -17659,43 +16985,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute kerberos server in the kerberos domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`kerberos_script_domtrans',` -+ gen_require(` -+ type kerberos_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, kerberos_script_exec_t) -+') -+ -+######################################## -+## -+## Execute kpropd server in the kpropd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`kerberos_kpropd_script_domtrans',` -+ gen_require(` -+ type kpropd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, kpropd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an kerberos environment +## @@ -17709,17 +16998,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the kerberos domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`kerberos_admin',` + gen_require(` + type kadmind_t, krb5kdc_t; -+ type kadmind_script_exec_t; ++ type kadmind_initrc_exec_t; + type kadmind_log_t, kadmind_tmp_t, kadmind_var_run_t; + + type krb5_conf_t, krb5_keytab_t, krb5kdc_conf_t; @@ -17729,8 +17013,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + type kadmind_spool_t, kadmind_var_lib_t; + + type kpropd_t; -+ type kpropd_script_exec_t; -+ + ') + + allow $1 kadmind_t:process { ptrace signal_perms }; @@ -17742,41 +17024,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $1 kpropd_t:process { ptrace signal_perms }; + ps_process_pattern($1, kpropd_t) + -+ # Allow kadmind_t to restart the apache service -+ kerberos_script_domtrans($1) ++ init_labeled_script_domtrans($1, kerberos_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 kadmind_script_exec_t system_r; ++ role_transition $2 kadmind_initrc_exec_t system_r; + allow $2 system_r; + -+ kerberos_kpropd_script_domtrans($1) -+ role_transition $2 kpropd_script_exec_t system_r; -+ + files_list_tmp($1) -+ admin_pattern($1, kadmind_tmp_t) ++ admin_pattern($1, kadmind_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, kadmind_log_t) ++ admin_pattern($1, kadmind_log_t) + + files_list_spool($1) + admin_pattern($1, kadmind_spool_t) + + files_list_var_lib($1) -+ admin_pattern($1, kadmind_var_lib_t) ++ admin_pattern($1, kadmind_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, kadmind_var_run_t) ++ admin_pattern($1, kadmind_var_run_t) + -+ admin_pattern($1, krb5_conf_t) ++ admin_pattern($1, krb5_conf_t) + -+ admin_pattern($1, krb5_keytab_t) ++ admin_pattern($1, krb5_keytab_t) + -+ admin_pattern($1, krb5kdc_principal_t) ++ admin_pattern($1, krb5kdc_principal_t) + -+ admin_pattern($1, krb5kdc_tmp_t) ++ admin_pattern($1, krb5kdc_tmp_t) + -+ admin_pattern($1, krb5kdc_var_run_t) ++ admin_pattern($1, krb5kdc_var_run_t) + -+ admin_pattern($1, krb5_host_rcache_t) ++ admin_pattern($1, krb5_host_rcache_t) +') + +######################################## @@ -17796,9 +17074,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + can_exec($1,kadmind_exec_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.5.8/policy/modules/services/kerberos.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.5.9/policy/modules/services/kerberos.te --- nsaserefpolicy/policy/modules/services/kerberos.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/kerberos.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/kerberos.te 2008-09-25 08:33:18.000000000 -0400 @@ -16,6 +16,7 @@ type kadmind_t; type kadmind_exec_t; @@ -17825,27 +17103,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type krb5kdc_log_t; logging_log_file(krb5kdc_log_t) -@@ -54,6 +59,19 @@ +@@ -54,6 +59,16 @@ type krb5kdc_var_run_t; files_pid_file(krb5kdc_var_run_t) +type krb5_host_rcache_t; +files_tmp_file(krb5_host_rcache_t) + -+type kerberos_script_exec_t; -+init_script_file(kerberos_script_exec_t) ++type kerberos_initrc_exec_t; ++init_script_file(kerberos_initrc_exec_t) + +type kpropd_t; +type kpropd_exec_t; +init_daemon_domain(kpropd_t, kpropd_exec_t) + -+type kpropd_script_exec_t; -+init_script_file(kpropd_script_exec_t) -+ ######################################## # # kadmind local policy -@@ -62,7 +80,7 @@ +@@ -62,7 +77,7 @@ # Use capabilities. Surplus capabilities may be allowed. allow kadmind_t self:capability { setuid setgid chown fowner dac_override sys_nice }; dontaudit kadmind_t self:capability sys_tty_config; @@ -17854,7 +17129,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow kadmind_t self:netlink_route_socket r_netlink_socket_perms; allow kadmind_t self:unix_dgram_socket { connect create write }; allow kadmind_t self:tcp_socket connected_stream_socket_perms; -@@ -77,7 +95,9 @@ +@@ -77,7 +92,9 @@ read_files_pattern(kadmind_t, krb5kdc_conf_t, krb5kdc_conf_t) dontaudit kadmind_t krb5kdc_conf_t:file { write setattr }; @@ -17865,7 +17140,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol can_exec(kadmind_t, kadmind_exec_t) -@@ -91,6 +111,7 @@ +@@ -91,6 +108,7 @@ kernel_read_kernel_sysctls(kadmind_t) kernel_list_proc(kadmind_t) kernel_read_proc_symlinks(kadmind_t) @@ -17873,7 +17148,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_all_recvfrom_unlabeled(kadmind_t) corenet_all_recvfrom_netlabel(kadmind_t) -@@ -118,6 +139,12 @@ +@@ -118,6 +136,12 @@ domain_use_interactive_fds(kadmind_t) files_read_etc_files(kadmind_t) @@ -17886,7 +17161,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(kadmind_t) libs_use_shared_libs(kadmind_t) -@@ -127,9 +154,9 @@ +@@ -127,9 +151,9 @@ miscfiles_read_localization(kadmind_t) sysnet_read_config(kadmind_t) @@ -17897,7 +17172,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol sysadm_dontaudit_search_home_dirs(kadmind_t) optional_policy(` -@@ -138,6 +165,7 @@ +@@ -138,6 +162,7 @@ optional_policy(` seutil_sigchld_newrole(kadmind_t) @@ -17905,7 +17180,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -@@ -152,7 +180,7 @@ +@@ -152,7 +177,7 @@ # Use capabilities. Surplus capabilities may be allowed. allow krb5kdc_t self:capability { setuid setgid net_admin chown fowner dac_override sys_nice }; dontaudit krb5kdc_t self:capability sys_tty_config; @@ -17914,7 +17189,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow krb5kdc_t self:netlink_route_socket r_netlink_socket_perms; allow krb5kdc_t self:tcp_socket create_stream_socket_perms; allow krb5kdc_t self:udp_socket create_socket_perms; -@@ -166,6 +194,8 @@ +@@ -166,6 +191,8 @@ read_files_pattern(krb5kdc_t, krb5kdc_conf_t, krb5kdc_conf_t) dontaudit krb5kdc_t krb5kdc_conf_t:file write; @@ -17923,7 +17198,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow krb5kdc_t krb5kdc_log_t:file manage_file_perms; logging_log_filetrans(krb5kdc_t, krb5kdc_log_t, file) -@@ -216,6 +246,9 @@ +@@ -216,6 +243,9 @@ files_read_usr_symlinks(krb5kdc_t) files_read_var_files(krb5kdc_t) @@ -17933,7 +17208,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(krb5kdc_t) libs_use_shared_libs(krb5kdc_t) -@@ -224,9 +257,9 @@ +@@ -224,9 +254,9 @@ miscfiles_read_localization(krb5kdc_t) sysnet_read_config(krb5kdc_t) @@ -17944,7 +17219,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol sysadm_dontaudit_search_home_dirs(krb5kdc_t) optional_policy(` -@@ -235,8 +268,49 @@ +@@ -235,8 +265,49 @@ optional_policy(` seutil_sigchld_newrole(krb5kdc_t) @@ -17994,42 +17269,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +sysnet_dns_name_resolve(kpropd_t) + +kerberos_use(kpropd_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.fc serefpolicy-3.5.8/policy/modules/services/kerneloops.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.fc serefpolicy-3.5.9/policy/modules/services/kerneloops.fc --- nsaserefpolicy/policy/modules/services/kerneloops.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/kerneloops.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/kerneloops.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1 +1,3 @@ - /usr/sbin/kerneloops -- gen_context(system_u:object_r:kerneloops_exec_t,s0) ++/etc/rc\.d/init\.d/kerneloops -- gen_context(system_u:object_r:kerneloops_initrc_exec_t,s0) + -+/etc/rc\.d/init\.d/kerneloops -- gen_context(system_u:object_r:kerneloops_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.5.8/policy/modules/services/kerneloops.if + /usr/sbin/kerneloops -- gen_context(system_u:object_r:kerneloops_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.5.9/policy/modules/services/kerneloops.if --- nsaserefpolicy/policy/modules/services/kerneloops.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/kerneloops.if 2008-09-17 08:49:08.000000000 -0400 -@@ -21,6 +21,24 @@ - - ######################################## - ## -+## Execute kerneloops server in the kerneloops domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`kerneloops_script_domtrans',` -+ gen_require(` -+ type kerneloops_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, kerneloops_script_exec_t) -+') -+ -+######################################## -+## - ## Send and receive messages from - ## kerneloops over dbus. - ## -@@ -71,13 +89,31 @@ ++++ serefpolicy-3.5.9/policy/modules/services/kerneloops.if 2008-09-25 08:33:18.000000000 -0400 +@@ -71,13 +71,25 @@ ## Domain allowed access. ## ## @@ -18038,38 +17288,32 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the kerneloops domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## ## # interface(`kerneloops_admin',` gen_require(` type kerneloops_t; -+ type kerneloops_script_exec_t; ++ type kerneloops_initrc_exec_t; ') allow $1 kerneloops_t:process { ptrace signal_perms }; ps_process_pattern($1, kerneloops_t) + -+ # Allow kerneloops_t to restart the apache service -+ kerneloops_script_domtrans($1) ++ init_labeled_script_domtrans($1, kerneloops_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 kerneloops_script_exec_t system_r; ++ role_transition $2 kerneloops_initrc_exec_t system_r; + allow $2 system_r; + ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.5.8/policy/modules/services/kerneloops.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.5.9/policy/modules/services/kerneloops.te --- nsaserefpolicy/policy/modules/services/kerneloops.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/kerneloops.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/kerneloops.te 2008-09-25 08:33:18.000000000 -0400 @@ -10,13 +10,16 @@ type kerneloops_exec_t; init_daemon_domain(kerneloops_t, kerneloops_exec_t) -+type kerneloops_script_exec_t; -+init_script_file(kerneloops_script_exec_t) ++type kerneloops_initrc_exec_t; ++init_script_file(kerneloops_initrc_exec_t) + ######################################## # @@ -18091,44 +17335,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_all_recvfrom_unlabeled(kerneloops_t) corenet_all_recvfrom_netlabel(kerneloops_t) corenet_tcp_sendrecv_all_if(kerneloops_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-3.5.8/policy/modules/services/ldap.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-3.5.9/policy/modules/services/ldap.fc --- nsaserefpolicy/policy/modules/services/ldap.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ldap.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -14,3 +14,5 @@ - /var/run/openldap(/.*)? gen_context(system_u:object_r:slapd_var_run_t,s0) - /var/run/slapd\.args -- gen_context(system_u:object_r:slapd_var_run_t,s0) - /var/run/slapd\.pid -- gen_context(system_u:object_r:slapd_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/ldap -- gen_context(system_u:object_r:ldap_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-3.5.8/policy/modules/services/ldap.if ++++ serefpolicy-3.5.9/policy/modules/services/ldap.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,5 +1,6 @@ + + /etc/ldap/slapd\.conf -- gen_context(system_u:object_r:slapd_etc_t,s0) ++/etc/rc\.d/init\.d/ldap -- gen_context(system_u:object_r:slapd_initrc_exec_t,s0) + + /usr/sbin/slapd -- gen_context(system_u:object_r:slapd_exec_t,s0) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-3.5.9/policy/modules/services/ldap.if --- nsaserefpolicy/policy/modules/services/ldap.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ldap.if 2008-09-17 08:49:08.000000000 -0400 -@@ -73,3 +73,80 @@ ++++ serefpolicy-3.5.9/policy/modules/services/ldap.if 2008-09-25 08:33:18.000000000 -0400 +@@ -73,3 +73,49 @@ allow $1 slapd_var_run_t:sock_file write; allow $1 slapd_t:unix_stream_socket connectto; ') + +######################################## +## -+## Execute ldap server in the ldap domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`ldap_script_domtrans',` -+ gen_require(` -+ type ldap_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, ldap_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an ldap environment +## @@ -18142,37 +17368,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the ldap domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`ldap_admin',` + gen_require(` -+ type slapd_t; -+ type ldap_script_exec_t; -+ type slapd_tmp_t; -+ type slapd_replog_t; -+ type slapd_lock_t; -+ type slapd_etc_t; -+ type slapd_var_run_t; ++ type slapd_t, slapd_tmp_t, slapd_replog_t; ++ type slapd_lock_t, slapd_etc_t, slapd_var_run_t; ++ type slapd_initrc_exec_t; + ') + -+ allow $1 slapd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, slapd_t, slapd_t) ++ allow $1 slapd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, slapd_t) + -+ # Allow slapd_t to restart the apache service -+ ldap_script_domtrans($1) ++ init_labeled_script_domtrans($1, slapd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 ldap_script_exec_t system_r; ++ role_transition $2 slapd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, slapd_tmp_t) ++ admin_pattern($1, slapd_tmp_t) + -+ admin_pattern($1, slapd_replog_t) ++ admin_pattern($1, slapd_replog_t) + + files_list_etc($1) + admin_pattern($1, slapd_etc_t) @@ -18180,23 +17396,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + admin_pattern($1, slapd_lock_t) + + files_list_pids($1) -+ admin_pattern($1, slapd_var_run_t) ++ admin_pattern($1, slapd_var_run_t) +') -+ -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.5.8/policy/modules/services/ldap.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.5.9/policy/modules/services/ldap.te --- nsaserefpolicy/policy/modules/services/ldap.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ldap.te 2008-09-17 08:49:08.000000000 -0400 -@@ -31,6 +31,9 @@ - type slapd_var_run_t; - files_pid_file(slapd_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/ldap.te 2008-09-25 08:33:18.000000000 -0400 +@@ -19,6 +19,9 @@ + type slapd_etc_t; + files_config_file(slapd_etc_t) -+type ldap_script_exec_t; -+init_script_file(ldap_script_exec_t) ++type slapd_initrc_exec_t; ++init_script_file(slapd_initrc_exec_t) + - ######################################## - # - # Local policy + type slapd_lock_t; + files_lock_file(slapd_lock_t) + @@ -118,7 +121,7 @@ sysadm_dontaudit_search_home_dirs(slapd_t) @@ -18206,9 +17420,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-3.5.8/policy/modules/services/lpd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-3.5.9/policy/modules/services/lpd.fc --- nsaserefpolicy/policy/modules/services/lpd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/lpd.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/lpd.fc 2008-09-25 08:33:18.000000000 -0400 @@ -22,11 +22,14 @@ /usr/sbin/lpinfo -- gen_context(system_u:object_r:lpr_exec_t,s0) /usr/sbin/lpmove -- gen_context(system_u:object_r:lpr_exec_t,s0) @@ -18224,17 +17438,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/var/spool/cups-pdf(/.*)? gen_context(system_u:object_r:print_spool_t,mls_systemhigh) /var/spool/lpd(/.*)? gen_context(system_u:object_r:print_spool_t,s0) /var/run/lprng(/.*)? gen_context(system_u:object_r:lpd_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.5.8/policy/modules/services/mailman.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.5.9/policy/modules/services/mailman.fc --- nsaserefpolicy/policy/modules/services/mailman.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mailman.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mailman.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/services/mailman.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.5.9/policy/modules/services/mailman.if --- nsaserefpolicy/policy/modules/services/mailman.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mailman.if 2008-09-23 08:33:22.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mailman.if 2008-09-25 08:33:18.000000000 -0400 @@ -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; @@ -18282,9 +17496,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Append to mailman logs. ## ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.5.8/policy/modules/services/mailman.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.5.9/policy/modules/services/mailman.te --- nsaserefpolicy/policy/modules/services/mailman.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mailman.te 2008-09-19 10:39:55.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mailman.te 2008-09-25 08:33:18.000000000 -0400 @@ -53,10 +53,9 @@ apache_use_fds(mailman_cgi_t) apache_dontaudit_append_log(mailman_cgi_t) @@ -18338,15 +17552,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/services/mailscanner.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.5.9/policy/modules/services/mailscanner.fc --- nsaserefpolicy/policy/modules/services/mailscanner.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/mailscanner.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mailscanner.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/services/mailscanner.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.if serefpolicy-3.5.9/policy/modules/services/mailscanner.if --- nsaserefpolicy/policy/modules/services/mailscanner.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/mailscanner.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mailscanner.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,59 @@ +## Anti-Virus and Anti-Spam Filter + @@ -18407,28 +17621,28 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/mailscanner.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.te serefpolicy-3.5.9/policy/modules/services/mailscanner.te --- nsaserefpolicy/policy/modules/services/mailscanner.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/mailscanner.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mailscanner.te 2008-09-25 08:33:18.000000000 -0400 @@ -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/memcached.fc serefpolicy-3.5.8/policy/modules/services/memcached.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.fc serefpolicy-3.5.9/policy/modules/services/memcached.fc --- nsaserefpolicy/policy/modules/services/memcached.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/memcached.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/memcached.fc 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,5 @@ ++/etc/rc\.d/init\.d/memcached -- gen_context(system_u:object_r:memcached_initrc_exec_t,s0) + +/usr/bin/memcached -- gen_context(system_u:object_r:memcached_exec_t,s0) + -+/etc/rc\.d/init\.d/memcached -- gen_context(system_u:object_r:memcached_script_exec_t,s0) +/var/run/memcached(/.*)? gen_context(system_u:object_r:memcached_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.if serefpolicy-3.5.8/policy/modules/services/memcached.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.if serefpolicy-3.5.9/policy/modules/services/memcached.if --- nsaserefpolicy/policy/modules/services/memcached.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/memcached.if 2008-09-17 08:49:08.000000000 -0400 -@@ -0,0 +1,125 @@ ++++ serefpolicy-3.5.9/policy/modules/services/memcached.if 2008-09-25 08:33:18.000000000 -0400 +@@ -0,0 +1,96 @@ + +## high-performance memory object caching system + @@ -18451,25 +17665,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + domtrans_pattern($1,memcached_exec_t,memcached_t) +') + -+ -+######################################## -+## -+## Execute memcached server in the memcached domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`memcached_script_domtrans',` -+ gen_require(` -+ type memcached_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1,memcached_script_exec_t) -+') -+ +######################################## +## +## Read memcached PID files. @@ -18525,38 +17720,28 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the memcached domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`memcached_admin',` + gen_require(` + type memcached_t; ++ type memcached_initrc_exec_t; + ') + -+ allow $1 memcached_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, memcached_t, memcached_t) ++ allow $1 memcached_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, memcached_t) + -+ -+ gen_require(` -+ type memcached_script_exec_t; -+ ') -+ -+ # Allow memcached_t to restart the apache service -+ memcached_script_domtrans($1) ++ init_labeled_script_domtrans($1, memcached_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 memcached_script_exec_t system_r; ++ role_transition $2 memcached_initrc_exec_t system_r; + allow $2 system_r; + + memcached_manage_var_run($1) + +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.te serefpolicy-3.5.8/policy/modules/services/memcached.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.te serefpolicy-3.5.9/policy/modules/services/memcached.te --- nsaserefpolicy/policy/modules/services/memcached.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/memcached.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/memcached.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,52 @@ +policy_module(memcached,1.0.0) + @@ -18569,8 +17754,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +type memcached_exec_t; +init_daemon_domain(memcached_t, memcached_exec_t) + -+type memcached_script_exec_t; -+init_script_file(memcached_script_exec_t) ++type memcached_initrc_exec_t; ++init_script_file(memcached_initrc_exec_t) + +type memcached_var_run_t; +files_pid_file(memcached_var_run_t) @@ -18610,9 +17795,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +sysnet_dns_name_resolve(memcached_t) + +permissive memcached_t; -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.5.8/policy/modules/services/mta.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.5.9/policy/modules/services/mta.fc --- nsaserefpolicy/policy/modules/services/mta.fc 2008-09-12 10:48:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mta.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mta.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -18621,9 +17806,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -#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.5.8/policy/modules/services/mta.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.5.9/policy/modules/services/mta.if --- nsaserefpolicy/policy/modules/services/mta.if 2008-09-12 10:48:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mta.if 2008-09-17 08:56:11.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mta.if 2008-09-25 08:33:18.000000000 -0400 @@ -133,6 +133,15 @@ sendmail_create_log($1_mail_t) ') @@ -18744,9 +17929,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Create, read, write, and delete ## mail queue files. ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.5.8/policy/modules/services/mta.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.5.9/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2008-09-12 10:48:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mta.te 2008-09-17 08:50:57.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mta.te 2008-09-25 08:33:18.000000000 -0400 @@ -39,34 +39,50 @@ # @@ -18879,10 +18064,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` # why is mail delivered to a directory of type arpwatch_data_t? arpwatch_search_data(mailserver_delivery) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.5.8/policy/modules/services/munin.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.5.9/policy/modules/services/munin.fc --- nsaserefpolicy/policy/modules/services/munin.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/munin.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -6,6 +6,9 @@ ++++ serefpolicy-3.5.9/policy/modules/services/munin.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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) @@ -18893,11 +18084,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) + -+/etc/rc\.d/init\.d/munin-node -- gen_context(system_u:object_r: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.5.8/policy/modules/services/munin.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.if serefpolicy-3.5.9/policy/modules/services/munin.if --- nsaserefpolicy/policy/modules/services/munin.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/munin.if 2008-09-17 08:49:08.000000000 -0400 -@@ -80,3 +80,105 @@ ++++ serefpolicy-3.5.9/policy/modules/services/munin.if 2008-09-25 08:33:18.000000000 -0400 +@@ -80,3 +80,76 @@ dontaudit $1 munin_var_lib_t:dir search_dir_perms; ') @@ -18925,25 +18115,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute munin server in the munin domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`munin_script_domtrans',` -+ gen_require(` -+ type munin_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, munin_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an munin environment +## @@ -18957,64 +18128,56 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the munin domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`munin_admin',` + gen_require(` -+ type munin_t; -+ type munin_script_exec_t; -+ type munin_etc_t; -+ type munin_tmp_t; -+ type munin_log_t; -+ type munin_var_lib_t; -+ type munin_var_run_t; ++ 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 getattr }; -+ read_files_pattern($1, munin_t, munin_t) ++ allow $1 munin_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, munin_t) + -+ # Allow munin_t to restart the apache service -+ munin_script_domtrans($1) ++ init_labeled_script_domtrans($1, munin_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 munin_script_exec_t system_r; ++ role_transition $2 munin_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, munin_tmp_t) ++ admin_pattern($1, munin_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, munin_log_t) ++ 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) ++ admin_pattern($1, munin_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, munin_var_run_t) ++ 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.5.8/policy/modules/services/munin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.5.9/policy/modules/services/munin.te --- nsaserefpolicy/policy/modules/services/munin.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/munin.te 2008-09-17 08:49:08.000000000 -0400 -@@ -25,26 +25,33 @@ - type munin_var_run_t alias lrrd_var_run_t; - files_pid_file(munin_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/munin.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,6 +13,9 @@ + type munin_etc_t alias lrrd_etc_t; + files_config_file(munin_etc_t) -+type munin_script_exec_t; -+init_script_file(munin_script_exec_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 # @@ -19131,18 +18294,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +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/mysql.fc serefpolicy-3.5.8/policy/modules/services/mysql.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.fc serefpolicy-3.5.9/policy/modules/services/mysql.fc --- nsaserefpolicy/policy/modules/services/mysql.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mysql.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -22,3 +22,5 @@ - /var/log/mysql.* -- gen_context(system_u:object_r:mysqld_log_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/mysql.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -5,6 +5,7 @@ + # + /etc/my\.cnf -- gen_context(system_u:object_r:mysqld_etc_t,s0) + /etc/mysql(/.*)? gen_context(system_u:object_r:mysqld_etc_t,s0) ++/etc/rc\.d/init\.d/mysqld -- gen_context(system_u:object_r:mysqld_initrc_exec_t,s0) - /var/run/mysqld(/.*)? gen_context(system_u:object_r:mysqld_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/mysqld -- gen_context(system_u:object_r:mysqld_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.5.8/policy/modules/services/mysql.if + # + # /usr +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.5.9/policy/modules/services/mysql.if --- nsaserefpolicy/policy/modules/services/mysql.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mysql.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/mysql.if 2008-09-25 08:33:18.000000000 -0400 @@ -53,9 +53,11 @@ interface(`mysql_stream_connect',` gen_require(` @@ -19155,31 +18320,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -178,3 +180,71 @@ +@@ -178,3 +180,47 @@ logging_search_logs($1) allow $1 mysqld_log_t:file { write append setattr ioctl }; ') + +######################################## +## -+## Execute mysql server in the mysqld domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`mysql_script_domtrans',` -+ gen_require(` -+ type mysqld_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, mysqld_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate an mysql environment +## +## @@ -19192,11 +18339,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the mysql domain. +## +## -+## -+## -+## The type of the terminal allow the mysql domain to use. -+## -+## +## +# +interface(`mysql_admin',` @@ -19205,16 +18347,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + type mysqld_t, mysqld_var_run_t; + type mysqld_tmp_t, mysqld_db_t; + type mysqld_etc_t, mysqld_log_t; -+ type mysqld_script_exec_t; ++ type mysqld_initrc_exec_t; + ') + + allow $1 mysqld_t:process { ptrace signal_perms }; + ps_process_pattern($1, mysqld_t) + -+ # Allow $1 to restart the apache service -+ mysql_script_domtrans($1) ++ init_labeled_script_domtrans($1, mysqld_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 mysqld_script_exec_t system_r; ++ role_transition $2 mysqld_initrc_exec_t system_r; + allow $2 system_r; + + admin_pattern($1, mysqld_var_run_t) @@ -19227,19 +18368,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + admin_pattern($1, mysqld_tmp_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.5.8/policy/modules/services/mysql.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.5.9/policy/modules/services/mysql.te --- nsaserefpolicy/policy/modules/services/mysql.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/mysql.te 2008-09-17 08:49:08.000000000 -0400 -@@ -25,6 +25,9 @@ - type mysqld_tmp_t; - files_tmp_file(mysqld_tmp_t) ++++ serefpolicy-3.5.9/policy/modules/services/mysql.te 2008-09-25 08:33:18.000000000 -0400 +@@ -19,6 +19,9 @@ + type mysqld_etc_t alias etc_mysqld_t; + files_config_file(mysqld_etc_t) -+type mysqld_script_exec_t; -+init_script_file(mysqld_script_exec_t) ++type mysqld_initrc_exec_t; ++init_script_file(mysqld_initrc_exec_t) + - ######################################## - # - # Local policy + type mysqld_log_t; + logging_log_file(mysqld_log_t) + @@ -33,7 +36,8 @@ allow mysqld_t self:capability { dac_override setgid setuid sys_resource net_bind_service }; dontaudit mysqld_t self:capability sys_tty_config; @@ -19258,10 +18399,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol domain_use_interactive_fds(mysqld_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.5.8/policy/modules/services/nagios.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.5.9/policy/modules/services/nagios.fc --- nsaserefpolicy/policy/modules/services/nagios.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nagios.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -4,13 +4,17 @@ ++++ serefpolicy-3.5.9/policy/modules/services/nagios.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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) @@ -19280,12 +18426,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') +/usr/lib(64)?/cgi-bin/nagios(/.+)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) + -+/etc/rc\.d/init\.d/nagios -- gen_context(system_u:object_r:nagios_script_exec_t,s0) -+/etc/rc\.d/init\.d/nrpe -- gen_context(system_u:object_r: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.5.8/policy/modules/services/nagios.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.5.9/policy/modules/services/nagios.if --- nsaserefpolicy/policy/modules/services/nagios.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nagios.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/nagios.if 2008-09-25 08:33:18.000000000 -0400 @@ -44,7 +44,7 @@ ######################################## @@ -19295,7 +18438,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## a domain transition. ## ## -@@ -53,29 +53,87 @@ +@@ -53,29 +53,62 @@ ## ## # @@ -19314,25 +18457,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## -## Execute the nagios NRPE with -## a domain transition. -+## Execute nagios server in the nagios domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`nagios_script_domtrans',` -+ gen_require(` -+ type nagios_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, nagios_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an nagios environment ## @@ -19346,11 +18470,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the nagios domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## # -interface(`nagios_domtrans_nrpe',` @@ -19361,40 +18480,39 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + type nagios_tmp_t, nagios_log_t; + type nagios_etc_t, nrpe_etc_t; + type nagios_spool_t, nagios_var_run_t; -+ type nagios_script_exec_t; ++ type nagios_initrc_exec_t; ') - domtrans_pattern($1, nrpe_exec_t, nrpe_t) + allow $1 nagios_t:process { ptrace signal_perms }; + ps_process_pattern($1, nagios_t) + -+ # Allow nagios_t to restart the apache service -+ nagios_script_domtrans($1) ++ init_labeled_script_domtrans($1, nagios_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 nagios_script_exec_t system_r; ++ role_transition $2 nagios_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, nagios_tmp_t) ++ admin_pattern($1, nagios_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, nagios_log_t) ++ 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) ++ admin_pattern($1, nagios_spool_t) + + files_list_pids($1) -+ admin_pattern($1, nagios_var_run_t) ++ 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.5.8/policy/modules/services/nagios.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.5.9/policy/modules/services/nagios.te --- nsaserefpolicy/policy/modules/services/nagios.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nagios.te 2008-09-17 08:49:08.000000000 -0400 -@@ -10,10 +10,6 @@ ++++ serefpolicy-3.5.9/policy/modules/services/nagios.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,13 +10,12 @@ type nagios_exec_t; init_daemon_domain(nagios_t, nagios_exec_t) @@ -19405,7 +18523,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type nagios_etc_t; files_config_file(nagios_etc_t) -@@ -26,6 +22,9 @@ ++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) @@ -19415,16 +18539,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type nrpe_t; type nrpe_exec_t; init_daemon_domain(nrpe_t, nrpe_exec_t) -@@ -33,6 +32,9 @@ - type nrpe_etc_t; - files_config_file(nrpe_etc_t) - -+type nagios_script_exec_t; -+init_script_file(nagios_script_exec_t) -+ - ######################################## - # - # Nagios local policy @@ -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) @@ -19496,12 +18610,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.5.8/policy/modules/services/networkmanager.fc ---- nsaserefpolicy/policy/modules/services/networkmanager.fc 2008-09-12 10:15:44.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -1,7 +1,11 @@ -+/etc/NetworkManager/dispatcher\.d(/.*) gen_context(system_u:object_r:NetworkManager_script_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.5.9/policy/modules/services/networkmanager.fc +--- nsaserefpolicy/policy/modules/services/networkmanager.fc 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/networkmanager.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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) @@ -19511,14 +18626,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /var/log/wpa_supplicant.* -- gen_context(system_u:object_r:NetworkManager_log_t,s0) -@@ -9,3 +13,4 @@ +@@ -10,3 +14,4 @@ /var/run/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) /var/run/wpa_supplicant(/.*)? gen_context(system_u:object_r:NetworkManager_var_run_t,s0) /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) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.5.8/policy/modules/services/networkmanager.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.5.9/policy/modules/services/networkmanager.if --- nsaserefpolicy/policy/modules/services/networkmanager.if 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.if 2008-09-23 11:18:34.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/networkmanager.if 2008-09-25 08:33:18.000000000 -0400 @@ -118,6 +118,24 @@ ######################################## @@ -19531,12 +18646,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +## +# -+interface(`networkmanager_script_domtrans',` ++interface(`networkmanager_initrc_domtrans',` + gen_require(` -+ type NetworkManager_script_exec_t; ++ type NetworkManager_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, NetworkManager_script_exec_t) ++ init_labeled_script_domtrans($1, NetworkManager_initrc_exec_t) +') + +######################################## @@ -19544,10 +18659,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Read NetworkManager PID files. ## ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.8/policy/modules/services/networkmanager.te ---- nsaserefpolicy/policy/modules/services/networkmanager.te 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/networkmanager.te 2008-09-23 16:02:33.000000000 -0400 -@@ -29,9 +29,9 @@ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.9/policy/modules/services/networkmanager.te +--- nsaserefpolicy/policy/modules/services/networkmanager.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/networkmanager.te 2008-09-25 08:33:18.000000000 -0400 +@@ -33,9 +33,9 @@ # networkmanager will ptrace itself if gdb is installed # and it receives a unexpected signal (rh bug #204161) @@ -19559,7 +18674,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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; -@@ -57,6 +57,7 @@ +@@ -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,7 @@ kernel_read_network_state(NetworkManager_t) kernel_read_kernel_sysctls(NetworkManager_t) kernel_load_module(NetworkManager_t) @@ -19567,7 +18693,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_all_recvfrom_unlabeled(NetworkManager_t) corenet_all_recvfrom_netlabel(NetworkManager_t) -@@ -79,9 +80,11 @@ +@@ -85,9 +86,11 @@ dev_read_sysfs(NetworkManager_t) dev_read_rand(NetworkManager_t) dev_read_urand(NetworkManager_t) @@ -19579,7 +18705,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol mls_file_read_all_levels(NetworkManager_t) -@@ -98,9 +101,14 @@ +@@ -104,9 +107,14 @@ files_read_etc_runtime_files(NetworkManager_t) files_read_usr_files(NetworkManager_t) @@ -19594,7 +18720,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(NetworkManager_t) libs_use_shared_libs(NetworkManager_t) -@@ -127,9 +135,12 @@ +@@ -133,9 +141,12 @@ userdom_dontaudit_use_unpriv_users_ttys(NetworkManager_t) # Read gnome-keyring userdom_read_unpriv_users_home_content_files(NetworkManager_t) @@ -19607,7 +18733,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` bind_domtrans(NetworkManager_t) bind_manage_cache(NetworkManager_t) -@@ -145,21 +156,26 @@ +@@ -151,21 +162,26 @@ ') optional_policy(` @@ -19630,21 +18756,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - nscd_socket_use(NetworkManager_t) + nscd_domtrans(NetworkManager_t) nscd_signal(NetworkManager_t) -+ nscd_script_domtrans(NetworkManager_t) ++ nscd_initrc_domtrans(NetworkManager_t) +') + +optional_policy(` + # Dispatcher starting and stoping ntp -+ ntp_script_domtrans(NetworkManager_t) ++ ntp_initrc_domtrans(NetworkManager_t) ') optional_policy(` -@@ -168,9 +184,17 @@ +@@ -174,9 +190,17 @@ ') optional_policy(` - ppp_domtrans(NetworkManager_t) -+ ppp_script_domtrans(NetworkManager_t) ++ ppp_initrc_domtrans(NetworkManager_t) ppp_read_pid_files(NetworkManager_t) ppp_signal(NetworkManager_t) + ppp_signull(NetworkManager_t) @@ -19658,10 +18784,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.5.8/policy/modules/services/nis.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.5.9/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nis.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -4,9 +4,14 @@ ++++ serefpolicy-3.5.9/policy/modules/services/nis.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,9 +1,13 @@ + ++/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) @@ -19669,16 +18801,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) - /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) - - /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) -+ -+/etc/rc\.d/init\.d/yppasswd -- gen_context(system_u:object_r:nis_script_exec_t,s0) -+/etc/rc\.d/init\.d/ypserv -- gen_context(system_u:object_r:nis_script_exec_t,s0) -+/etc/rc\.d/init\.d/ypxfrd -- gen_context(system_u:object_r:nis_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.5.8/policy/modules/services/nis.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.5.9/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nis.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/nis.if 2008-09-25 08:33:18.000000000 -0400 @@ -28,7 +28,7 @@ type var_yp_t; ') @@ -19725,7 +18850,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Execute ypbind in the ypbind domain. ## ## -@@ -244,3 +263,89 @@ +@@ -244,3 +263,83 @@ corecmd_search_bin($1) domtrans_pattern($1, ypxfr_exec_t, ypxfr_t) ') @@ -19741,12 +18866,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +# +# -+interface(`nis_script_domtrans',` ++interface(`nis_initrc_domtrans',` + gen_require(` -+ type nis_script_exec_t; ++ type nis_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, nis_script_exec_t) ++ init_labeled_script_domtrans($1, nis_initrc_exec_t) +') + +######################################## @@ -19764,11 +18889,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the nis domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`nis_admin',` @@ -19777,7 +18897,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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 nis_script_exec_t; ++ type nis_initrc_exec_t; + ') + + allow $1 ypbind_t:process { ptrace signal_perms }; @@ -19792,38 +18912,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $1 ypxfr_t:process { ptrace signal_perms }; + ps_process_pattern($1, ypxfr_t) + -+ # Allow ypbind_t to restart the apache service -+ nis_script_domtrans($1) ++ nis_initrc_domtrans($1) + domain_system_change_exemption($1) -+ role_transition $2 nis_script_exec_t system_r; ++ role_transition $2 nis_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, ypbind_tmp_t) ++ admin_pattern($1, ypbind_tmp_t) + + files_list_pids($1) -+ admin_pattern($1, ypbind_var_run_t) ++ admin_pattern($1, ypbind_var_run_t) + -+ admin_pattern($1, yppasswdd_var_run_t) ++ admin_pattern($1, yppasswdd_var_run_t) + + files_list_etc($1) -+ admin_pattern($1, ypserv_conf_t) ++ admin_pattern($1, ypserv_conf_t) + -+ admin_pattern($1, ypserv_tmp_t) ++ admin_pattern($1, ypserv_tmp_t) + -+ admin_pattern($1, ypserv_var_run_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.5.8/policy/modules/services/nis.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.5.9/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nis.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/nis.te 2008-09-25 08:33:18.000000000 -0400 @@ -44,6 +44,9 @@ type ypxfr_exec_t; init_daemon_domain(ypxfr_t, ypxfr_exec_t) -+type nis_script_exec_t; -+init_script_file(nis_script_exec_t) ++type nis_initrc_exec_t; ++init_script_file(nis_initrc_exec_t) + ######################################## # @@ -19886,18 +19005,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/services/nscd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.fc serefpolicy-3.5.9/policy/modules/services/nscd.fc --- nsaserefpolicy/policy/modules/services/nscd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nscd.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -9,3 +9,5 @@ - /var/run/\.nscd_socket -s gen_context(system_u:object_r:nscd_var_run_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/nscd.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/nscd -- gen_context(system_u:object_r:nscd_initrc_exec_t,s0) - /var/run/nscd(/.*)? gen_context(system_u:object_r:nscd_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/nscd -- gen_context(system_u:object_r:nscd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.5.8/policy/modules/services/nscd.if + /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.5.9/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nscd.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/nscd.if 2008-09-25 08:33:18.000000000 -0400 @@ -70,15 +70,14 @@ interface(`nscd_socket_use',` gen_require(` @@ -19916,7 +19034,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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 }; -@@ -204,3 +203,66 @@ +@@ -204,3 +203,60 @@ role $2 types nscd_t; dontaudit nscd_t $3:chr_file rw_term_perms; ') @@ -19931,12 +19049,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +## +# -+interface(`nscd_script_domtrans',` ++interface(`nscd_initrc_domtrans',` + gen_require(` -+ type nscd_script_exec_t; ++ type nscd_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, nscd_script_exec_t) ++ init_labeled_script_domtrans($1, nscd_initrc_exec_t) +') + +######################################## @@ -19954,47 +19072,43 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the nscd domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`nscd_admin',` + gen_require(` + type nscd_t, nscd_log_t, nscd_var_run_t; -+ type nscd_script_exec_t; ++ type nscd_initrc_exec_t; + ') + + allow $1 nscd_t:process { ptrace signal_perms }; + ps_process_pattern($1, nscd_t) + -+ # Allow admin domain to restart the nscd_t service -+ nscd_script_domtrans($1) ++ nscd_initrc_domtrans($1) + domain_system_change_exemption($1) -+ role_transition $2 nscd_script_exec_t system_r; ++ role_transition $2 nscd_initrc_exec_t system_r; + allow $2 system_r; + + logging_list_logs($1) -+ admin_pattern($1, nscd_log_t) ++ admin_pattern($1, nscd_log_t) + + files_list_pids($1) -+ admin_pattern($1, nscd_var_run_t) ++ 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.5.8/policy/modules/services/nscd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.5.9/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/nscd.te 2008-09-17 08:49:08.000000000 -0400 -@@ -23,19 +23,22 @@ ++++ serefpolicy-3.5.9/policy/modules/services/nscd.te 2008-09-25 08:33:18.000000000 -0400 +@@ -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) -+type nscd_script_exec_t; -+init_script_file(nscd_script_exec_t) -+ - ######################################## - # +@@ -28,14 +31,14 @@ # Local policy # @@ -20081,10 +19195,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/ntp.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.5.9/policy/modules/services/ntp.if --- nsaserefpolicy/policy/modules/services/ntp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ntp.if 2008-09-17 08:49:08.000000000 -0400 -@@ -53,3 +53,72 @@ ++++ serefpolicy-3.5.9/policy/modules/services/ntp.if 2008-09-25 08:33:18.000000000 -0400 +@@ -53,3 +53,65 @@ corecmd_search_bin($1) domtrans_pattern($1, ntpdate_exec_t, ntpd_t) ') @@ -20099,12 +19213,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +## +# -+interface(`ntp_script_domtrans',` ++interface(`ntp_initrc_domtrans',` + gen_require(` -+ type ntpd_script_exec_t; ++ type ntpd_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, ntpd_script_exec_t) ++ init_labeled_script_domtrans($1, ntpd_initrc_exec_t) +') + +######################################## @@ -20122,44 +19236,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the ntp domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`ntp_admin',` + gen_require(` + type ntp_t, ntp_tmp_t, ntp_log_t; + type ntp_key_t, ntp_var_lib_t, ntp_var_run_t; -+ type ntp_script_exec_t; ++ type ntpd_initrc_exec_t; + ') + + allow $1 ntp_t:process { ptrace signal_perms getattr }; + ps_process_pattern($1, ntp_t) + -+ # Allow ntp_t to restart the apache service -+ ntp_script_domtrans($1) ++ init_labeled_script_domtrans($1, ntpd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 ntp_script_exec_t system_r; ++ role_transition $2 ntpd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, ntp_tmp_t) ++ admin_pattern($1, ntp_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, ntp_log_t) ++ admin_pattern($1, ntp_log_t) + + admin_pattern($1, ntp_key_t) + + files_list_pids($1) -+ admin_pattern($1, ntp_var_run_t) ++ admin_pattern($1, ntp_var_run_t) +') -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.5.8/policy/modules/services/ntp.te ---- nsaserefpolicy/policy/modules/services/ntp.te 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ntp.te 2008-09-17 08:49:08.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.5.9/policy/modules/services/ntp.te +--- nsaserefpolicy/policy/modules/services/ntp.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/ntp.te 2008-09-25 08:33:18.000000000 -0400 @@ -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 }; @@ -20177,18 +19284,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/services/oddjob.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.5.9/policy/modules/services/oddjob.fc --- nsaserefpolicy/policy/modules/services/oddjob.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/oddjob.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/oddjob.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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.5.8/policy/modules/services/oddjob.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.5.9/policy/modules/services/oddjob.if --- nsaserefpolicy/policy/modules/services/oddjob.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/oddjob.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/oddjob.if 2008-09-25 08:33:18.000000000 -0400 @@ -44,6 +44,7 @@ ') @@ -20232,9 +19339,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + role $2 types oddjob_mkhomedir_t; + dontaudit oddjob_mkhomedir_t $3:chr_file rw_term_perms; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.5.8/policy/modules/services/oddjob.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.5.9/policy/modules/services/oddjob.te --- nsaserefpolicy/policy/modules/services/oddjob.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/oddjob.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/oddjob.te 2008-09-25 08:33:18.000000000 -0400 @@ -10,14 +10,21 @@ type oddjob_exec_t; domain_type(oddjob_t) @@ -20294,10 +19401,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # Add/remove user home directories unprivuser_home_filetrans_home_dir(oddjob_mkhomedir_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-3.5.8/policy/modules/services/openvpn.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.fc serefpolicy-3.5.9/policy/modules/services/openvpn.fc --- nsaserefpolicy/policy/modules/services/openvpn.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/openvpn.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -11,5 +11,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/openvpn.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -2,6 +2,7 @@ + # /etc + # + /etc/openvpn(/.*)? gen_context(system_u:object_r:openvpn_etc_t,s0) ++/etc/rc\.d/init\.d/openvpn -- gen_context(system_u:object_r:openvpn_initrc_exec_t,s0) + + # + # /usr +@@ -11,5 +12,6 @@ # # /var # @@ -20305,36 +19420,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/var/log/openvpn.* gen_context(system_u:object_r:openvpn_var_log_t,s0) /var/run/openvpn(/.*)? gen_context(system_u:object_r:openvpn_var_run_t,s0) + -+/etc/rc\.d/init\.d/openvpn -- gen_context(system_u:object_r:openvpn_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.5.8/policy/modules/services/openvpn.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.5.9/policy/modules/services/openvpn.if --- nsaserefpolicy/policy/modules/services/openvpn.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/openvpn.if 2008-09-17 08:49:08.000000000 -0400 -@@ -90,3 +90,74 @@ ++++ serefpolicy-3.5.9/policy/modules/services/openvpn.if 2008-09-25 08:33:18.000000000 -0400 +@@ -90,3 +90,47 @@ read_files_pattern($1, openvpn_etc_t, openvpn_etc_t) read_lnk_files_pattern($1, openvpn_etc_t, openvpn_etc_t) ') + +######################################## +## -+## Execute openvpn server in the openvpn domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`openvpn_script_domtrans',` -+ gen_require(` -+ type openvpn_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, openvpn_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an openvpn environment +## @@ -20348,72 +19443,50 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the openvpn domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`openvpn_admin',` + gen_require(` -+ type openvpn_t; -+ type openvpn_script_exec_t; -+ type openvpn_etc_t; -+ type openvpn_var_log_t; ++ type openvpn_t, openvpn_etc_t, openvpn_var_log_t; + type openvpn_var_run_t; ++ type openvpn_initrc_exec_t; + ') + -+ allow $1 openvpn_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, openvpn_t, openvpn_t) ++ allow $1 openvpn_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, openvpn_t) + -+ # Allow openvpn_t to restart the apache service -+ openvpn_script_domtrans($1) ++ init_labeled_script_domtrans($1, openvpn_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 openvpn_script_exec_t system_r; ++ role_transition $2 openvpn_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, openvpn_etc_t) ++ admin_pattern($1, openvpn_etc_t) + + logging_list_logs($1) -+ admin_pattern($1, openvpn_var_log_t) ++ admin_pattern($1, openvpn_var_log_t) + + files_list_pids($1) -+ admin_pattern($1, openvpn_var_run_t) ++ admin_pattern($1, openvpn_var_run_t) +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.5.8/policy/modules/services/openvpn.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.5.9/policy/modules/services/openvpn.te --- nsaserefpolicy/policy/modules/services/openvpn.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/openvpn.te 2008-09-17 08:49:08.000000000 -0400 -@@ -8,7 +8,7 @@ - - ## - ##

--## Allow openvpn to read home directories -+## Allow openvpn service access to users home directories - ##

- ## - gen_tunable(openvpn_enable_homedirs, false) -@@ -20,7 +20,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/openvpn.te 2008-09-25 08:33:18.000000000 -0400 +@@ -20,7 +20,10 @@ # configuration files type openvpn_etc_t; -files_type(openvpn_etc_t) +files_config_file(openvpn_etc_t) ++ ++type openvpn_initrc_exec_t; ++init_script_file(openvpn_initrc_exec_t) # log files type openvpn_var_log_t; -@@ -30,12 +30,15 @@ - type openvpn_var_run_t; - files_pid_file(openvpn_var_run_t) - -+type openvpn_script_exec_t; -+init_script_file(openvpn_script_exec_t) -+ - ######################################## - # +@@ -35,7 +38,7 @@ # openvpn local policy # @@ -20451,9 +19524,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + unconfined_use_terminals(openvpn_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.fc serefpolicy-3.5.8/policy/modules/services/pads.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.fc serefpolicy-3.5.9/policy/modules/services/pads.fc --- nsaserefpolicy/policy/modules/services/pads.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/pads.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/pads.fc 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,12 @@ + +/etc/pads-ether-codes -- gen_context(system_u:object_r:pads_config_t, s0) @@ -20461,15 +19534,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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_script_exec_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.5.8/policy/modules/services/pads.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.if serefpolicy-3.5.9/policy/modules/services/pads.if --- nsaserefpolicy/policy/modules/services/pads.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/pads.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/pads.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,10 @@ +## SELinux policy for PADS daemon. +## @@ -20481,9 +19554,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +##

+## + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.te serefpolicy-3.5.8/policy/modules/services/pads.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.te serefpolicy-3.5.9/policy/modules/services/pads.te --- nsaserefpolicy/policy/modules/services/pads.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/pads.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/pads.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,66 @@ + +policy_module(pads, 0.0.1) @@ -20498,8 +19571,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +init_daemon_domain(pads_t, pads_exec_t) +role system_r types pads_t; + -+type pads_script_exec_t; -+init_script_file(pads_script_exec_t) ++type pads_initrc_exec_t; ++init_script_file(pads_initrc_exec_t) + +type pads_config_t; +files_config_file(pads_config_t) @@ -20551,9 +19624,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/services/pcscd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.5.9/policy/modules/services/pcscd.te --- nsaserefpolicy/policy/modules/services/pcscd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/pcscd.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/pcscd.te 2008-09-25 08:33:18.000000000 -0400 @@ -10,6 +10,7 @@ type pcscd_exec_t; domain_type(pcscd_t) @@ -20577,9 +19650,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/services/pegasus.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.5.9/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/pegasus.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/pegasus.te 2008-09-25 08:33:18.000000000 -0400 @@ -66,6 +66,7 @@ kernel_read_system_state(pegasus_t) kernel_search_vm_sysctl(pegasus_t) @@ -20612,9 +19685,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol sysnet_domtrans_ifconfig(pegasus_t) userdom_dontaudit_use_unpriv_user_fds(pegasus_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.fc serefpolicy-3.5.8/policy/modules/services/polkit.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.fc serefpolicy-3.5.9/policy/modules/services/polkit.fc --- nsaserefpolicy/policy/modules/services/polkit.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/polkit.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/polkit.fc 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,9 @@ + +/usr/libexec/polkit-read-auth-helper -- gen_context(system_u:object_r:polkit_auth_exec_t,s0) @@ -20625,9 +19698,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.5.8/policy/modules/services/polkit.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.5.9/policy/modules/services/polkit.if --- nsaserefpolicy/policy/modules/services/polkit.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/polkit.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/polkit.if 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,213 @@ + +## policy for polkit_auth @@ -20842,9 +19915,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + polkit_read_lib($2) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.5.8/policy/modules/services/polkit.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.5.9/policy/modules/services/polkit.te --- nsaserefpolicy/policy/modules/services/polkit.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.8/policy/modules/services/polkit.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/polkit.te 2008-09-25 08:33:18.000000000 -0400 @@ -0,0 +1,231 @@ +policy_module(polkit_auth, 1.0.0) + @@ -21077,9 +20150,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + unconfined_ptrace(polkit_resolve_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-3.5.8/policy/modules/services/portmap.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-3.5.9/policy/modules/services/portmap.te --- nsaserefpolicy/policy/modules/services/portmap.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/portmap.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/portmap.te 2008-09-25 08:33:18.000000000 -0400 @@ -41,6 +41,7 @@ manage_files_pattern(portmap_t, portmap_var_run_t, portmap_var_run_t) files_pid_filetrans(portmap_t, portmap_var_run_t, file) @@ -21088,9 +20161,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_kernel_sysctls(portmap_t) kernel_list_proc(portmap_t) kernel_read_proc_symlinks(portmap_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.5.8/policy/modules/services/postfix.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.5.9/policy/modules/services/postfix.fc --- nsaserefpolicy/policy/modules/services/postfix.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postfix.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/postfix.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -21115,9 +20188,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /var/spool/postfix(/.*)? gen_context(system_u:object_r:postfix_spool_t,s0) /var/spool/postfix/maildrop(/.*)? gen_context(system_u:object_r:postfix_spool_maildrop_t,s0) /var/spool/postfix/pid/.* gen_context(system_u:object_r:postfix_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.5.8/policy/modules/services/postfix.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.5.9/policy/modules/services/postfix.if --- nsaserefpolicy/policy/modules/services/postfix.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postfix.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/postfix.if 2008-09-25 08:33:18.000000000 -0400 @@ -211,9 +211,8 @@ type postfix_etc_t; ') @@ -21215,9 +20288,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/postfix.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.9/policy/modules/services/postfix.te --- nsaserefpolicy/policy/modules/services/postfix.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postfix.te 2008-09-23 09:58:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/postfix.te 2008-09-25 08:33:18.000000000 -0400 @@ -6,6 +6,14 @@ # Declarations # @@ -21496,42 +20569,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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/postfixpolicyd.fc serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.fc serefpolicy-3.5.9/policy/modules/services/postfixpolicyd.fc --- nsaserefpolicy/policy/modules/services/postfixpolicyd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -3,3 +3,5 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postfixpolicyd.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,4 +1,5 @@ + /etc/policyd.conf -- gen_context(system_u:object_r:postfix_policyd_conf_t, s0) ++/etc/rc\.d/init\.d/postfixpolicyd -- gen_context(system_u:object_r:postfixpolicyd_initrc_exec_t,s0) + /usr/sbin/policyd -- gen_context(system_u:object_r:postfix_policyd_exec_t, s0) - /var/run/policyd\.pid -- gen_context(system_u:object_r:postfix_policyd_var_run_t, s0) -+ -+/etc/rc\.d/init\.d/postfixpolicyd -- gen_context(system_u:object_r:postfixpolicyd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.if serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.if serefpolicy-3.5.9/policy/modules/services/postfixpolicyd.if --- nsaserefpolicy/policy/modules/services/postfixpolicyd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.if 2008-09-17 08:49:08.000000000 -0400 -@@ -1 +1,68 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postfixpolicyd.if 2008-09-25 08:33:18.000000000 -0400 +@@ -1 +1,42 @@ ## Postfix policy server + +######################################## +## -+## Execute postfixpolicyd server in the postfixpolicyd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`postfixpolicyd_script_domtrans',` -+ gen_require(` -+ type postfix_policyd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, postfix_policyd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an postfixpolicyd environment +## @@ -21545,55 +20599,56 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the postfixpolicyd domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`postfixpolicyd_admin',` + gen_require(` -+ type postfix_policyd_t; -+ type postfix_policyd_script_exec_t; -+ type postfix_policyd_conf_t; ++ type postfix_policyd_t, postfix_policyd_conf_t; + type postfix_policyd_var_run_t; ++ type postfix_policyd_initrc_exec_t; + ') + -+ allow $1 postfix_policyd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, postfix_policyd_t, postfix_policyd_t) ++ allow $1 postfix_policyd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, postfix_policyd_t) + -+ # Allow postfix_policyd_t to restart the apache service -+ postfixpolicyd_script_domtrans($1) ++ init_labeled_script_domtrans($1, postfix_policyd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 postfix_policyd_script_exec_t system_r; ++ role_transition $2 postfix_policyd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, postfix_policyd_conf_t) ++ admin_pattern($1, postfix_policyd_conf_t) + + files_list_pids($1) -+ admin_pattern($1, postfix_policyd_var_run_t) ++ admin_pattern($1, postfix_policyd_var_run_t) +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.te serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfixpolicyd.te serefpolicy-3.5.9/policy/modules/services/postfixpolicyd.te --- nsaserefpolicy/policy/modules/services/postfixpolicyd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postfixpolicyd.te 2008-09-17 08:49:08.000000000 -0400 -@@ -16,6 +16,9 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postfixpolicyd.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,6 +13,9 @@ + type postfix_policyd_conf_t; + files_config_file(postfix_policyd_conf_t) + ++type postfix_policyd_initrc_exec_t; ++init_script_file(postfix_policyd_initrc_exec_t) ++ type postfix_policyd_var_run_t; files_pid_file(postfix_policyd_var_run_t) -+type postfix_policyd_script_exec_t; -+init_script_file(postfix_policyd_script_exec_t) -+ - ######################################## - # - # Local Policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.5.8/policy/modules/services/postgresql.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.5.9/policy/modules/services/postgresql.fc --- nsaserefpolicy/policy/modules/services/postgresql.fc 2008-08-14 13:08:27.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postgresql.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -28,13 +28,13 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postgresql.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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 +@@ -28,13 +29,13 @@ /var/lib/postgres(ql)?(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0) /var/lib/pgsql/data(/.*)? gen_context(system_u:object_r:postgresql_db_t,s0) @@ -21608,40 +20663,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /var/log/postgresql(/.*)? gen_context(system_u:object_r:postgresql_log_t,s0) /var/log/sepostgresql\.log.* -- gen_context(system_u:object_r:postgresql_log_t,s0) -@@ -43,3 +43,5 @@ - ') - - /var/run/postgresql(/.*)? gen_context(system_u:object_r:postgresql_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/postgresql -- gen_context(system_u:object_r:postgresql_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.5.8/policy/modules/services/postgresql.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.5.9/policy/modules/services/postgresql.if --- nsaserefpolicy/policy/modules/services/postgresql.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postgresql.if 2008-09-17 08:49:08.000000000 -0400 -@@ -372,3 +372,70 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postgresql.if 2008-09-25 08:33:18.000000000 -0400 +@@ -372,3 +372,46 @@ typeattribute $1 sepgsql_unconfined_type; ') + +######################################## +## -+## Execute postgresql server in the posgresql domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`postgresql_script_domtrans',` -+ gen_require(` -+ type postgresql_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, postgresql_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate an postgresql environment +## +## @@ -21654,11 +20685,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the postgresql domain. +## +## -+## -+## -+## The type of the terminal allow the postgresql domain to use. -+## -+## +## +# +interface(`postgresql_admin',` @@ -21666,16 +20692,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + type postgresql_t, postgresql_var_run_t; + type postgresql_tmp_t, postgresql_db_t; + type postgresql_etc_t, postgresql_log_t; -+ type postgresql_script_exec_t; ++ type postgresql_initrc_exec_t; + ') + + allow $1 postgresql_t:process { ptrace signal_perms }; + ps_process_pattern($1, postgresql_t) + -+ # Allow $1 to restart the apache service -+ postgresql_script_domtrans($1) ++ init_labeled_script_domtrans($1, postgresql_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 postgresql_script_exec_t system_r; ++ role_transition $2 postgresql_initrc_exec_t system_r; + allow $2 system_r; + + admin_pattern($1, postgresql_var_run_t) @@ -21688,19 +20713,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.5.8/policy/modules/services/postgresql.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.5.9/policy/modules/services/postgresql.te --- nsaserefpolicy/policy/modules/services/postgresql.te 2008-08-14 13:08:27.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postgresql.te 2008-09-17 08:49:08.000000000 -0400 -@@ -44,6 +44,9 @@ - type postgresql_var_run_t; - files_pid_file(postgresql_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/postgresql.te 2008-09-25 08:33:18.000000000 -0400 +@@ -32,6 +32,9 @@ + type postgresql_etc_t; + files_config_file(postgresql_etc_t) -+type postgresql_script_exec_t; -+init_script_file(postgresql_script_exec_t) ++type postgresql_initrc_exec_t; ++init_script_file(postgresql_initrc_exec_t) + - # database clients attribute - attribute sepgsql_client_type; - attribute sepgsql_unconfined_type; + type postgresql_lock_t; + files_lock_file(postgresql_lock_t) + @@ -159,7 +162,7 @@ manage_files_pattern(postgresql_t, postgresql_var_run_t, postgresql_var_run_t) @@ -21728,21 +20753,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.fc serefpolicy-3.5.8/policy/modules/services/postgrey.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-3.5.9/policy/modules/services/postgrey.fc --- nsaserefpolicy/policy/modules/services/postgrey.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postgrey.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -7,3 +7,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postgrey.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,5 +1,7 @@ + + /etc/postgrey(/.*)? gen_context(system_u:object_r:postgrey_etc_t,s0) ++/etc/rc\.d/init\.d/postgrey -- gen_context(system_u:object_r:postgrey_initrc_exec_t,s0) ++ + + /usr/sbin/postgrey -- gen_context(system_u:object_r:postgrey_exec_t,s0) + +@@ -7,3 +9,5 @@ /var/run/postgrey(/.*)? gen_context(system_u:object_r:postgrey_var_run_t,s0) /var/run/postgrey\.pid -- gen_context(system_u:object_r:postgrey_var_run_t,s0) + -+/etc/rc\.d/init\.d/postgrey -- gen_context(system_u:object_r:postgrey_script_exec_t,s0) -+ +/var/spool/postfix/postgrey(/.*)? gen_context(system_u:object_r:postgrey_spool_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.5.8/policy/modules/services/postgrey.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.5.9/policy/modules/services/postgrey.if --- nsaserefpolicy/policy/modules/services/postgrey.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postgrey.if 2008-09-23 09:13:18.000000000 -0400 -@@ -12,10 +12,98 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postgrey.if 2008-09-25 08:33:18.000000000 -0400 +@@ -12,10 +12,73 @@ # interface(`postgrey_stream_connect',` gen_require(` @@ -21777,25 +20808,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute postgrey server in the postgrey domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`postgrey_script_domtrans',` -+ gen_require(` -+ type postgrey_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, postgrey_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an postgrey environment +## @@ -21809,61 +20821,51 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the postgrey domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`postgrey_admin',` + gen_require(` + type postgrey_t, postgrey_etc_t; + type postgrey_var_lib_t, postgrey_var_run_t; -+ type postgrey_script_exec_t; ++ type postgrey_initrc_exec_t; + ') + + allow $1 postgrey_t:process { ptrace signal_perms }; + ps_process_pattern($1, postgrey_t) + -+ # Allow postgrey_t to restart the apache service -+ postgrey_script_domtrans($1) ++ init_labeled_script_domtrans($1, postgrey_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 postgrey_script_exec_t system_r; ++ role_transition $2 postgrey_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, postgrey_etc_t) ++ admin_pattern($1, postgrey_etc_t) + + files_list_var_lib($1) -+ admin_pattern($1, postgrey_var_lib_t) ++ admin_pattern($1, postgrey_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, postgrey_var_run_t) ++ admin_pattern($1, postgrey_var_run_t) +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.5.8/policy/modules/services/postgrey.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.5.9/policy/modules/services/postgrey.te --- nsaserefpolicy/policy/modules/services/postgrey.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/postgrey.te 2008-09-23 09:17:06.000000000 -0400 -@@ -13,26 +13,38 @@ ++++ serefpolicy-3.5.9/policy/modules/services/postgrey.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,6 +13,12 @@ type postgrey_etc_t; files_config_file(postgrey_etc_t) ++type postgrey_initrc_exec_t; ++init_script_file(postgrey_initrc_exec_t) ++ +type postgrey_spool_t; +files_type(postgrey_spool_t) + type postgrey_var_lib_t; files_type(postgrey_var_lib_t) - type postgrey_var_run_t; - files_pid_file(postgrey_var_run_t) - -+type postgrey_script_exec_t; -+init_script_file(postgrey_script_exec_t) -+ - ######################################## - # +@@ -24,15 +30,21 @@ # Local policy # @@ -21898,21 +20900,33 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_sigchld_newrole(postgrey_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.5.8/policy/modules/services/ppp.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.5.9/policy/modules/services/ppp.fc --- nsaserefpolicy/policy/modules/services/ppp.fc 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ppp.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -1,7 +1,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/ppp.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,8 +1,6 @@ # # /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_script_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) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.5.8/policy/modules/services/ppp.if + /etc/ppp/peers(/.*)? gen_context(system_u:object_r:pppd_etc_rw_t,s0) +@@ -8,9 +6,9 @@ + /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) ++/etc/rc\.d/init\.d/ppp -- 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.5.9/policy/modules/services/ppp.if --- nsaserefpolicy/policy/modules/services/ppp.if 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ppp.if 2008-09-23 15:53:43.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/ppp.if 2008-09-25 08:33:18.000000000 -0400 @@ -310,6 +310,24 @@ ######################################## @@ -21925,12 +20939,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +## +# -+interface(`ppp_script_domtrans',` ++interface(`ppp_initrc_domtrans',` + gen_require(` -+ type pppd_script_exec_t; ++ type pppd_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, pppd_script_exec_t) ++ init_labeled_script_domtrans($1, pppd_initrc_exec_t) +') + +######################################## @@ -21943,15 +20957,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type pptp_t, pptp_log_t, pptp_var_run_t; + type pppd_script_exec_t; ++ type pppd_initrc_exec_t; ') allow $1 pppd_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, pppd_t) -+ # Allow admin domain to restart the pppd_t service -+ ppp_script_domtrans($1) ++ ppp_initrc_domtrans($1) + domain_system_change_exemption($1) -+ role_transition $2 pppd_script_exec_t system_r; ++ role_transition $2 pppd_initrc_exec_t system_r; + allow $2 system_r; + files_list_tmp($1) @@ -21990,10 +21004,30 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - manage_files_pattern($1, pptp_var_run_t, pptp_var_run_t) + admin_pattern($1, pptp_var_run_t, pptp_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.5.8/policy/modules/services/ppp.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.5.9/policy/modules/services/ppp.te --- nsaserefpolicy/policy/modules/services/ppp.te 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ppp.te 2008-09-17 08:49:08.000000000 -0400 -@@ -197,6 +197,8 @@ ++++ serefpolicy-3.5.9/policy/modules/services/ppp.te 2008-09-25 08:33:18.000000000 -0400 +@@ -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) +@@ -197,6 +199,8 @@ optional_policy(` mta_send_mail(pppd_t) @@ -22002,7 +21036,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -@@ -293,6 +295,14 @@ +@@ -293,6 +297,14 @@ ') optional_policy(` @@ -22017,10 +21051,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol hostname_exec(pptp_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.5.8/policy/modules/services/prelude.fc +@@ -311,6 +323,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.5.9/policy/modules/services/prelude.fc --- nsaserefpolicy/policy/modules/services/prelude.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/prelude.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -5,7 +5,20 @@ ++++ serefpolicy-3.5.9/policy/modules/services/prelude.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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) @@ -22034,16 +21085,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) + -+/etc/rc\.d/init\.d/prelude-correlator -- gen_context(system_u:object_r:prelude_correlator_script_exec_t, s0) -+/etc/rc\.d/init\.d/prelude-lml -- gen_context(system_u:object_r:prelude_lml_script_exec_t,s0) -+/etc/rc\.d/init\.d/prelude-manager -- gen_context(system_u:object_r:prelude_script_exec_t,s0) -+ -+/etc/prelude-correlator(/.*)? gen_context(system_u:object_r:prelude_correlator_config_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.5.8/policy/modules/services/prelude.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.5.9/policy/modules/services/prelude.if --- nsaserefpolicy/policy/modules/services/prelude.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/prelude.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/prelude.if 2008-09-25 08:33:18.000000000 -0400 @@ -6,7 +6,7 @@ ## ## @@ -22062,7 +21108,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## ## # -@@ -56,6 +56,81 @@ +@@ -56,6 +56,45 @@ ######################################## ## @@ -22105,46 +21151,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute prelude server in the prelude domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`prelude_script_domtrans',` -+ gen_require(` -+ type prelude_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, prelude_script_exec_t) -+') -+ -+######################################## -+## -+## Execute prelude lml server in the prelude lml domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`prelude_lml_script_domtrans',` -+ gen_require(` -+ type prelude_lml_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, prelude_lml_script_exec_t) -+') -+ -+######################################## -+## ## All of the rules required to administrate ## an prelude environment ## -@@ -64,6 +139,16 @@ +@@ -64,6 +103,11 @@ ## Domain allowed access. ## ## @@ -22153,27 +21163,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the syslog domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## ## # interface(`prelude_admin',` -@@ -71,6 +156,11 @@ +@@ -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_script_exec_t; ++ type prelude_initrc_exec_t; + + type prelude_lml_t, prelude_lml_tmp_t; + type prelude_lml_var_run_t; -+ type prelude_lml_script_exec_t; ') allow $1 prelude_t:process { ptrace signal_perms }; -@@ -79,11 +169,23 @@ +@@ -79,11 +127,18 @@ allow $1 prelude_audisp_t:process { ptrace signal_perms }; ps_process_pattern($1, prelude_audisp_t) @@ -22186,27 +21190,22 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + ps_process_pattern($1, prelude_lml_t) - manage_files_pattern($1, prelude_audisp_var_run_t, prelude_audisp_var_run_t) -+ # Allow prelude_t to restart the apache service -+ prelude_script_domtrans($1) ++ init_labeled_script_domtrans($1, prelude_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 prelude_script_exec_t system_r; ++ role_transition $2 prelude_initrc_exec_t system_r; + allow $2 system_r; + -+ # Allow prelude_t to restart the apache service -+ prelude_lml_script_domtrans($1) -+ role_transition $2 prelude_lml_script_exec_t 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_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) ++ 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.5.8/policy/modules/services/prelude.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.5.9/policy/modules/services/prelude.te --- nsaserefpolicy/policy/modules/services/prelude.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/prelude.te 2008-09-22 09:13:31.000000000 -0400 -@@ -13,18 +13,56 @@ ++++ serefpolicy-3.5.9/policy/modules/services/prelude.te 2008-09-25 08:33:18.000000000 -0400 +@@ -13,18 +13,50 @@ type prelude_spool_t; files_type(prelude_spool_t) @@ -22219,8 +21218,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type prelude_var_lib_t; files_type(prelude_var_lib_t) -+type prelude_script_exec_t; -+init_script_file(prelude_script_exec_t) ++type prelude_initrc_exec_t; ++init_script_file(prelude_initrc_exec_t) + type prelude_audisp_t; type prelude_audisp_exec_t; @@ -22236,9 +21235,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +type prelude_lml_exec_t; +init_daemon_domain(prelude_lml_t, prelude_lml_exec_t) + -+type prelude_lml_script_exec_t; -+init_script_file(prelude_lml_script_exec_t) -+ +type prelude_lml_var_run_t; +files_pid_file(prelude_lml_var_run_t) + @@ -22255,15 +21251,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +init_daemon_domain(prelude_correlator_t, prelude_correlator_exec_t) +role system_r types prelude_correlator_t; + -+type prelude_correlator_script_exec_t; -+init_script_file(prelude_correlator_script_exec_t) -+ +type prelude_correlator_config_t; +files_config_file(prelude_correlator_config_t) ######################################## # -@@ -49,6 +87,9 @@ +@@ -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) @@ -22273,7 +21266,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corecmd_search_bin(prelude_t) corenet_all_recvfrom_unlabeled(prelude_t) -@@ -56,15 +97,23 @@ +@@ -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) @@ -22297,7 +21290,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol auth_use_nsswitch(prelude_t) -@@ -110,6 +159,7 @@ +@@ -110,6 +153,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) @@ -22305,7 +21298,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol dev_read_rand(prelude_audisp_t) dev_read_urand(prelude_audisp_t) -@@ -117,15 +167,129 @@ +@@ -117,15 +161,129 @@ # Init script handling domain_use_interactive_fds(prelude_audisp_t) @@ -22435,14 +21428,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # prewikka_cgi Declarations -@@ -133,8 +297,19 @@ - +@@ -134,6 +292,17 @@ optional_policy(` apache_content_template(prewikka) -+ files_search_tmp(httpd_prewikka_script_t) files_read_etc_files(httpd_prewikka_script_t) - -+ apache_search_sys_content(httpd_prewikka_script_t) ++ files_search_tmp(httpd_prewikka_script_t) ++ ++ can_exec(httpd_prewikka_script_t, httpd_prewikka_script_exec_t) + + corenet_tcp_connect_postgresql_port(httpd_prewikka_script_t) + @@ -22450,73 +21442,42 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + logging_send_syslog_msg(httpd_prewikka_script_t) + -+ can_exec(httpd_prewikka_script_t, httpd_prewikka_script_exec_t) -+ ++ apache_search_sys_content(httpd_prewikka_script_t) + optional_policy(` mysql_search_db(httpd_prewikka_script_t) - mysql_stream_connect(httpd_prewikka_script_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.5.8/policy/modules/services/privoxy.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.5.9/policy/modules/services/privoxy.fc --- nsaserefpolicy/policy/modules/services/privoxy.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/privoxy.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -1,6 +1,10 @@ ++++ serefpolicy-3.5.9/policy/modules/services/privoxy.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,5 +1,7 @@ /etc/privoxy/user\.action -- gen_context(system_u:object_r:privoxy_etc_rw_t,s0) +/etc/privoxy/default\.action -- gen_context(system_u:object_r:privoxy_etc_rw_t,s0) ++/etc/rc\.d/init\.d/privoxy -- gen_context(system_u:object_r:privoxy_initrc_exec_t,s0) /usr/sbin/privoxy -- gen_context(system_u:object_r:privoxy_exec_t,s0) - /var/log/privoxy(/.*)? gen_context(system_u:object_r:privoxy_log_t,s0) -+ -+/etc/rc\.d/init\.d/privoxy -- gen_context(system_u:object_r:privoxy_script_exec_t,s0) -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.if serefpolicy-3.5.8/policy/modules/services/privoxy.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.if serefpolicy-3.5.9/policy/modules/services/privoxy.if --- nsaserefpolicy/policy/modules/services/privoxy.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/privoxy.if 2008-09-17 08:49:08.000000000 -0400 -@@ -2,6 +2,25 @@ - - ######################################## - ## -+## Execute privoxy server in the privoxy domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`privoxy_script_domtrans',` -+ gen_require(` -+ type privoxy_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, privoxy_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an privoxy environment - ## -@@ -16,17 +35,24 @@ ++++ serefpolicy-3.5.9/policy/modules/services/privoxy.if 2008-09-25 08:33:18.000000000 -0400 +@@ -16,17 +16,23 @@ gen_require(` type privoxy_t, privoxy_log_t; type privoxy_etc_rw_t, privoxy_var_run_t; -+ type privoxy_script_exec_t; ++ type privoxy_initrc_exec_t; ') allow $1 privoxy_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, privoxy_t) -+ # Allow privoxy_t to restart the apache service -+ privoxy_script_domtrans($1) ++ init_labeled_script_domtrans($1, privoxy_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 privoxy_script_exec_t system_r; ++ role_transition $2 privoxy_initrc_exec_t system_r; + allow $2 system_r; + logging_list_logs($1) - manage_files_pattern($1, privoxy_log_t, privoxy_log_t) -+ admin_pattern($1, privoxy_log_t) ++ admin_pattern($1, privoxy_log_t) files_list_etc($1) - manage_files_pattern($1, privoxy_etc_rw_t, privoxy_etc_rw_t) @@ -22524,21 +21485,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_list_pids($1) - manage_files_pattern($1, privoxy_var_run_t, privoxy_var_run_t) -+ admin_pattern($1, privoxy_var_run_t) ++ admin_pattern($1, privoxy_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.5.8/policy/modules/services/privoxy.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.5.9/policy/modules/services/privoxy.te --- nsaserefpolicy/policy/modules/services/privoxy.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/privoxy.te 2008-09-17 08:49:08.000000000 -0400 -@@ -19,6 +19,9 @@ - type privoxy_var_run_t; - files_pid_file(privoxy_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/privoxy.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type privoxy_exec_t; + init_daemon_domain(privoxy_t, privoxy_exec_t) -+type privoxy_script_exec_t; -+init_script_file(privoxy_script_exec_t) ++type privoxy_initrc_exec_t; ++init_script_file(privoxy_initrc_exec_t) + - ######################################## - # - # Local Policy + type privoxy_etc_rw_t; + files_type(privoxy_etc_rw_t) + @@ -50,6 +53,7 @@ corenet_tcp_connect_http_port(privoxy_t) corenet_tcp_connect_http_cache_port(privoxy_t) @@ -22547,18 +21508,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_tcp_connect_tor_port(privoxy_t) corenet_sendrecv_http_cache_client_packets(privoxy_t) corenet_sendrecv_http_cache_server_packets(privoxy_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.fc serefpolicy-3.5.8/policy/modules/services/procmail.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.fc serefpolicy-3.5.9/policy/modules/services/procmail.fc --- nsaserefpolicy/policy/modules/services/procmail.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/procmail.fc 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/procmail.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,2 +1,5 @@ /usr/bin/procmail -- gen_context(system_u:object_r:procmail_exec_t,s0) + +/var/log/procmail\.log.* -- gen_context(system_u:object_r:procmail_log_t,s0) +/var/log/procmail(/.*)? gen_context(system_u:object_r:procmail_log_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.if serefpolicy-3.5.8/policy/modules/services/procmail.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.if serefpolicy-3.5.9/policy/modules/services/procmail.if --- nsaserefpolicy/policy/modules/services/procmail.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/procmail.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/procmail.if 2008-09-25 08:33:18.000000000 -0400 @@ -39,3 +39,41 @@ corecmd_search_bin($1) can_exec($1, procmail_exec_t) @@ -22601,9 +21562,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_search_tmp($1) + rw_files_pattern($1, procmail_tmp_t, procmail_tmp_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.5.8/policy/modules/services/procmail.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.5.9/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/procmail.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/procmail.te 2008-09-25 08:33:18.000000000 -0400 @@ -14,6 +14,10 @@ type procmail_tmp_t; files_tmp_file(procmail_tmp_t) @@ -22681,11 +21642,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/services/pyzor.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.5.9/policy/modules/services/pyzor.fc --- nsaserefpolicy/policy/modules/services/pyzor.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/pyzor.fc 2008-09-17 08:49:08.000000000 -0400 -@@ -1,9 +1,12 @@ ++++ serefpolicy-3.5.9/policy/modules/services/pyzor.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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:ROLE_pyzor_home_t,s0) +HOME_DIR/\.pyzor(/.*)? gen_context(system_u:object_r:pyzor_home_t,s0) @@ -22693,14 +21655,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) - - /var/lib/pyzord(/.*)? gen_context(system_u:object_r:pyzor_var_lib_t,s0) - /var/log/pyzord\.log -- gen_context(system_u:object_r:pyzord_log_t,s0) -+ -+/etc/rc\.d/init\.d/pyzord -- gen_context(system_u:object_r:pyzord_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.5.8/policy/modules/services/pyzor.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.5.9/policy/modules/services/pyzor.if --- nsaserefpolicy/policy/modules/services/pyzor.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/pyzor.if 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/pyzor.if 2008-09-25 13:02:38.000000000 -0400 @@ -25,16 +25,16 @@ # template(`pyzor_per_role_template',` @@ -22725,32 +21682,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -94,3 +94,78 @@ +@@ -94,3 +94,50 @@ corecmd_search_bin($1) can_exec($1, pyzor_exec_t) ') + +######################################## +## -+## Execute pyzor server in the pyzor domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`pyzor_pyzord_script_domtrans',` -+ gen_require(` -+ type pyzord_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, pyzord_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an pyzor environment +## @@ -22764,49 +21702,40 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the pyzor domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`pyzor_admin',` + gen_require(` -+ type pyzord_t; -+ type pyzord_script_exec_t; -+ type pyzor_tmp_t; -+ type pyzord_log_t; -+ type pyzor_etc_t; -+ type pyzor_var_lib_t; ++ 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 getattr }; -+ read_files_pattern($1, pyzord_t, pyzord_t) ++ allow $1 pyzord_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, pyzord_t) + -+ # Allow pyzord_t to restart the apache service -+ pyzor_pyzord_script_domtrans($1) ++ init_labeled_script_domtrans($1, pyzord_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 pyzord_script_exec_t system_r; ++ role_transition $2 pyzord_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, pyzor_tmp_t) ++ admin_pattern($1, pyzor_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, pyzord_log_t) ++ 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) ++ 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.5.8/policy/modules/services/pyzor.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.5.9/policy/modules/services/pyzor.te --- nsaserefpolicy/policy/modules/services/pyzor.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/pyzor.te 2008-09-17 08:49:08.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/pyzor.te 2008-09-25 08:33:18.000000000 -0400 @@ -6,6 +6,37 @@ # Declarations # @@ -22818,7 +21747,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + type spamc_t; + type spamc_exec_t; + type spamd_t; -+ type spamd_script_exec_t; ++ type spamd_initrc_exec_t; + type spamd_exec_t; + type spamc_tmp_t; + type spamd_log_t; @@ -22831,7 +21760,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + typealias spamc_t alias pyzor_t; + typealias spamc_exec_t alias pyzor_exec_t; + typealias spamd_t alias pyzord_t; -+ typealias spamd_script_exec_t alias pyzord_script_exec_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; @@ -22858,11 +21787,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type pyzor_var_lib_t; files_type(pyzor_var_lib_t) -+ type pyzor_home_t; -+ userdom_user_home_content(user, pyzor_home_t) ++type pyzor_home_t; ++userdom_user_home_content(user, pyzor_home_t) + -+ type pyzord_script_exec_t; -+ init_script_file(pyzord_script_exec_t) ++type pyzord_initrc_exec_t; ++init_script_file(pyzord_initrc_exec_t) + +') + @@ -22892,9 +21821,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.te serefpolicy-3.5.8/policy/modules/services/qmail.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.te serefpolicy-3.5.9/policy/modules/services/qmail.te --- nsaserefpolicy/policy/modules/services/qmail.te 2008-08-11 11:23:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/qmail.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/qmail.te 2008-09-25 08:33:18.000000000 -0400 @@ -124,6 +124,10 @@ qmail_domtrans_queue(qmail_local_t) @@ -22917,58 +21846,33 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ucspitcp_service_domain(qmail_smtpd_t, qmail_smtpd_exec_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-3.5.8/policy/modules/services/radius.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-3.5.9/policy/modules/services/radius.fc --- nsaserefpolicy/policy/modules/services/radius.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/radius.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -20,3 +20,5 @@ ++++ serefpolicy-3.5.9/policy/modules/services/radius.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,6 +1,7 @@ - /var/run/radiusd(/.*)? gen_context(system_u:object_r:radiusd_var_run_t,s0) - /var/run/radiusd\.pid -- gen_context(system_u:object_r:radiusd_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/radiusd -- gen_context(system_u:object_r:radius_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.if serefpolicy-3.5.8/policy/modules/services/radius.if ---- nsaserefpolicy/policy/modules/services/radius.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/radius.if 2008-09-17 08:49:09.000000000 -0400 -@@ -16,6 +16,25 @@ + /etc/cron\.(daily|monthly)/radiusd -- gen_context(system_u:object_r:radiusd_exec_t,s0) + /etc/cron\.(daily|weekly|monthly)/freeradius -- gen_context(system_u:object_r:radiusd_exec_t,s0) ++/etc/rc\.d/init\.d/radiusd -- gen_context(system_u:object_r:radius_initrc_exec_t,s0) - ######################################## - ## -+## Execute radius server in the radius domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`radius_script_domtrans',` -+ gen_require(` -+ type radius_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, radius_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an radius environment - ## -@@ -30,22 +49,29 @@ + /etc/raddb(/.*)? gen_context(system_u:object_r:radiusd_etc_t,s0) + /etc/raddb/db\.daily -- gen_context(system_u:object_r:radiusd_etc_rw_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.if serefpolicy-3.5.9/policy/modules/services/radius.if +--- nsaserefpolicy/policy/modules/services/radius.if 2008-08-07 11:15:11.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/radius.if 2008-09-25 08:33:18.000000000 -0400 +@@ -30,22 +30,28 @@ gen_require(` type radiusd_t, radiusd_etc_t, radiusd_log_t; type radiusd_etc_rw_t, radiusd_var_lib_t, radiusd_var_run_t; -+ type radius_script_exec_t; ++ type radius_initrc_exec_t; ') allow $1 radiusd_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, radiusd_t) -+ # Allow radius_t to restart the apache service -+ radius_script_domtrans($1) ++ init_labeled_script_domtrans($1, radius_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 radius_script_exec_t system_r; ++ role_transition $2 radius_initrc_exec_t system_r; + allow $2 system_r; + files_list_etc($1) @@ -22990,19 +21894,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - manage_files_pattern($1, radiusd_var_run_t, radiusd_var_run_t) + admin_pattern($1, radiusd_var_run_t, radiusd_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.5.8/policy/modules/services/radius.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.5.9/policy/modules/services/radius.te --- nsaserefpolicy/policy/modules/services/radius.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/radius.te 2008-09-17 08:49:09.000000000 -0400 -@@ -25,6 +25,9 @@ - type radiusd_var_run_t; - files_pid_file(radiusd_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/radius.te 2008-09-25 08:33:18.000000000 -0400 +@@ -16,6 +16,9 @@ + type radiusd_etc_rw_t; + files_type(radiusd_etc_rw_t) -+type radius_script_exec_t; -+init_script_file(radius_script_exec_t) ++type radius_initrc_exec_t; ++init_script_file(radius_initrc_exec_t) + - ######################################## - # - # Local policy + type radiusd_log_t; + logging_log_file(radiusd_log_t) + @@ -34,12 +37,11 @@ # gzip also needs chown access to preserve GID for radwtmp files allow radiusd_t self:capability { chown dac_override fsetid kill setgid setuid sys_resource sys_tty_config }; @@ -23065,80 +21969,56 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.fc serefpolicy-3.5.8/policy/modules/services/radvd.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.fc serefpolicy-3.5.9/policy/modules/services/radvd.fc --- nsaserefpolicy/policy/modules/services/radvd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/radvd.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -5,3 +5,4 @@ ++++ serefpolicy-3.5.9/policy/modules/services/radvd.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,5 +1,5 @@ +- + /etc/radvd\.conf -- gen_context(system_u:object_r:radvd_etc_t,s0) ++/etc/rc\.d/init\.d/radvd -- gen_context(system_u:object_r:radvd_initrc_exec_t,s0) - /var/run/radvd\.pid -- gen_context(system_u:object_r:radvd_var_run_t,s0) - /var/run/radvd(/.*)? gen_context(system_u:object_r:radvd_var_run_t,s0) -+/etc/rc\.d/init\.d/radvd -- gen_context(system_u:object_r:radvd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.if serefpolicy-3.5.8/policy/modules/services/radvd.if ---- nsaserefpolicy/policy/modules/services/radvd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/radvd.if 2008-09-17 08:49:09.000000000 -0400 -@@ -2,6 +2,25 @@ + /usr/sbin/radvd -- gen_context(system_u:object_r:radvd_exec_t,s0) - ######################################## - ## -+## Execute radvd server in the radvd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`radvd_script_domtrans',` -+ gen_require(` -+ type radvd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, radvd_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an radvd environment - ## -@@ -16,14 +35,21 @@ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.if serefpolicy-3.5.9/policy/modules/services/radvd.if +--- nsaserefpolicy/policy/modules/services/radvd.if 2008-08-07 11:15:11.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/radvd.if 2008-09-25 08:33:18.000000000 -0400 +@@ -16,14 +16,20 @@ gen_require(` type radvd_t, radvd_etc_t; type radvd_var_run_t; -+ type radvd_script_exec_t; ++ type radvd_initrc_exec_t; ') - allow $1 radvd_t:process { ptrace signal_perms getattr }; +- allow $1 radvd_t:process { ptrace signal_perms getattr }; ++ allow $1 radvd_t:process { ptrace signal_perms }; ps_process_pattern($1, radvd_t) -+ # Allow radvd_t to restart the apache service -+ radvd_script_domtrans($1) ++ init_labeled_script_domtrans($1, radvd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 radvd_script_exec_t system_r; ++ role_transition $2 radvd_initrc_exec_t system_r; + allow $2 system_r; + files_list_etc($1) - manage_files_pattern($1, radvd_etc_t, radvd_etc_t) -+ admin_pattern($1, radvd_etc_t) ++ admin_pattern($1, radvd_etc_t) files_list_pids($1) - manage_files_pattern($1, radvd_var_run_t, radvd_var_run_t) -+ admin_pattern($1, radvd_var_run_t) ++ admin_pattern($1, radvd_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.5.8/policy/modules/services/radvd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.5.9/policy/modules/services/radvd.te --- nsaserefpolicy/policy/modules/services/radvd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/radvd.te 2008-09-17 08:49:09.000000000 -0400 -@@ -15,6 +15,9 @@ - type radvd_etc_t; - files_config_file(radvd_etc_t) ++++ serefpolicy-3.5.9/policy/modules/services/radvd.te 2008-09-25 08:33:18.000000000 -0400 +@@ -9,6 +9,9 @@ + type radvd_exec_t; + init_daemon_domain(radvd_t, radvd_exec_t) -+type radvd_script_exec_t; -+init_script_file(radvd_script_exec_t) ++type radvd_initrc_exec_t; ++init_script_file(radvd_initrc_exec_t) + - ######################################## - # - # Local policy + type radvd_var_run_t; + files_pid_file(radvd_var_run_t) + @@ -27,6 +30,7 @@ allow radvd_t self:rawip_socket create_socket_perms; allow radvd_t self:tcp_socket create_stream_socket_perms; @@ -23147,18 +22027,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow radvd_t radvd_etc_t:file read_file_perms; -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.5.8/policy/modules/services/razor.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.5.9/policy/modules/services/razor.fc --- nsaserefpolicy/policy/modules/services/razor.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/razor.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/razor.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,4 +1,4 @@ -HOME_DIR/\.razor(/.*)? gen_context(system_u:object_r:ROLE_razor_home_t,s0) +HOME_DIR/\.razor(/.*)? gen_context(system_u:object_r:razor_home_t,s0) /etc/razor(/.*)? gen_context(system_u:object_r:razor_etc_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.5.8/policy/modules/services/razor.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.5.9/policy/modules/services/razor.if --- nsaserefpolicy/policy/modules/services/razor.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/razor.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/razor.if 2008-09-25 08:33:18.000000000 -0400 @@ -137,6 +137,7 @@ template(`razor_per_role_template',` gen_require(` @@ -23278,9 +22158,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/services/razor.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.5.9/policy/modules/services/razor.te --- nsaserefpolicy/policy/modules/services/razor.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/razor.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/razor.te 2008-09-25 08:33:18.000000000 -0400 @@ -6,21 +6,51 @@ # Declarations # @@ -23336,9 +22216,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol razor_common_domain_template(razor) ######################################## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.5.8/policy/modules/services/ricci.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.5.9/policy/modules/services/ricci.te --- nsaserefpolicy/policy/modules/services/ricci.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ricci.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/ricci.te 2008-09-25 08:33:18.000000000 -0400 @@ -133,6 +133,8 @@ dev_read_urand(ricci_t) @@ -23401,9 +22281,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol #Needed for editing /etc/fstab files_manage_etc_files(ricci_modstorage_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.5.8/policy/modules/services/rlogin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.5.9/policy/modules/services/rlogin.te --- nsaserefpolicy/policy/modules/services/rlogin.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rlogin.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rlogin.te 2008-09-25 08:33:18.000000000 -0400 @@ -94,8 +94,8 @@ remotelogin_signal(rlogind_t) @@ -23415,42 +22295,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.fc serefpolicy-3.5.8/policy/modules/services/roundup.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.fc serefpolicy-3.5.9/policy/modules/services/roundup.fc --- nsaserefpolicy/policy/modules/services/roundup.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/roundup.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -7,3 +7,5 @@ - # /var - # - /var/lib/roundup(/.*)? -- gen_context(system_u:object_r:roundup_var_lib_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/roundup.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,5 @@ ++/etc/rc\.d/init\.d/roundup -- gen_context(system_u:object_r:roundup_initrc_exec_t,s0) + -+/etc/rc\.d/init\.d/roundup -- gen_context(system_u:object_r:roundup_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.if serefpolicy-3.5.8/policy/modules/services/roundup.if + # + # /usr + # +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.if serefpolicy-3.5.9/policy/modules/services/roundup.if --- nsaserefpolicy/policy/modules/services/roundup.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/roundup.if 2008-09-17 08:49:09.000000000 -0400 -@@ -1 +1,66 @@ ++++ serefpolicy-3.5.9/policy/modules/services/roundup.if 2008-09-25 08:33:18.000000000 -0400 +@@ -1 +1,39 @@ ## Roundup Issue Tracking System policy + +######################################## +## -+## Execute roundup server in the roundup domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`roundup_script_domtrans',` -+ gen_require(` -+ type roundup_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, roundup_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an roundup environment +## @@ -23464,52 +22325,44 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the roundup domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`roundup_admin',` + gen_require(` -+ type roundup_t; -+ type roundup_script_exec_t; -+ type roundup_var_lib_t; -+ type roundup_var_run_t; ++ type roundup_t, roundup_var_lib_t, roundup_var_run_t; ++ type roundup_initrc_exec_t; + ') + -+ allow $1 roundup_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, roundup_t, roundup_t) ++ allow $1 roundup_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, roundup_t) + -+ # Allow roundup_t to restart the apache service -+ roundup_script_domtrans($1) ++ init_labeled_script_domtrans($1, roundup_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 roundup_script_exec_t system_r; ++ role_transition $2 roundup_initrc_exec_t system_r; + allow $2 system_r; + + files_list_var_lib($1) -+ admin_pattern($1, roundup_var_lib_t) ++ admin_pattern($1, roundup_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, roundup_var_run_t) ++ admin_pattern($1, roundup_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.te serefpolicy-3.5.8/policy/modules/services/roundup.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.te serefpolicy-3.5.9/policy/modules/services/roundup.te --- nsaserefpolicy/policy/modules/services/roundup.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/roundup.te 2008-09-17 08:49:09.000000000 -0400 -@@ -16,6 +16,9 @@ - type roundup_var_lib_t; - files_type(roundup_var_lib_t) ++++ serefpolicy-3.5.9/policy/modules/services/roundup.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type roundup_exec_t; + init_daemon_domain(roundup_t, roundup_exec_t) -+type roundup_script_exec_t; -+init_script_file(roundup_script_exec_t) ++type roundup_initrc_exec_t; ++init_script_file(roundup_initrc_exec_t) + - ######################################## - # - # Local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.5.8/policy/modules/services/rpc.if + type roundup_var_run_t; + files_pid_file(roundup_var_run_t) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.5.9/policy/modules/services/rpc.if --- nsaserefpolicy/policy/modules/services/rpc.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rpc.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rpc.if 2008-09-25 08:33:18.000000000 -0400 @@ -88,8 +88,11 @@ # bind to arbitary unused ports corenet_tcp_bind_generic_port($1_t) @@ -23548,9 +22401,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Read NFS exported content. ## ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.8/policy/modules/services/rpc.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.9/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2008-08-14 13:08:27.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rpc.te 2008-09-18 16:55:00.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rpc.te 2008-09-25 08:33:18.000000000 -0400 @@ -23,7 +23,7 @@ gen_tunable(allow_nfsd_anon_write, false) @@ -23609,121 +22462,30 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.8/policy/modules/services/rpcbind.fc ---- nsaserefpolicy/policy/modules/services/rpcbind.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rpcbind.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -5,3 +5,5 @@ - /var/run/rpc.statd\.pid -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) - /var/run/rpcbind\.lock -- gen_context(system_u:object_r:rpcbind_var_run_t,s0) - /var/run/rpcbind\.sock -s gen_context(system_u:object_r:rpcbind_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/rpcbind -- gen_context(system_u:object_r:rpcbind_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.5.8/policy/modules/services/rpcbind.if ---- nsaserefpolicy/policy/modules/services/rpcbind.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rpcbind.if 2008-09-17 08:49:09.000000000 -0400 -@@ -95,3 +95,65 @@ - manage_files_pattern($1, rpcbind_var_lib_t, rpcbind_var_lib_t) - files_search_var_lib($1) - ') -+ -+######################################## -+## -+## Execute rpcbind server in the rpcbind domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`rpcbind_script_domtrans',` -+ gen_require(` -+ type rpcbind_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, rpcbind_script_exec_t) -+') -+ -+######################################## -+## -+## All of the rules required to administrate -+## an rpcbind environment -+## -+## -+## -+## Domain allowed access. -+## -+## -+## -+## -+## The role to be allowed to manage the rpcbind domain. -+## -+## -+## -+## -+## The type of the user terminal. -+## -+## -+## -+# -+interface(`rpcbind_admin',` -+ gen_require(` -+ type rpcbind_t, rpcbind_var_lib_t, rpcbind_var_run_t; -+ type rpcbind_script_exec_t; -+ ') -+ -+ allow $1 rpcbind_t:process { ptrace signal_perms}; -+ ps_process_pattern($1, rpcbind_t) -+ -+ rpcbind_script_domtrans($1) -+ domain_system_change_exemption($1) -+ role_transition $2 rpcbind_script_exec_t system_r; -+ allow $2 system_r; -+ -+ files_list_var_lib($1) -+ admin_pattern($1, rpcbind_var_lib_t) -+ -+ files_list_pids($1) -+ admin_pattern($1, rpcbind_var_run_t) -+') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.8/policy/modules/services/rpcbind.te ---- nsaserefpolicy/policy/modules/services/rpcbind.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rpcbind.te 2008-09-17 08:49:09.000000000 -0400 -@@ -16,16 +16,21 @@ - type rpcbind_var_lib_t; - files_type(rpcbind_var_lib_t) - -+type rpcbind_script_exec_t; -+init_script_file(rpcbind_script_exec_t) -+ - ######################################## - # - # rpcbind local policy - # - --allow rpcbind_t self:capability setuid; -+allow rpcbind_t self:capability { dac_override setgid setuid sys_tty_config }; - allow rpcbind_t self:fifo_file rw_file_perms; - allow rpcbind_t self:unix_stream_socket create_stream_socket_perms; - allow rpcbind_t self:netlink_route_socket r_netlink_socket_perms; - allow rpcbind_t self:udp_socket create_socket_perms; -+# BROKEN ... -+dontaudit rpcbind_t self:udp_socket listen; - allow rpcbind_t self:tcp_socket create_stream_socket_perms; - - manage_files_pattern(rpcbind_t, rpcbind_var_run_t, rpcbind_var_run_t) -@@ -37,6 +42,7 @@ - manage_sock_files_pattern(rpcbind_t, rpcbind_var_lib_t, rpcbind_var_lib_t) - files_var_lib_filetrans(rpcbind_t, rpcbind_var_lib_t, { file dir sock_file }) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.9/policy/modules/services/rpcbind.fc +--- nsaserefpolicy/policy/modules/services/rpcbind.fc 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rpcbind.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,4 +1,4 @@ +-/etc/rc.d/init.d/rpcbind -- gen_context(system_u:object_r:rpcbind_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/rpcbind -- gen_context(system_u:object_r:rpcbind_initrc_exec_t,s0) -+kernel_read_system_state(rpcbind_t) - kernel_read_network_state(rpcbind_t) + /sbin/rpcbind -- gen_context(system_u:object_r:rpcbind_exec_t,s0) - corenet_all_recvfrom_unlabeled(rpcbind_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.5.8/policy/modules/services/rshd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.5.9/policy/modules/services/rpcbind.if +--- nsaserefpolicy/policy/modules/services/rpcbind.if 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rpcbind.if 2008-09-25 08:33:18.000000000 -0400 +@@ -122,7 +122,7 @@ + allow $1 rpcbind_t:process { ptrace signal_perms }; + ps_process_pattern($1, rpcbind_t) + +- init_labeled_script_somtrans($1, rbcbind_initrc_exec_t) ++ init_labeled_script_domtrans($1, rpcbind_initrc_exec_t) + domain_system_change_exemption($1) + role_transition $2 rpcbind_initrc_exec_t system_r; + allow $2 system_r; +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.5.9/policy/modules/services/rshd.te --- nsaserefpolicy/policy/modules/services/rshd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rshd.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rshd.te 2008-09-25 08:33:18.000000000 -0400 @@ -16,7 +16,7 @@ # # Local policy @@ -23785,9 +22547,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol unconfined_shell_domtrans(rshd_t) + unconfined_signal(rshd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.5.8/policy/modules/services/rsync.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.5.9/policy/modules/services/rsync.te --- nsaserefpolicy/policy/modules/services/rsync.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rsync.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rsync.te 2008-09-25 08:33:18.000000000 -0400 @@ -45,7 +45,7 @@ # Local policy # @@ -23797,85 +22559,69 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow rsync_t self:process signal_perms; allow rsync_t self:fifo_file rw_fifo_file_perms; allow rsync_t self:tcp_socket create_stream_socket_perms; -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.fc serefpolicy-3.5.8/policy/modules/services/rwho.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.fc serefpolicy-3.5.9/policy/modules/services/rwho.fc --- nsaserefpolicy/policy/modules/services/rwho.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rwho.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -3,3 +3,5 @@ - /var/spool/rwho(/.*)? gen_context(system_u:object_r:rwho_spool_t,s0) - - /var/log/rwhod(/.*)? gen_context(system_u:object_r:rwho_log_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/rwho.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,5 @@ ++/etc/rc\.d/init\.d/rwhod -- gen_context(system_u:object_r:rwho_initrc_exec_t,s0) + -+/etc/rc\.d/init\.d/rwhod -- gen_context(system_u:object_r:rwho_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.5.8/policy/modules/services/rwho.if ---- nsaserefpolicy/policy/modules/services/rwho.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rwho.if 2008-09-17 08:49:09.000000000 -0400 -@@ -118,6 +118,25 @@ + /usr/sbin/rwhod -- gen_context(system_u:object_r:rwho_exec_t,s0) - ######################################## - ## -+## Execute rwho server in the rwho domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`rwho_script_domtrans',` -+ gen_require(` -+ type rwho_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, rwho_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an rwho environment - ## -@@ -131,14 +150,21 @@ + /var/spool/rwho(/.*)? gen_context(system_u:object_r:rwho_spool_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.5.9/policy/modules/services/rwho.if +--- nsaserefpolicy/policy/modules/services/rwho.if 2008-08-07 11:15:11.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/rwho.if 2008-09-25 08:33:18.000000000 -0400 +@@ -131,14 +131,20 @@ interface(`rwho_admin',` gen_require(` type rwho_t, rwho_log_t, rwho_spool_t; -+ type rwho_script_exec_t; ++ type rwho_initrc_exec_t; ') - allow $1 rwho_t:process { ptrace signal_perms getattr }; +- allow $1 rwho_t:process { ptrace signal_perms getattr }; ++ allow $1 rwho_t:process { ptrace signal_perms }; ps_process_pattern($1, rwho_t) -+ # Allow rwho_t to restart the apache service -+ rwho_script_domtrans($1) ++ init_labeled_script_domtrans($1, rwho_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 rwho_script_exec_t system_r; ++ role_transition $2 rwho_initrc_exec_t system_r; + allow $2 system_r; + logging_list_logs($1) - manage_files_pattern($1, rwho_log_t, rwho_log_t) -+ admin_pattern($1, rwho_log_t) ++ admin_pattern($1, rwho_log_t) files_list_spool($1) - manage_files_pattern($1, rwho_spool_t, rwho_spool_t) + admin_pattern($1, rwho_spool_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-3.5.8/policy/modules/services/rwho.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-3.5.9/policy/modules/services/rwho.te --- nsaserefpolicy/policy/modules/services/rwho.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/rwho.te 2008-09-17 08:49:09.000000000 -0400 -@@ -16,6 +16,9 @@ - type rwho_spool_t; - files_type(rwho_spool_t) ++++ serefpolicy-3.5.9/policy/modules/services/rwho.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type rwho_exec_t; + init_daemon_domain(rwho_t, rwho_exec_t) -+type rwho_script_exec_t; -+init_script_file(rwho_script_exec_t) ++type rwho_initrc_exec_t; ++init_script_file(rwho_initrc_exec_t) + - ######################################## - # - # rwho local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.5.8/policy/modules/services/samba.fc + type rwho_log_t; + files_type(rwho_log_t) + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.5.9/policy/modules/services/samba.fc --- nsaserefpolicy/policy/modules/services/samba.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/samba.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -15,6 +15,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/samba.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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) @@ -23883,21 +22629,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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 +48,11 @@ +@@ -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) + -+/etc/rc\.d/init\.d/winbind -- gen_context(system_u:object_r:samba_script_exec_t,s0) -+/etc/rc\.d/init\.d/nmb -- gen_context(system_u:object_r:samba_script_exec_t,s0) -+/etc/rc\.d/init\.d/smb -- gen_context(system_u:object_r:samba_script_exec_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.5.8/policy/modules/services/samba.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.5.9/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/samba.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/samba.if 2008-09-25 08:33:18.000000000 -0400 @@ -33,12 +33,12 @@ ') @@ -24050,7 +22792,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -503,3 +594,214 @@ +@@ -503,3 +594,190 @@ stream_connect_pattern($1, winbind_tmp_t, winbind_tmp_t, winbind_t) ') ') @@ -24157,25 +22899,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute samba server in the samba domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`samba_script_domtrans',` -+ gen_require(` -+ type samba_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, samba_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an samba environment +## @@ -24189,18 +22912,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the samba domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`samba_admin',` + gen_require(` + type nmbd_t, nmbd_var_run_t; + type smbd_t, smbd_tmp_t; -+ type smbd_script_exec_t; ++ type smbd_initrc_exec_t; + type smbd_spool_t, smbd_var_run_t; + + type samba_log_t, samba_var_t; @@ -24213,13 +22931,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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 getattr }; -+ read_files_pattern($1, smbd_t, smbd_t) ++ allow $1 smbd_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, smbd_t) + -+ allow $1 nmbd_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, nmbd_t, nmbd_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) @@ -24229,45 +22948,44 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + samba_run_smbmount($1, $2, $3) + samba_run_net($1, $2, $3) + -+ # Allow smbd_t to restart the apache service -+ samba_script_domtrans($1) ++ init_labeled_script_domtrans($1, samba_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 smbd_script_exec_t system_r; ++ 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, smbd_tmp_t) ++ admin_pattern($1, swat_tmp_t) ++ admin_pattern($1, winbind_tmp_t) + -+ admin_pattern($1, samba_secrets_t) ++ admin_pattern($1, samba_secrets_t) + + files_list_etc($1) -+ admin_pattern($1, samba_etc_t) ++ admin_pattern($1, samba_etc_t) + -+ admin_pattern($1, samba_share_t) ++ admin_pattern($1, samba_share_t) + + logging_list_logs($1) -+ admin_pattern($1, samba_log_t) -+ admin_pattern($1, winbind_log_t) ++ 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) ++ 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) ++ 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.5.8/policy/modules/services/samba.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.5.9/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/samba.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/samba.te 2008-09-25 08:33:18.000000000 -0400 @@ -66,6 +66,13 @@ ## gen_tunable(samba_share_nfs, false) @@ -24282,7 +23000,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type nmbd_t; type nmbd_exec_t; init_daemon_domain(nmbd_t, nmbd_exec_t) -@@ -80,11 +87,9 @@ +@@ -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; @@ -24296,7 +23024,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type samba_net_tmp_t; files_tmp_file(samba_net_tmp_t) -@@ -146,6 +151,14 @@ +@@ -146,6 +154,11 @@ type winbind_var_run_t; files_pid_file(winbind_var_run_t) @@ -24305,9 +23033,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +application_domain(smbcontrol_t, smbcontrol_exec_t) +role system_r types smbcontrol_t; + -+type samba_script_exec_t; -+init_script_file(samba_script_exec_t) -+ ######################################## # # Samba net local policy @@ -24620,81 +23345,53 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.fc serefpolicy-3.5.8/policy/modules/services/sasl.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.fc serefpolicy-3.5.9/policy/modules/services/sasl.fc --- nsaserefpolicy/policy/modules/services/sasl.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/sasl.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -8,3 +8,5 @@ - # /var ++++ serefpolicy-3.5.9/policy/modules/services/sasl.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/sasl -- gen_context(system_u:object_r:sasl_initrc_exec_t,s0) + # - /var/run/saslauthd(/.*)? gen_context(system_u:object_r:saslauthd_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/sasl -- gen_context(system_u:object_r:sasl_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.if serefpolicy-3.5.8/policy/modules/services/sasl.if + # /usr +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.if serefpolicy-3.5.9/policy/modules/services/sasl.if --- nsaserefpolicy/policy/modules/services/sasl.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/sasl.if 2008-09-17 08:49:09.000000000 -0400 -@@ -21,6 +21,25 @@ - - ######################################## - ## -+## Execute sasl server in the sasl domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`sasl_script_domtrans',` -+ gen_require(` -+ type saslauthd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, saslauthd_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an sasl environment - ## -@@ -34,14 +53,21 @@ ++++ serefpolicy-3.5.9/policy/modules/services/sasl.if 2008-09-25 08:33:18.000000000 -0400 +@@ -34,14 +34,20 @@ interface(`sasl_admin',` gen_require(` type saslauthd_t, saslauthd_tmp_t, saslauthd_var_run_t; -+ type saslauthd_script_exec_t; ++ type saslauthd_initrc_exec_t; ') allow $1 saslauthd_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, saslauthd_t) -+ # Allow saslauthd_t to restart the apache service -+ saslauthd_script_domtrans($1) ++ init_labeled_script_domtrans($1, saslauthd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 saslauthd_script_exec_t system_r; ++ role_transition $2 saslauthd_initrc_exec_t system_r; + allow $2 system_r; + files_list_tmp($1) - manage_files_pattern($1, saslauthd_tmp_t, saslauthd_tmp_t) -+ admin_pattern($1, saslauthd_tmp_t) ++ admin_pattern($1, saslauthd_tmp_t) files_list_pids($1) - manage_files_pattern($1, saslauthd_var_run_t, saslauthd_var_run_t) -+ admin_pattern($1, saslauthd_var_run_t) ++ admin_pattern($1, saslauthd_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.5.8/policy/modules/services/sasl.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.5.9/policy/modules/services/sasl.te --- nsaserefpolicy/policy/modules/services/sasl.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/sasl.te 2008-09-17 08:49:09.000000000 -0400 -@@ -23,6 +23,9 @@ - type saslauthd_var_run_t; - files_pid_file(saslauthd_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/sasl.te 2008-09-25 08:33:18.000000000 -0400 +@@ -17,6 +17,9 @@ + type saslauthd_exec_t; + init_daemon_domain(saslauthd_t, saslauthd_exec_t) -+type sasl_script_exec_t; -+init_script_file(sasl_script_exec_t) ++type sasl_initrc_exec_t; ++init_script_file(sasl_initrc_exec_t) + - ######################################## - # - # Local policy + type saslauthd_tmp_t; + files_tmp_file(saslauthd_tmp_t) + @@ -99,7 +102,7 @@ ') @@ -24715,9 +23412,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/services/sendmail.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.5.9/policy/modules/services/sendmail.if --- nsaserefpolicy/policy/modules/services/sendmail.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/sendmail.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/sendmail.if 2008-09-25 08:33:18.000000000 -0400 @@ -149,3 +149,104 @@ logging_log_filetrans($1, sendmail_log_t, file) @@ -24823,9 +23520,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.5.8/policy/modules/services/sendmail.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.9/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/sendmail.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/sendmail.te 2008-09-25 08:33:18.000000000 -0400 @@ -20,13 +20,17 @@ mta_mailserver_delivery(sendmail_t) mta_mailserver_sender(sendmail_t) @@ -24985,18 +23682,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -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.5.8/policy/modules/services/setroubleshoot.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-3.5.9/policy/modules/services/setroubleshoot.fc --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -5,3 +5,5 @@ - /var/log/setroubleshoot(/.*)? gen_context(system_u:object_r:setroubleshoot_var_log_t,s0) - - /var/lib/setroubleshoot(/.*)? gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/setroubleshoot.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,5 @@ ++/etc/rc\.d/init\.d/setroubleshoot -- gen_context(system_u:object_r:setroubleshoot_initrc_exec_t,s0) + -+/etc/rc\.d/init\.d/setroubleshoot -- gen_context(system_u:object_r:setroubleshoot_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.5.8/policy/modules/services/setroubleshoot.if + /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.5.9/policy/modules/services/setroubleshoot.if --- nsaserefpolicy/policy/modules/services/setroubleshoot.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/setroubleshoot.if 2008-09-25 13:03:27.000000000 -0400 @@ -16,8 +16,8 @@ ') @@ -25008,7 +23705,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -36,6 +36,75 @@ +@@ -36,6 +36,48 @@ type setroubleshootd_t, setroubleshoot_var_run_t; ') @@ -25019,25 +23716,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute setroubleshoot server in the setroubleshoot domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`setroubleshoot_script_domtrans',` -+ gen_require(` -+ type setroubleshoot_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, setroubleshoot_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an setroubleshoot environment +## @@ -25051,52 +23729,46 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the setroubleshoot domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`setroubleshoot_admin',` + gen_require(` -+ type setroubleshootd_t; -+ type setroubleshoot_script_exec_t; -+ type setroubleshoot_log_t; -+ type setroubleshoot_var_lib_t; -+ type setroubleshoot_var_run_t; ++ 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 getattr }; -+ read_files_pattern($1, setroubleshootd_t, setroubleshootd_t) -+ -+ # Allow setroubleshootd_t to restart the apache service -+ setroubleshoot_script_domtrans($1) ++ 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_script_exec_t system_r; ++ role_transition $2 setroubleshoot_initrc_exec_t system_r; + allow $2 system_r; + + logging_list_logs($1) -+ admin_pattern($1, setroubleshoot_log_t) ++ admin_pattern($1, setroubleshoot_log_t) + + files_list_var_lib($1) -+ admin_pattern($1, setroubleshoot_var_lib_t) ++ admin_pattern($1, setroubleshoot_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, setroubleshoot_var_run_t) ++ 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.5.8/policy/modules/services/setroubleshoot.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.5.9/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2008-08-25 09:12:31.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/setroubleshoot.te 2008-09-17 08:49:09.000000000 -0400 -@@ -22,13 +22,16 @@ - type setroubleshoot_var_run_t; - files_pid_file(setroubleshoot_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/setroubleshoot.te 2008-09-25 08:33:18.000000000 -0400 +@@ -11,6 +11,9 @@ + domain_type(setroubleshootd_t) + init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t) -+type setroubleshoot_script_exec_t; -+init_script_file(setroubleshoot_script_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 # @@ -25170,82 +23842,55 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.fc serefpolicy-3.5.8/policy/modules/services/smartmon.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.fc serefpolicy-3.5.9/policy/modules/services/smartmon.fc --- nsaserefpolicy/policy/modules/services/smartmon.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/smartmon.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -8,3 +8,4 @@ ++++ serefpolicy-3.5.9/policy/modules/services/smartmon.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,5 @@ ++/etc/rc\.d/init\.d/smartd -- gen_context(system_u:object_r:fsdaemon_initrc_exec_t,s0) ++ # - /var/run/smartd\.pid -- gen_context(system_u:object_r:fsdaemon_var_run_t,s0) - -+/etc/rc\.d/init\.d/smartd -- gen_context(system_u:object_r:fsdaemon_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.if serefpolicy-3.5.8/policy/modules/services/smartmon.if + # /usr + # +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.if serefpolicy-3.5.9/policy/modules/services/smartmon.if --- nsaserefpolicy/policy/modules/services/smartmon.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/smartmon.if 2008-09-17 08:49:09.000000000 -0400 -@@ -20,6 +20,25 @@ - - ######################################## - ## -+## Execute smartmon server in the smartmon domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`smartmon_script_domtrans',` -+ gen_require(` -+ type fsdaemon_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, fsdaemon_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an smartmon environment - ## -@@ -33,14 +52,21 @@ ++++ serefpolicy-3.5.9/policy/modules/services/smartmon.if 2008-09-25 08:33:18.000000000 -0400 +@@ -33,14 +33,20 @@ interface(`smartmon_admin',` gen_require(` type fsdaemon_t, fsdaemon_tmp_t, fsdaemon_var_run_t; -+ type fsdaemon_script_exec_t; ++ type fsdaemon_initrc_exec_t; ') allow $1 fsdaemon_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, fsdaemon_t) -+ # Allow fsdaemon_t to restart the apache service -+ fsdaemon_script_domtrans($1) ++ init_labeled_script_domtrans($1, fsdaemon_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 fsdaemon_script_exec_t system_r; ++ role_transition $2 fsdaemon_initrc_exec_t system_r; + allow $2 system_r; + files_list_tmp($1) - manage_files_pattern($1, fsdaemon_tmp_t, fsdaemon_tmp_t) -+ admin_pattern($1, fsdaemon_tmp_t) ++ admin_pattern($1, fsdaemon_tmp_t) files_list_pids($1) - manage_files_pattern($1, fsdaemon_var_run_t, fsdaemon_var_run_t) -+ admin_pattern($1, fsdaemon_var_run_t) ++ admin_pattern($1, fsdaemon_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.5.8/policy/modules/services/smartmon.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.5.9/policy/modules/services/smartmon.te --- nsaserefpolicy/policy/modules/services/smartmon.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/smartmon.te 2008-09-17 08:49:09.000000000 -0400 -@@ -16,6 +16,10 @@ - type fsdaemon_tmp_t; - files_tmp_file(fsdaemon_tmp_t) ++++ serefpolicy-3.5.9/policy/modules/services/smartmon.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type fsdaemon_exec_t; + init_daemon_domain(fsdaemon_t, fsdaemon_exec_t) -+type fsdaemon_script_exec_t; -+init_script_file(fsdaemon_script_exec_t) -+typealias fsdaemon_script_exec_t alias smartmon_script_exec_t; ++type fsdaemon_initrc_exec_t; ++init_script_file(fsdaemon_initrc_exec_t) + - ######################################## - # - # Local policy -@@ -28,6 +32,7 @@ + type fsdaemon_var_run_t; + files_pid_file(fsdaemon_var_run_t) + +@@ -28,6 +31,7 @@ allow fsdaemon_t self:unix_dgram_socket create_socket_perms; allow fsdaemon_t self:unix_stream_socket create_stream_socket_perms; allow fsdaemon_t self:udp_socket create_socket_perms; @@ -25253,7 +23898,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol manage_dirs_pattern(fsdaemon_t, fsdaemon_tmp_t, fsdaemon_tmp_t) manage_files_pattern(fsdaemon_t, fsdaemon_tmp_t, fsdaemon_tmp_t) -@@ -62,6 +67,7 @@ +@@ -62,6 +66,7 @@ fs_search_auto_mountpoints(fsdaemon_t) mls_file_read_all_levels(fsdaemon_t) @@ -25261,7 +23906,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol storage_raw_read_fixed_disk(fsdaemon_t) storage_raw_write_fixed_disk(fsdaemon_t) -@@ -78,10 +84,9 @@ +@@ -78,10 +83,9 @@ miscfiles_read_localization(fsdaemon_t) @@ -25273,10 +23918,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol sysadm_dontaudit_search_home_dirs(fsdaemon_t) optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.5.8/policy/modules/services/snmp.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.5.9/policy/modules/services/snmp.fc --- nsaserefpolicy/policy/modules/services/snmp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/snmp.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -8,6 +8,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/snmp.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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 # @@ -25284,43 +23936,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) -@@ -17,3 +18,6 @@ - - /var/run/snmpd -d gen_context(system_u:object_r:snmpd_var_run_t,s0) - /var/run/snmpd\.pid -- gen_context(system_u:object_r:snmpd_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/snmpd -- gen_context(system_u:object_r:snmp_script_exec_t,s0) -+/etc/rc\.d/init\.d/snmptrapd -- gen_context(system_u:object_r:snmp_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.5.8/policy/modules/services/snmp.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.5.9/policy/modules/services/snmp.if --- nsaserefpolicy/policy/modules/services/snmp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/snmp.if 2008-09-17 08:49:09.000000000 -0400 -@@ -87,6 +87,25 @@ - - ######################################## - ## -+## Execute snmp server in the snmp domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`snmp_script_domtrans',` -+ gen_require(` -+ type snmpd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, snmpd_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an snmp environment - ## -@@ -95,23 +114,40 @@ ++++ serefpolicy-3.5.9/policy/modules/services/snmp.if 2008-09-25 08:33:18.000000000 -0400 +@@ -95,23 +95,34 @@ ## Domain allowed access. ## ## @@ -25329,52 +23948,49 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the snmp domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## ## # interface(`snmp_admin',` gen_require(` type snmpd_t, snmpd_log_t; type snmpd_var_lib_t, snmpd_var_run_t; -+ type snmpd_script_exec_t; ++ type snmpd_initrc_exec_t; ') allow $1 snmpd_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, snmpd_t) -+ # Allow snmpd_t to restart the apache service -+ snmp_script_domtrans($1) ++ init_labeled_script_domtrans($1, snmpd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 snmpd_script_exec_t system_r; ++ 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) ++ 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) ++ 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) ++ 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.5.8/policy/modules/services/snmp.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.5.9/policy/modules/services/snmp.te --- nsaserefpolicy/policy/modules/services/snmp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/snmp.te 2008-09-17 08:49:09.000000000 -0400 -@@ -18,12 +18,16 @@ - type snmpd_var_lib_t; - files_type(snmpd_var_lib_t) ++++ serefpolicy-3.5.9/policy/modules/services/snmp.te 2008-09-25 08:33:18.000000000 -0400 +@@ -9,6 +9,9 @@ + type snmpd_exec_t; + init_daemon_domain(snmpd_t, snmpd_exec_t) -+type snmp_script_exec_t; -+init_script_file(snmp_script_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 # @@ -25428,10 +24044,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.fc serefpolicy-3.5.8/policy/modules/services/snort.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.fc serefpolicy-3.5.9/policy/modules/services/snort.fc --- nsaserefpolicy/policy/modules/services/snort.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/snort.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -2,5 +2,10 @@ ++++ serefpolicy-3.5.9/policy/modules/services/snort.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,6 +1,9 @@ +- ++/etc/rc\.d/init\.d/snortd -- gen_context(system_u:object_r:snort_initrc_exec_t,s0) /etc/snort(/.*)? gen_context(system_u:object_r:snort_etc_t,s0) /usr/s?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) @@ -25440,12 +24058,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /var/log/snort(/.*)? gen_context(system_u:object_r:snort_log_t,s0) + +/var/run/snort.* -- gen_context(system_u:object_r:snort_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/snortd -- gen_context(system_u:object_r:snort_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.if serefpolicy-3.5.8/policy/modules/services/snort.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.if serefpolicy-3.5.9/policy/modules/services/snort.if --- nsaserefpolicy/policy/modules/services/snort.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/snort.if 2008-09-17 08:49:09.000000000 -0400 -@@ -1 +1,91 @@ ++++ serefpolicy-3.5.9/policy/modules/services/snort.if 2008-09-25 08:33:18.000000000 -0400 +@@ -1 +1,55 @@ ## Snort network intrusion detection system + +######################################## @@ -25468,24 +24084,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## Execute snort IDS in the snort domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`snort_script_domtrans',` -+ gen_require(` -+ type snort_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, snort_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an snort environment +## @@ -25499,53 +24097,35 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the syslog domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`snort_admin',` + gen_require(` + type snort_t, snort_var_run_t, snort_log_t; -+ type snort_script_exec_t; ++ type snort_initrc_exec_t; + ') + + allow $1 snort_t:process { ptrace signal_perms }; + ps_process_pattern($1, snort_t) + ++ init_labeled_script_domtrans($1, snort_initrc_exec_t) ++ domain_system_change_exemption($1) ++ role_transition $2 snort_initrc_exec_t system_r; ++ allow $2 system_r; ++ + admin_pattern($1, snort_etc_t) + admin_pattern($1, snort_var_run_t) + admin_pattern($1, snort_log_t) +') -+ -+######################################## -+## -+## Signal the snort domain. -+## -+## -+## -+## Domain allowed to transition. -+## -+## -+# -+interface(`snort_signal',` -+ gen_require(` -+ type snort_t; -+ ') -+ -+ allow $1 snort_t:process signal; -+') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.5.8/policy/modules/services/snort.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.5.9/policy/modules/services/snort.te --- nsaserefpolicy/policy/modules/services/snort.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/snort.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/snort.te 2008-09-25 08:33:18.000000000 -0400 @@ -10,8 +10,11 @@ type snort_exec_t; init_daemon_domain(snort_t, snort_exec_t) -+type snort_script_exec_t; -+init_script_file(snort_script_exec_t) ++type snort_initrc_exec_t; ++init_script_file(snort_initrc_exec_t) + type snort_etc_t; -files_type(snort_etc_t) @@ -25597,47 +24177,32 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` seutil_sigchld_newrole(snort_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.fc serefpolicy-3.5.8/policy/modules/services/soundserver.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.fc serefpolicy-3.5.9/policy/modules/services/soundserver.fc --- nsaserefpolicy/policy/modules/services/soundserver.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/soundserver.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -7,4 +7,8 @@ ++++ serefpolicy-3.5.9/policy/modules/services/soundserver.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,4 +1,5 @@ + /etc/nas(/.*)? gen_context(system_u:object_r:soundd_etc_t,s0) ++/etc/rc\.d/init\.d/nasd -- gen_context(system_u:object_r:soundd_initrc_exec_t,s0) + /etc/yiff(/.*)? gen_context(system_u:object_r:soundd_etc_t,s0) + + /usr/bin/nasd -- gen_context(system_u:object_r:soundd_exec_t,s0) +@@ -7,4 +8,6 @@ /usr/sbin/yiff -- gen_context(system_u:object_r:soundd_exec_t,s0) /var/run/yiff-[0-9]+\.pid -- gen_context(system_u:object_r:soundd_var_run_t,s0) +/var/run/nasd(/.*)? gen_context(system_u:object_r:soundd_var_run_t,s0) + /var/state/yiff(/.*)? gen_context(system_u:object_r:soundd_state_t,s0) -+ -+/etc/rc\.d/init\.d/nasd -- gen_context(system_u:object_r:soundd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.if serefpolicy-3.5.8/policy/modules/services/soundserver.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.if serefpolicy-3.5.9/policy/modules/services/soundserver.if --- nsaserefpolicy/policy/modules/services/soundserver.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/soundserver.if 2008-09-17 08:49:09.000000000 -0400 -@@ -13,3 +13,70 @@ ++++ serefpolicy-3.5.9/policy/modules/services/soundserver.if 2008-09-25 08:33:18.000000000 -0400 +@@ -13,3 +13,45 @@ interface(`soundserver_tcp_connect',` refpolicywarn(`$0($*) has been deprecated.') ') + +######################################## +## -+## Execute soundd server in the soundd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`soundserver_script_domtrans',` -+ gen_require(` -+ type soundd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, soundd_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an soundd environment +## @@ -25651,59 +24216,48 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the soundd domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`soundserver_admin',` + gen_require(` + type soundd_t, soundd_etc_t; + type soundd_tmp_t, soundd_var_run_t; -+ type soundd_script_exec_t; ++ type soundd_initrc_exec_t; + ') + + allow $1 soundd_t:process { ptrace signal_perms }; + ps_process_pattern($1, soundd_t) -+ -+ # Allow soundd_t to restart the apache service -+ soundserver_script_domtrans($1) ++ ++ init_labeled_script_domtrans($1, soundd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 soundd_script_exec_t system_r; ++ role_transition $2 soundd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, soundd_tmp_t) ++ admin_pattern($1, soundd_tmp_t) + + files_list_etc($1) -+ admin_pattern($1, soundd_etc_t) ++ admin_pattern($1, soundd_etc_t) + + files_list_pids($1) -+ admin_pattern($1, soundd_var_run_t) ++ admin_pattern($1, soundd_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.te serefpolicy-3.5.8/policy/modules/services/soundserver.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/soundserver.te serefpolicy-3.5.9/policy/modules/services/soundserver.te --- nsaserefpolicy/policy/modules/services/soundserver.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/soundserver.te 2008-09-17 08:49:09.000000000 -0400 -@@ -11,7 +11,7 @@ ++++ serefpolicy-3.5.9/policy/modules/services/soundserver.te 2008-09-25 08:33:18.000000000 -0400 +@@ -11,7 +11,10 @@ init_daemon_domain(soundd_t, soundd_exec_t) type soundd_etc_t alias etc_soundd_t; -files_type(soundd_etc_t) +files_config_file(soundd_etc_t) ++ ++type soundd_initrc_exec_t; ++init_script_file(soundd_initrc_exec_t) type soundd_state_t; files_type(soundd_state_t) -@@ -26,21 +26,28 @@ - type soundd_var_run_t; - files_pid_file(soundd_var_run_t) - -+type soundd_script_exec_t; -+init_script_file(soundd_script_exec_t) -+ - ######################################## - # +@@ -31,16 +34,20 @@ # Declarations # @@ -25750,12 +24304,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_sigchld_newrole(soundd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.5.8/policy/modules/services/spamassassin.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.5.9/policy/modules/services/spamassassin.fc --- nsaserefpolicy/policy/modules/services/spamassassin.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/spamassassin.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/spamassassin.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,16 +1,27 @@ -HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0) +HOME_DIR/\.spamassassin(/.*)? gen_context(system_u:object_r:spamc_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) @@ -25781,12 +24338,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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) -+ -+/etc/rc\.d/init\.d/spamd -- gen_context(system_u:object_r:spamd_script_exec_t,s0) -+/etc/rc\.d/init\.d/mimedefang.* -- gen_context(system_u:object_r:spamd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.5.8/policy/modules/services/spamassassin.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.5.9/policy/modules/services/spamassassin.if --- nsaserefpolicy/policy/modules/services/spamassassin.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/spamassassin.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/spamassassin.if 2008-09-25 08:33:18.000000000 -0400 @@ -34,10 +34,10 @@ # cjp: when tunables are available, spamc stuff should be # toggled on activation of spamc, and similarly for spamd. @@ -25913,15 +24467,29 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - # Allow connection to spamd socket above - evolution_stream_connect($1, $1_spamc_t) - ') -- ++ typealias spamc_t alias $1_spamc_t; ++ role $3 types spamc_t; + - optional_policy(` - nis_use_ypbind($1_spamc_t) - ') -- ++ typealias spamassassin_t alias $1_spamassassin_t; ++ role $3 types spamassassin_t; + - optional_policy(` - nscd_socket_use($1_spamc_t) - ') -- ++ typealias spamc_home_t alias $1_spamassassin_home_t; ++ typealias spamc_tmp_t alias $1_spamassassin_tmp_t; ++ typealias spamc_tmp_t alias $1_spamc_tmp_t; ++ ++ manage_dirs_pattern($2, spamc_home_t, spamc_home_t) ++ manage_files_pattern($2, spamc_home_t, spamc_home_t) ++ manage_lnk_files_pattern($2, spamc_home_t, spamc_home_t) ++ relabel_dirs_pattern($2, spamc_home_t, spamc_home_t) ++ relabel_files_pattern($2, spamc_home_t, spamc_home_t) ++ relabel_lnk_files_pattern($2, spamc_home_t, spamc_home_t) + - optional_policy(` - mta_read_config($1_spamc_t) - sendmail_stub($1_spamc_t) @@ -26004,17 +24572,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - seutil_read_config($1_spamassassin_t) - - sysnet_dns_name_resolve($1_spamassassin_t) -+ typealias spamc_t alias $1_spamc_t; -+ role $3 types spamc_t; - +- - userdom_use_unpriv_users_fds($1_spamassassin_t) - userdom_search_user_home_dirs($1,$1_spamassassin_t) - # cjp: this really should just be the - # terminal specific to the role - userdom_use_unpriv_users_ptys($1_spamassassin_t) -+ typealias spamassassin_t alias $1_spamassassin_t; -+ role $3 types spamassassin_t; - +- - # this should probably be removed: - tunable_policy(`read_default_t',` - files_list_default($1_spamassassin_t) @@ -26048,17 +24612,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - userdom_manage_user_home_content_files($1,spamd_t) - userdom_manage_user_home_content_symlinks($1,spamd_t) - ') -+ typealias spamc_home_t alias $1_spamassassin_home_t; -+ typealias spamc_tmp_t alias $1_spamassassin_tmp_t; -+ typealias spamc_tmp_t alias $1_spamc_tmp_t; -+ -+ manage_dirs_pattern($2, spamc_home_t, spamc_home_t) -+ manage_files_pattern($2, spamc_home_t, spamc_home_t) -+ manage_lnk_files_pattern($2, spamc_home_t, spamc_home_t) -+ relabel_dirs_pattern($2, spamc_home_t, spamc_home_t) -+ relabel_files_pattern($2, spamc_home_t, spamc_home_t) -+ relabel_lnk_files_pattern($2, spamc_home_t, spamc_home_t) - +- - tunable_policy(`use_nfs_home_dirs',` - fs_manage_nfs_dirs($1_spamassassin_t) - fs_manage_nfs_files($1_spamassassin_t) @@ -26215,7 +24769,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol read_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t) ') -@@ -528,3 +346,133 @@ +@@ -528,3 +346,103 @@ dontaudit $1 spamd_tmp_t:sock_file getattr; ') @@ -26238,26 +24792,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + stream_connect_pattern($1, spamd_var_run_t, spamd_var_run_t, spamd_t) +') + -+ -+######################################## -+## -+## Execute spamassassin server in the spamassassin domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`spamassassin_spamd_script_domtrans',` -+ gen_require(` -+ type spamd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, spamd_script_exec_t) -+') -+ +######################################## +## +## All of the rules required to administrate @@ -26273,47 +24807,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the spamassassin domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`spamassassin_spamd_admin',` + gen_require(` -+ type spamd_t; -+ type spamd_script_exec_t; -+ type spamd_tmp_t; -+ type spamd_log_t; -+ type spamd_spool_t; -+ type spamd_var_lib_t; -+ type spamd_var_run_t; ++ 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) -+ -+ # Allow spamd_t to restart the apache service -+ spamassassin_spamd_script_domtrans($1) ++ ++ init_labeled_script_domtrans($1, spamd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 spamd_script_exec_t system_r; ++ role_transition $2 spamd_initrc_exec_t system_r; + allow $2 system_r; + + files_list_tmp($1) -+ admin_pattern($1, spamd_tmp_t) ++ admin_pattern($1, spamd_tmp_t) + + logging_list_logs($1) -+ admin_pattern($1, spamd_log_t) ++ 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) ++ admin_pattern($1, spamd_var_lib_t) + + files_list_pids($1) -+ admin_pattern($1, spamd_var_run_t) ++ admin_pattern($1, spamd_var_run_t) +') + +######################################## @@ -26349,10 +24873,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + manage_files_pattern($1, spamc_home_t, spamc_home_t) + razor_manage_user_home_files(user, $1) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.5.8/policy/modules/services/spamassassin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.5.9/policy/modules/services/spamassassin.te --- nsaserefpolicy/policy/modules/services/spamassassin.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/spamassassin.te 2008-09-17 08:49:09.000000000 -0400 -@@ -21,8 +21,10 @@ ++++ serefpolicy-3.5.9/policy/modules/services/spamassassin.te 2008-09-25 08:33:18.000000000 -0400 +@@ -21,16 +21,24 @@ gen_tunable(spamd_enable_home_dirs, true) # spamassassin client executable @@ -26364,7 +24888,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type spamd_t; type spamd_exec_t; -@@ -31,6 +33,9 @@ + init_daemon_domain(spamd_t,spamd_exec_t) + ++type spamd_initrc_exec_t; ++init_script_file(spamd_initrc_exec_t) ++ type spamd_spool_t; files_type(spamd_spool_t) @@ -26374,15 +24902,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type spamd_tmp_t; files_tmp_file(spamd_tmp_t) -@@ -41,8 +46,23 @@ +@@ -41,8 +49,20 @@ type spamd_var_run_t; files_pid_file(spamd_var_run_t) -type spamassassin_exec_t; -application_executable_file(spamassassin_exec_t) -+type spamd_script_exec_t; -+init_script_file(spamd_script_exec_t) -+ +type spamd_etc_t; +files_config_file(spamd_etc_t) + @@ -26644,66 +25169,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + sendmail_stub(spamc_t) + sendmail_rw_pipes(spamc_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.5.8/policy/modules/services/squid.fc ---- nsaserefpolicy/policy/modules/services/squid.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/squid.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -12,3 +12,8 @@ - /var/run/squid\.pid -- gen_context(system_u:object_r:squid_var_run_t,s0) - - /var/spool/squid(/.*)? gen_context(system_u:object_r:squid_cache_t,s0) -+/usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) -+/usr/lib64/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) -+ -+/etc/rc\.d/init\.d/squid -- gen_context(system_u:object_r:squid_script_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.5.9/policy/modules/services/squid.fc +--- nsaserefpolicy/policy/modules/services/squid.fc 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/squid.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,4 +1,5 @@ +-/etc/rc.d/init.d/squid -- gen_context(system_u:object_r:squid_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/squid -- gen_context(system_u:object_r:squid_initrc_exec_t,s0) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-3.5.8/policy/modules/services/squid.if ---- nsaserefpolicy/policy/modules/services/squid.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/squid.if 2008-09-17 08:49:09.000000000 -0400 -@@ -131,3 +131,114 @@ + /etc/squid(/.*)? gen_context(system_u:object_r:squid_conf_t,s0) + + /usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-3.5.9/policy/modules/services/squid.if +--- nsaserefpolicy/policy/modules/services/squid.if 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/squid.if 2008-09-25 08:33:18.000000000 -0400 +@@ -168,3 +168,49 @@ interface(`squid_use',` refpolicywarn(`$0($*) has been deprecated.') ') + +######################################## +## -+## Allow read and write squid -+## unix domain stream sockets. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`squid_rw_stream_sockets',` -+ gen_require(` -+ type squid_t; -+ ') -+ -+ allow $1 squid_t:unix_stream_socket { getattr read write }; -+') -+ -+######################################## -+## -+## Execute squid server in the squid domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`squid_script_domtrans',` -+ gen_require(` -+ type squid_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, squid_script_exec_t) -+') -+ -+######################################## -+## +## All of the rules required to administrate +## an squid environment +## @@ -26717,105 +25202,40 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## The role to be allowed to manage the squid domain. +## +## -+## -+## -+## The type of the user terminal. -+## -+## +## +# +interface(`squid_admin',` + gen_require(` -+ type squid_t; -+ type squid_script_exec_t; -+ type squid_cache_t; -+ type squid_conf_t; -+ type squid_log_t; -+ type squid_var_run_t; ++ type squid_t, squid_cache_t, squid_conf_t; ++ type squid_log_t, squid_var_run_t; ++ type squid_initrc_exec_t; + ') + -+ allow $1 squid_t:process { ptrace signal_perms getattr }; -+ read_files_pattern($1, squid_t, squid_t) -+ -+ # Allow squid_t to restart the apache service -+ squid_script_domtrans($1) ++ allow $1 squid_t:process { ptrace signal_perms }; ++ ps_process_pattern($1, squid_t) ++ ++ init_labeled_script_domtrans($1, squid_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 squid_script_exec_t system_r; ++ role_transition $2 squid_initrc_exec_t system_r; + allow $2 system_r; + + files_list_etc($1) -+ admin_pattern($1, squid_conf_t) ++ admin_pattern($1, squid_conf_t) + + logging_list_logs($1) -+ admin_pattern($1, squid_log_t) ++ admin_pattern($1, squid_log_t) + + files_list_var($1) + admin_pattern($1, squid_cache_t) + + files_list_pids($1) -+ admin_pattern($1, squid_var_run_t) -+') -+ -+######################################## -+## -+## Send a signal to squid. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`squid_signal',` -+ gen_require(` -+ type squid_t; -+ ') -+ -+ allow $1 squid_t:process signal; ++ admin_pattern($1, squid_var_run_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.8/policy/modules/services/squid.te ---- nsaserefpolicy/policy/modules/services/squid.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/squid.te 2008-09-23 15:23:35.000000000 -0400 -@@ -31,12 +31,15 @@ - type squid_var_run_t; - files_pid_file(squid_var_run_t) - -+type squid_script_exec_t; -+init_script_file(squid_script_exec_t) -+ - ######################################## - # - # Local policy - # - --allow squid_t self:capability { setgid setuid dac_override sys_resource }; -+allow squid_t self:capability { setgid kill setuid dac_override sys_resource }; - dontaudit squid_t self:capability sys_tty_config; - allow squid_t self:process ~{ ptrace setcurrent setexec setfscreate execmem execstack execheap }; - allow squid_t self:fifo_file rw_fifo_file_perms; -@@ -85,6 +88,7 @@ - corenet_udp_sendrecv_all_ports(squid_t) - corenet_tcp_bind_all_nodes(squid_t) - corenet_udp_bind_all_nodes(squid_t) -+corenet_tcp_bind_http_port(squid_t) - corenet_tcp_bind_http_cache_port(squid_t) - corenet_udp_bind_http_cache_port(squid_t) - corenet_tcp_bind_ftp_port(squid_t) -@@ -92,10 +96,12 @@ - corenet_udp_bind_gopher_port(squid_t) - corenet_tcp_bind_squid_port(squid_t) - corenet_udp_bind_squid_port(squid_t) -+corenet_udp_bind_wccp_port(squid_t) - corenet_tcp_connect_ftp_port(squid_t) - corenet_tcp_connect_gopher_port(squid_t) - corenet_tcp_connect_http_port(squid_t) - corenet_tcp_connect_http_cache_port(squid_t) -+corenet_tcp_connect_pgpkeyserver_port(squid_t) - corenet_sendrecv_http_client_packets(squid_t) - corenet_sendrecv_ftp_client_packets(squid_t) - corenet_sendrecv_gopher_client_packets(squid_t) -@@ -109,6 +115,8 @@ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.9/policy/modules/services/squid.te +--- nsaserefpolicy/policy/modules/services/squid.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/squid.te 2008-09-25 08:33:18.000000000 -0400 +@@ -118,6 +118,8 @@ fs_getattr_all_fs(squid_t) fs_search_auto_mountpoints(squid_t) @@ -26824,15 +25244,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol selinux_dontaudit_getattr_dir(squid_t) -@@ -128,6 +136,7 @@ - files_getattr_home_dir(squid_t) - - auth_use_nsswitch(squid_t) -+auth_domtrans_chkpwd(squid_t) - - libs_use_ld_so(squid_t) - libs_use_shared_libs(squid_t) -@@ -146,14 +155,11 @@ +@@ -156,6 +158,7 @@ tunable_policy(`squid_connect_any',` corenet_tcp_connect_all_ports(squid_t) @@ -26840,44 +25252,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -- allow squid_t self:capability kill; -- cron_use_fds(squid_t) -- cron_use_system_job_fds(squid_t) -- cron_rw_pipes(squid_t) -- cron_write_system_job_pipes(squid_t) -+ cron_system_entry(squid_t, squid_exec_t) - ') - +@@ -187,8 +190,3 @@ optional_policy(` -@@ -168,7 +174,12 @@ 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 -+optional_policy(` -+ apache_content_template(squid) -+ corenet_tcp_connect_http_cache_port(httpd_squid_script_t) -+ squid_read_config(httpd_squid_script_t) -+ allow httpd_squid_script_t self:tcp_socket create_socket_perms; -+ sysnet_dns_name_resolve(httpd_squid_script_t) -+ corenet_all_recvfrom_unlabeled(httpd_squid_script_t) -+ corenet_all_recvfrom_netlabel(httpd_squid_script_t) -+') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-3.5.8/policy/modules/services/ssh.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-3.5.9/policy/modules/services/ssh.fc --- nsaserefpolicy/policy/modules/services/ssh.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ssh.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/ssh.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,4 +1,4 @@ -HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ROLE_home_ssh_t,s0) +HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0) /etc/ssh/primes -- gen_context(system_u:object_r:sshd_key_t,s0) /etc/ssh/ssh_host_key -- gen_context(system_u:object_r:sshd_key_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.8/policy/modules/services/ssh.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.9/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ssh.if 2008-09-18 15:56:17.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/ssh.if 2008-09-25 08:33:18.000000000 -0400 @@ -36,6 +36,7 @@ gen_require(` attribute ssh_server; @@ -27119,9 +25514,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_search_tmp($1) + delete_files_pattern($1, ssh_tmp_t, ssh_tmp_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.5.8/policy/modules/services/ssh.te ---- nsaserefpolicy/policy/modules/services/ssh.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/ssh.te 2008-09-17 08:49:09.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.5.9/policy/modules/services/ssh.te +--- nsaserefpolicy/policy/modules/services/ssh.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/ssh.te 2008-09-25 08:33:18.000000000 -0400 @@ -24,7 +24,7 @@ # Type for the ssh-agent executable. @@ -27131,7 +25526,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # ssh client executable. type ssh_exec_t; -@@ -57,6 +57,12 @@ +@@ -55,6 +55,12 @@ init_ranged_daemon_domain(sshd_t,sshd_exec_t,s0 - mcs_systemhigh) ') @@ -27144,7 +25539,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ################################# # # sshd local policy -@@ -80,6 +86,9 @@ +@@ -78,6 +84,9 @@ corenet_tcp_bind_xserver_port(sshd_t) corenet_sendrecv_xserver_server_packets(sshd_t) @@ -27154,7 +25549,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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 -@@ -101,6 +110,14 @@ +@@ -99,6 +108,14 @@ ') optional_policy(` @@ -27169,7 +25564,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol daemontools_service_domain(sshd_t, sshd_exec_t) ') -@@ -119,7 +136,11 @@ +@@ -117,7 +134,11 @@ ') optional_policy(` @@ -27182,9 +25577,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol unconfined_shell_domtrans(sshd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.fc serefpolicy-3.5.8/policy/modules/services/stunnel.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.fc serefpolicy-3.5.9/policy/modules/services/stunnel.fc --- nsaserefpolicy/policy/modules/services/stunnel.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/stunnel.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/stunnel.fc 2008-09-25 08:33:18.000000000 -0400 @@ -2,5 +2,6 @@ /etc/stunnel(/.*)? gen_context(system_u:object_r:stunnel_etc_t,s0) @@ -27192,9 +25587,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.5.8/policy/modules/services/stunnel.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-3.5.9/policy/modules/services/stunnel.te --- nsaserefpolicy/policy/modules/services/stunnel.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/stunnel.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/stunnel.te 2008-09-25 08:33:18.000000000 -0400 @@ -54,6 +54,8 @@ kernel_read_system_state(stunnel_t) kernel_read_network_state(stunnel_t) @@ -27204,9 +25599,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_all_recvfrom_unlabeled(stunnel_t) corenet_all_recvfrom_netlabel(stunnel_t) corenet_tcp_sendrecv_all_if(stunnel_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.5.8/policy/modules/services/telnet.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.5.9/policy/modules/services/telnet.te --- nsaserefpolicy/policy/modules/services/telnet.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/telnet.te 2008-09-18 16:12:20.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/telnet.te 2008-09-25 08:33:18.000000000 -0400 @@ -89,15 +89,19 @@ userdom_search_unpriv_users_home_dirs(telnetd_t) @@ -27231,26 +25626,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + fs_manage_cifs_files(telnetd_t) ') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.if serefpolicy-3.5.8/policy/modules/services/tftp.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.if serefpolicy-3.5.9/policy/modules/services/tftp.if --- nsaserefpolicy/policy/modules/services/tftp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/tftp.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/tftp.if 2008-09-25 08:33:18.000000000 -0400 @@ -20,10 +20,10 @@ allow $1 tftpd_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, tftpd_t) - manage_files_pattern($1, tftpdir_rw_t, tftpdir_rw_t) -+ admin_pattern($1, tftpdir_rw_t) ++ admin_pattern($1, tftpdir_rw_t) - manage_files_pattern($1, tftpdir_t, tftpdir_t) -+ admin_pattern($1, tftpdir_t) ++ admin_pattern($1, tftpdir_t) files_list_pids($1) - manage_files_pattern($1, tftpd_var_run_t, tftpd_var_run_t) -+ admin_pattern($1, tftpd_var_run_t) ++ admin_pattern($1, tftpd_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.5.8/policy/modules/services/tftp.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.5.9/policy/modules/services/tftp.te --- nsaserefpolicy/policy/modules/services/tftp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/tftp.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/tftp.te 2008-09-25 08:33:18.000000000 -0400 @@ -37,7 +37,6 @@ allow tftpd_t self:udp_socket create_socket_perms; allow tftpd_t self:unix_dgram_socket create_socket_perms; @@ -27295,63 +25690,35 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol seutil_sigchld_newrole(tftpd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.fc serefpolicy-3.5.8/policy/modules/services/tor.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.fc serefpolicy-3.5.9/policy/modules/services/tor.fc --- nsaserefpolicy/policy/modules/services/tor.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/tor.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -6,3 +6,5 @@ - /var/lib/tor(/.*)? gen_context(system_u:object_r:tor_var_lib_t,s0) - /var/log/tor(/.*)? gen_context(system_u:object_r:tor_var_log_t,s0) - /var/run/tor(/.*)? gen_context(system_u:object_r:tor_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/tor -- gen_context(system_u:object_r:tor_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-3.5.8/policy/modules/services/tor.if ---- nsaserefpolicy/policy/modules/services/tor.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/tor.if 2008-09-17 08:49:09.000000000 -0400 -@@ -20,6 +20,25 @@ ++++ serefpolicy-3.5.9/policy/modules/services/tor.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,4 @@ ++/etc/rc\.d/init\.d/tor -- gen_context(system_u:object_r:tor_initrc_exec_t,s0) + /etc/tor(/.*)? gen_context(system_u:object_r:tor_etc_t,s0) - ######################################## - ## -+## Execute tor server in the tor domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`tor_script_domtrans',` -+ gen_require(` -+ type tor_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, tor_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an tor environment - ## -@@ -34,20 +53,28 @@ + /usr/bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-3.5.9/policy/modules/services/tor.if +--- nsaserefpolicy/policy/modules/services/tor.if 2008-08-07 11:15:11.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/tor.if 2008-09-25 08:33:18.000000000 -0400 +@@ -34,20 +34,27 @@ gen_require(` type tor_t, tor_var_log_t, tor_etc_t; type tor_var_lib_t, tor_var_run_t; -+ type tor_script_exec_t; ++ type tor_initrc_exec_t; ') allow $1 tor_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, tor_t) -+ # Allow tor_t to restart the apache service -+ tor_script_domtrans($1) ++ init_labeled_script_domtrans($1, tor_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 tor_script_exec_t system_r; ++ role_transition $2 tor_initrc_exec_t system_r; + allow $2 system_r; + logging_list_logs($1) - manage_files_pattern($1, tor_var_log_t, tor_var_log_t) -+ admin_pattern($1, tor_var_log_t) ++ admin_pattern($1, tor_var_log_t) files_list_etc($1) - manage_files_pattern($1, tor_etc_t, tor_etc_t) @@ -27359,25 +25726,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_list_var_lib($1) - manage_files_pattern($1, tor_var_lib_t, tor_var_lib_t) -+ admin_pattern($1, tor_var_lib_t) ++ admin_pattern($1, tor_var_lib_t) files_list_pids($1) - manage_files_pattern($1, tor_var_run_t, tor_var_run_t) -+ admin_pattern($1, tor_var_run_t) ++ admin_pattern($1, tor_var_run_t) ') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.5.8/policy/modules/services/tor.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.5.9/policy/modules/services/tor.te --- nsaserefpolicy/policy/modules/services/tor.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/tor.te 2008-09-17 08:49:09.000000000 -0400 -@@ -26,11 +26,15 @@ - type tor_var_run_t; - files_pid_file(tor_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/tor.te 2008-09-25 08:33:18.000000000 -0400 +@@ -14,6 +14,9 @@ + type tor_etc_t; + files_config_file(tor_etc_t) -+type tor_script_exec_t; -+init_script_file(tor_script_exec_t) ++type tor_initrc_exec_t; ++init_script_file(tor_initrc_exec_t) + - ######################################## - # + # var/lib/tor + type tor_var_lib_t; + files_type(tor_var_lib_t) +@@ -31,6 +34,7 @@ # tor local policy # @@ -27401,37 +25770,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` seutil_sigchld_newrole(tor_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.if serefpolicy-3.5.8/policy/modules/services/uucp.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.if serefpolicy-3.5.9/policy/modules/services/uucp.if --- nsaserefpolicy/policy/modules/services/uucp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/uucp.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/uucp.if 2008-09-25 08:33:18.000000000 -0400 @@ -84,18 +84,18 @@ ps_process_pattern($1, uucpd_t) files_list_tmp($1) - manage_files_pattern($1, uucpd_tmp_t, uucpd_tmp_t) -+ admin_pattern($1, uucpd_tmp_t) ++ admin_pattern($1, uucpd_tmp_t) logging_list_logs($1) - manage_files_pattern($1, uucpd_log_t, uucpd_log_t) -+ admin_pattern($1, uucpd_log_t) ++ admin_pattern($1, uucpd_log_t) files_list_spool($1) - manage_files_pattern($1, uucpd_spool_t, uucpd_spool_t) + admin_pattern($1, uucpd_spool_t) - manage_files_pattern($1, uucpd_rw_t, uucpd_rw_t) -+ admin_pattern($1, uucpd_rw_t) ++ admin_pattern($1, uucpd_rw_t) - manage_files_pattern($1, uucpd_ro_t, uucpd_ro_t) -+ admin_pattern($1, uucpd_ro_t) ++ admin_pattern($1, uucpd_ro_t) files_list_pids($1) - manage_files_pattern($1, uucpd_var_run_t, uucpd_var_run_t) -+ admin_pattern($1, uucpd_var_run_t) ++ admin_pattern($1, uucpd_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.5.8/policy/modules/services/uucp.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.5.9/policy/modules/services/uucp.te --- nsaserefpolicy/policy/modules/services/uucp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/uucp.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/uucp.te 2008-09-25 08:33:18.000000000 -0400 @@ -116,6 +116,8 @@ files_read_etc_files(uux_t) @@ -27441,19 +25810,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(uux_t) libs_use_shared_libs(uux_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.5.8/policy/modules/services/virt.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.5.9/policy/modules/services/virt.fc --- nsaserefpolicy/policy/modules/services/virt.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/virt.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -9,3 +9,6 @@ - /var/lib/libvirt/images(/.*)? gen_context(system_u:object_r:virt_image_t,s0) - /var/log/libvirt(/.*)? gen_context(system_u:object_r:virt_log_t,s0) - /var/run/libvirt(/.*)? gen_context(system_u:object_r:virt_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/libvirtd -- gen_context(system_u:object_r:virtd_script_exec_t,s0) -+ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.5.8/policy/modules/services/virt.if ++++ serefpolicy-3.5.9/policy/modules/services/virt.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -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.5.9/policy/modules/services/virt.if --- nsaserefpolicy/policy/modules/services/virt.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/virt.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/virt.if 2008-09-25 08:33:18.000000000 -0400 @@ -68,7 +68,7 @@ ## ## @@ -27475,12 +25845,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +## +# -+interface(`virtd_script_domtrans',` ++interface(`virtd_initrc_domtrans',` + gen_require(` -+ type virtd_script_exec_t; ++ type virtd_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, virtd_script_exec_t) ++ init_labeled_script_domtrans($1, virtd_initrc_exec_t) +') + +######################################## @@ -27532,28 +25902,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol tunable_policy(`virt_use_nfs',` fs_manage_nfs_dirs($1) -@@ -243,11 +291,18 @@ +@@ -243,11 +291,17 @@ interface(`virt_admin',` gen_require(` type virtd_t; -+ type virtd_script_exec_t; ++ type virtd_initrc_exec_t; ') allow $1 virtd_t:process { ptrace signal_perms }; ps_process_pattern($1, virtd_t) -+ # Allow virtd_t to restart the apache service -+ virtd_script_domtrans($1) ++ virtd_initrc_domtrans($1) + domain_system_change_exemption($1) -+ role_transition $2 virtd_script_exec_t system_r; ++ 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.5.8/policy/modules/services/virt.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.5.9/policy/modules/services/virt.te --- nsaserefpolicy/policy/modules/services/virt.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/virt.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/virt.te 2008-09-25 08:33:18.000000000 -0400 @@ -1,6 +1,8 @@ policy_module(virt, 1.0.0) @@ -27578,8 +25947,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol type virtd_exec_t; init_daemon_domain(virtd_t, virtd_exec_t) -+type virtd_script_exec_t; -+init_script_file(virtd_script_exec_t) ++type virtd_initrc_exec_t; ++init_script_file(virtd_initrc_exec_t) + ######################################## # @@ -27684,9 +26053,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + unconfined_domain(virtd_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.5.8/policy/modules/services/xserver.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.5.9/policy/modules/services/xserver.fc --- nsaserefpolicy/policy/modules/services/xserver.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/xserver.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/xserver.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,13 +1,15 @@ # # HOME_DIR @@ -27758,9 +26127,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/xserver.if 2008-09-17 19:21:56.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.5.9/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/xserver.if 2008-09-25 08:33:18.000000000 -0400 @@ -16,6 +16,7 @@ gen_require(` type xkb_var_lib_t, xserver_exec_t, xserver_log_t; @@ -27932,7 +26301,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - allow $1_xserver_t xdm_var_run_t:dir search; - ') - ') dnl end TODO -- ++ domtrans_pattern($2, xauth_exec_t, xauth_t) ++ allow $2 xauth_t:process signal; + - ############################## - # - # $1_xauth_t Local policy @@ -27947,9 +26318,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - manage_dirs_pattern($1_xauth_t, $1_xauth_tmp_t, $1_xauth_tmp_t) - manage_files_pattern($1_xauth_t, $1_xauth_tmp_t, $1_xauth_tmp_t) - files_tmp_filetrans($1_xauth_t, $1_xauth_tmp_t, { file dir }) -+ domtrans_pattern($2, xauth_exec_t, xauth_t) -+ allow $2 xauth_t:process signal; - +- - domtrans_pattern($2, xauth_exec_t, $1_xauth_t) - - allow $2 $1_xauth_t:process signal; @@ -27964,8 +26333,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - - allow xdm_t $1_xauth_home_t:file manage_file_perms; - userdom_user_home_dir_filetrans($1, xdm_t, $1_xauth_home_t, file) -+ ps_process_pattern($2,xauth_t) - +- - domain_use_interactive_fds($1_xauth_t) - - files_read_etc_files($1_xauth_t) @@ -27981,7 +26349,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - - libs_use_ld_so($1_xauth_t) - libs_use_shared_libs($1_xauth_t) -- ++ ps_process_pattern($2,xauth_t) + - userdom_use_user_terminals($1, $1_xauth_t) - userdom_read_user_tmp_files($1, $1_xauth_t) - @@ -28745,7 +27114,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1674,6 +1939,65 @@ +@@ -1674,6 +1939,26 @@ ######################################## ## @@ -28769,27 +27138,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +######################################## +## -+## xdm xserver RW shared memory socket. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`xserver_xdm_rw_shm',` -+ gen_require(` -+ type xdm_xserver_t; -+ ') -+ -+ allow xdm_xserver_t $1:fd use; -+ allow $1 xdm_xserver_t:shm rw_shm_perms; -+ allow xdm_xserver_t $1:shm rw_shm_perms; -+ -+') -+ -+######################################## -+## + ## xdm xserver RW shared memory socket. + ## + ## +@@ -1692,6 +1977,24 @@ + + ######################################## + ## +## Ptrace XDM +## +## @@ -28811,7 +27166,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Interface to provide X object permissions on a given X server to ## an X client domain. Gives the domain complete control over the ## display. -@@ -1686,8 +2010,126 @@ +@@ -1704,8 +2007,126 @@ # interface(`xserver_unconfined',` gen_require(` @@ -28940,9 +27295,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - typeattribute $1 xserver_unconfined_type; + dontaudit $1 xdm_home_t:file rw_file_perms; ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.8/policy/modules/services/xserver.te ---- nsaserefpolicy/policy/modules/services/xserver.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/xserver.te 2008-09-22 09:10:33.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.9/policy/modules/services/xserver.te +--- nsaserefpolicy/policy/modules/services/xserver.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/xserver.te 2008-09-25 08:33:18.000000000 -0400 @@ -8,6 +8,14 @@ ## @@ -29441,152 +27796,107 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.fc serefpolicy-3.5.8/policy/modules/services/zabbix.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.fc serefpolicy-3.5.9/policy/modules/services/zabbix.fc --- nsaserefpolicy/policy/modules/services/zabbix.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/zabbix.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -3,3 +3,5 @@ - /var/log/zabbix(/.*)? gen_context(system_u:object_r:zabbix_log_t,s0) - - /var/run/zabbix(/.*)? gen_context(system_u:object_r:zabbix_var_run_t,s0) ++++ serefpolicy-3.5.9/policy/modules/services/zabbix.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,5 @@ ++/etc/rc\.d/init\.d/zabbix -- gen_context(system_u:object_r:zabbix_initrc_exec_t,s0) + -+/etc/rc\.d/init\.d/zabbix -- gen_context(system_u:object_r:zabbix_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.if serefpolicy-3.5.8/policy/modules/services/zabbix.if ---- nsaserefpolicy/policy/modules/services/zabbix.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/zabbix.if 2008-09-17 08:49:09.000000000 -0400 -@@ -79,6 +79,25 @@ + /usr/bin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0) - ######################################## - ## -+## Execute zabbix server in the zabbix domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+# -+interface(`zabbix_script_domtrans',` -+ gen_require(` -+ type zabbix_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, zabbix_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## an zabbix environment - ## -@@ -92,14 +111,21 @@ + /var/log/zabbix(/.*)? gen_context(system_u:object_r:zabbix_log_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.if serefpolicy-3.5.9/policy/modules/services/zabbix.if +--- nsaserefpolicy/policy/modules/services/zabbix.if 2008-08-07 11:15:11.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/services/zabbix.if 2008-09-25 08:33:18.000000000 -0400 +@@ -92,14 +92,20 @@ interface(`zabbix_admin',` gen_require(` type zabbix_t, zabbix_log_t, zabbix_var_run_t; -+ type zabbix_script_exec_t; ++ type zabbix_initrc_exec_t; ') - allow $1 zabbix_t:process { ptrace signal_perms getattr }; - read_files_pattern($1, zabbix_t, zabbix_t) + allow $1 zabbix_t:process { ptrace signal_perms }; + ps_process_pattern($2, zabbix_t) -+ -+ # Allow zabbix_t to restart the apache service -+ zabbix_script_domtrans($1) ++ ++ init_labeled_script_domtrans($1, rbcbind_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 zabbix_script_exec_t system_r; ++ role_transition $2 zabbix_initrc_exec_t system_r; + allow $2 system_r; logging_list_logs($1) - manage_files_pattern($1, zabbix_log_t, zabbix_log_t) -+ admin_pattern($1, zabbix_log_t) ++ admin_pattern($1, zabbix_log_t) files_list_pids($1) - manage_files_pattern($1, zabbix_var_run_t, zabbix_var_run_t) -+ admin_pattern($1, zabbix_var_run_t) ++ admin_pattern($1, zabbix_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.te serefpolicy-3.5.8/policy/modules/services/zabbix.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.te serefpolicy-3.5.9/policy/modules/services/zabbix.te --- nsaserefpolicy/policy/modules/services/zabbix.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/zabbix.te 2008-09-17 08:49:09.000000000 -0400 -@@ -18,6 +18,9 @@ - type zabbix_var_run_t; - files_pid_file(zabbix_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/zabbix.te 2008-09-25 08:33:18.000000000 -0400 +@@ -10,6 +10,9 @@ + type zabbix_exec_t; + init_daemon_domain(zabbix_t, zabbix_exec_t) -+type zabbix_script_exec_t; -+init_script_file(zabbix_script_exec_t) ++type zabbix_initrc_exec_t; ++init_script_file(zabbix_initrc_exec_t) + - ######################################## - # - # zabbix local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.fc serefpolicy-3.5.8/policy/modules/services/zebra.fc + # log files + type zabbix_log_t; + logging_log_file(zabbix_log_t) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.fc serefpolicy-3.5.9/policy/modules/services/zebra.fc --- nsaserefpolicy/policy/modules/services/zebra.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/zebra.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -14,3 +14,10 @@ - /var/run/\.zebra -s gen_context(system_u:object_r:zebra_var_run_t,s0) - /var/run/\.zserv -s gen_context(system_u:object_r:zebra_var_run_t,s0) - /var/run/quagga(/.*)? gen_context(system_u:object_r:zebra_var_run_t,s0) -+ -+/etc/rc\.d/init\.d/bgpd -- gen_context(system_u:object_r:zebra_script_exec_t,s0) -+/etc/rc\.d/init\.d/ospf6d -- gen_context(system_u:object_r:zebra_script_exec_t,s0) -+/etc/rc\.d/init\.d/ospfd -- gen_context(system_u:object_r:zebra_script_exec_t,s0) -+/etc/rc\.d/init\.d/ripd -- gen_context(system_u:object_r:zebra_script_exec_t,s0) -+/etc/rc\.d/init\.d/ripngd -- gen_context(system_u:object_r:zebra_script_exec_t,s0) -+/etc/rc\.d/init\.d/zebra -- gen_context(system_u:object_r:zebra_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.5.8/policy/modules/services/zebra.if ++++ serefpolicy-3.5.9/policy/modules/services/zebra.fc 2008-09-25 08:33:18.000000000 -0400 +@@ -1,3 +1,9 @@ ++/etc/rc\.d/init\.d/bgpd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/ospf6d -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/ospfd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/ripd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/ripngd -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0) ++/etc/rc\.d/init\.d/zebra -- gen_context(system_u:object_r:zebra_initrc_exec_t,s0) + + /usr/sbin/bgpd -- gen_context(system_u:object_r:zebra_exec_t,s0) + /usr/sbin/zebra -- gen_context(system_u:object_r:zebra_exec_t,s0) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.5.9/policy/modules/services/zebra.if --- nsaserefpolicy/policy/modules/services/zebra.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/zebra.if 2008-09-17 08:49:09.000000000 -0400 -@@ -24,6 +24,26 @@ - - ######################################## - ## -+## Execute zebra server in the zebra domain. -+## -+## ++++ serefpolicy-3.5.9/policy/modules/services/zebra.if 2008-09-25 08:33:18.000000000 -0400 +@@ -32,26 +32,37 @@ + ## Domain allowed access. + ## + ## ++## +## -+## The type of the process performing this action. ++## The role to be allowed to manage the zebra domain. +## +## -+# -+# -+interface(`zebra_script_domtrans',` -+ gen_require(` -+ type zebra_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, zebra_script_exec_t) -+') -+ -+ -+######################################## -+## - ## All of the rules required to administrate - ## an zebra environment - ## -@@ -38,20 +58,27 @@ + ## + # + interface(`zebra_admin',` gen_require(` type zebra_t, zebra_tmp_t, zebra_log_t; type zebra_conf_t, zebra_var_run_t; -+ type zebra_script_exec_t; ++ type zebra_initrc_exec_t; ') - allow $1 zebra_t:process { ptrace signal_perms getattr }; - read_files_pattern($1, zebra_t, zebra_t) + allow $1 zebra_t:process { ptrace signal_perms }; + ps_process_pattern($1, zebra_t) -+ -+ # Allow zebra_t to restart the apache service -+ zebra_script_domtrans($1) ++ ++ init_labeled_script_domtrans($1, rbcbind_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 zebra_script_exec_t system_r; ++ role_transition $2 zebra_initrc_exec_t system_r; + allow $2 system_r; files_list_tmp($1) - manage_files_pattern($1, zebra_tmp_t, zebra_tmp_t) -+ admin_pattern($1, zebra_tmp_t) ++ admin_pattern($1, zebra_tmp_t) logging_list_logs($1) - manage_files_pattern($1, zebra_log_t, zebra_log_t) -+ admin_pattern($1, zebra_log_t) ++ admin_pattern($1, zebra_log_t) files_list_etc($1) - manage_files_pattern($1, zebra_conf_t, zebra_conf_t) @@ -29594,21 +27904,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_list_pids($1) - manage_files_pattern($1, zebra_var_run_t, zebra_var_run_t) -+ admin_pattern($1, zebra_var_run_t) ++ admin_pattern($1, zebra_var_run_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-3.5.8/policy/modules/services/zebra.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-3.5.9/policy/modules/services/zebra.te --- nsaserefpolicy/policy/modules/services/zebra.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/services/zebra.te 2008-09-17 08:49:09.000000000 -0400 -@@ -30,6 +30,9 @@ - type zebra_var_run_t; - files_pid_file(zebra_var_run_t) ++++ serefpolicy-3.5.9/policy/modules/services/zebra.te 2008-09-25 08:33:18.000000000 -0400 +@@ -21,6 +21,9 @@ + type zebra_conf_t; + files_type(zebra_conf_t) -+type zebra_script_exec_t; -+init_script_file(zebra_script_exec_t) ++type zebra_initrc_exec_t; ++init_script_file(zebra_initrc_exec_t) + - ######################################## - # - # Local policy + type zebra_log_t; + logging_log_file(zebra_log_t) + @@ -37,7 +40,7 @@ allow zebra_t self:capability { setgid setuid net_admin net_raw }; @@ -29626,9 +27936,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_kernel_sysctls(zebra_t) kernel_rw_net_sysctls(zebra_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.5.8/policy/modules/system/application.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.5.9/policy/modules/system/application.te --- nsaserefpolicy/policy/modules/system/application.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/application.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/application.te 2008-09-25 08:33:18.000000000 -0400 @@ -7,6 +7,12 @@ # Executables to be run by user attribute application_exec_type; @@ -29642,9 +27952,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/system/authlogin.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.5.9/policy/modules/system/authlogin.fc --- nsaserefpolicy/policy/modules/system/authlogin.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/authlogin.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/authlogin.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -29671,9 +27981,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.5.8/policy/modules/system/authlogin.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.5.9/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/authlogin.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/authlogin.if 2008-09-25 08:33:18.000000000 -0400 @@ -56,10 +56,6 @@ miscfiles_read_localization($1_chkpwd_t) @@ -29934,9 +28244,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + manage_files_pattern($1, auth_cache_t, auth_cache_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.5.8/policy/modules/system/authlogin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.5.9/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/authlogin.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/authlogin.te 2008-09-25 08:33:18.000000000 -0400 @@ -59,6 +59,9 @@ type utempter_exec_t; application_domain(utempter_t,utempter_exec_t) @@ -30036,9 +28346,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol xserver_use_xdm_fds(utempter_t) xserver_rw_xdm_pipes(utempter_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.5.8/policy/modules/system/fstools.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.5.9/policy/modules/system/fstools.fc --- nsaserefpolicy/policy/modules/system/fstools.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/fstools.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/fstools.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -30052,9 +28362,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.5.8/policy/modules/system/fstools.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.5.9/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2008-08-14 10:07:04.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/fstools.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/fstools.te 2008-09-25 08:33:18.000000000 -0400 @@ -97,6 +97,10 @@ fs_getattr_tmpfs_dirs(fsadm_t) fs_read_tmpfs_symlinks(fsadm_t) @@ -30076,9 +28386,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/system/hostname.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.5.9/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/hostname.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/hostname.te 2008-09-25 08:33:18.000000000 -0400 @@ -8,7 +8,9 @@ type hostname_t; @@ -30090,9 +28400,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/system/init.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.5.9/policy/modules/system/init.fc --- nsaserefpolicy/policy/modules/system/init.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/init.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/init.fc 2008-09-25 08:33:18.000000000 -0400 @@ -4,8 +4,7 @@ /etc/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0) @@ -30112,9 +28422,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # # /var # -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.5.8/policy/modules/system/init.if ---- nsaserefpolicy/policy/modules/system/init.if 2008-09-12 10:48:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/init.if 2008-09-23 11:15:16.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.5.9/policy/modules/system/init.if +--- nsaserefpolicy/policy/modules/system/init.if 2008-09-24 10:04:55.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/init.if 2008-09-25 08:33:18.000000000 -0400 @@ -278,6 +278,27 @@ kernel_dontaudit_use_fds($1) ') @@ -30167,7 +28477,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ') -@@ -644,19 +666,39 @@ +@@ -644,23 +666,43 @@ # interface(`init_domtrans_script',` gen_require(` @@ -30188,11 +28498,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ifdef(`enable_mls',` - range_transition $1 initrc_exec_t:process s0 - mls_systemhigh; + range_transition $1 init_script_file_type:process s0 - mls_systemhigh; -+ ') -+') -+ -+######################################## -+## + ') + ') + + ######################################## + ## +## Execute a file in a bin directory +## in the initrc_t domain +## @@ -30205,13 +28515,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +interface(`init_bin_domtrans_spec',` + gen_require(` + type initrc_t; - ') ++ ') + + corecmd_bin_domtrans($1, initrc_t) - ') - - ######################################## -@@ -1271,6 +1313,25 @@ ++') ++ ++######################################## ++## + ## Execute a init script in a specified domain. + ## + ## +@@ -1296,6 +1338,25 @@ ######################################## ## @@ -30237,7 +28551,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Create files in a init script ## temporary data directory. ## -@@ -1426,7 +1487,7 @@ +@@ -1451,7 +1512,7 @@ type initrc_var_run_t; ') @@ -30246,7 +28560,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -1482,3 +1543,78 @@ +@@ -1507,3 +1568,51 @@ ') corenet_udp_recvfrom_labeled($1, daemon) ') @@ -30298,36 +28612,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $1 init_t:unix_dgram_socket sendto; + allow init_t $1:unix_dgram_socket sendto; +') -+ -+######################################## -+## -+## Execute init a specific script with an automatic domain transition. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`init_script_domtrans_spec',` -+ gen_require(` -+ type initrc_t; -+ ') -+ -+ files_list_etc($1) -+ domtrans_pattern($1, $2, initrc_t) -+ -+ ifdef(`enable_mcs',` -+ range_transition $1 $2:process s0; -+ ') -+ -+ ifdef(`enable_mls',` -+ range_transition $1 $2:process s0 - mls_systemhigh; -+ ') -+') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.8/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2008-09-12 10:48:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/init.te 2008-09-23 15:44:50.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.9/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/init.te 2008-09-25 08:33:18.000000000 -0400 @@ -17,6 +17,20 @@ ## gen_tunable(init_upstart,false) @@ -30561,9 +28848,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.te serefpolicy-3.5.8/policy/modules/system/ipsec.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.5.9/policy/modules/system/ipsec.te --- nsaserefpolicy/policy/modules/system/ipsec.te 2008-08-11 11:23:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/ipsec.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/ipsec.te 2008-09-25 08:33:18.000000000 -0400 @@ -55,11 +55,11 @@ allow ipsec_t self:capability { net_admin dac_override dac_read_search }; @@ -30651,9 +28938,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(racoon_t) libs_use_shared_libs(racoon_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.5.8/policy/modules/system/iscsi.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.5.9/policy/modules/system/iscsi.te --- nsaserefpolicy/policy/modules/system/iscsi.te 2008-08-11 11:23:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/iscsi.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/iscsi.te 2008-09-25 08:33:18.000000000 -0400 @@ -28,7 +28,7 @@ # iscsid local policy # @@ -30663,9 +28950,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow iscsid_t self:process { setrlimit setsched signal }; allow iscsid_t self:fifo_file { read write }; allow iscsid_t self:unix_stream_socket { create_stream_socket_perms connectto }; -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.8/policy/modules/system/libraries.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.9/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2008-08-13 15:24:56.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/libraries.fc 2008-09-21 08:23:42.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/libraries.fc 2008-09-25 08:33:18.000000000 -0400 @@ -60,12 +60,15 @@ # # /opt @@ -30759,9 +29046,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.5.8/policy/modules/system/libraries.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.5.9/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2008-08-13 15:24:56.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/libraries.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/libraries.te 2008-09-25 08:33:18.000000000 -0400 @@ -52,11 +52,11 @@ # ldconfig local policy # @@ -30818,9 +29105,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/system/locallogin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.5.9/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/locallogin.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/locallogin.te 2008-09-25 08:33:18.000000000 -0400 @@ -100,7 +100,6 @@ auth_rw_login_records(local_login_t) @@ -30889,28 +29176,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -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.5.8/policy/modules/system/logging.fc ---- nsaserefpolicy/policy/modules/system/logging.fc 2008-08-25 09:12:31.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/logging.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -63,3 +63,6 @@ - /var/spool/postfix/pid -d gen_context(system_u:object_r:var_run_t,s0) - - /var/tinydns/log/main(/.*)? gen_context(system_u:object_r:var_log_t,s0) -+ -+/etc/rc\.d/init\.d/rsyslog -- gen_context(system_u:object_r:syslogd_script_exec_t,s0) -+/etc/rc\.d/init\.d/auditd -- gen_context(system_u:object_r:auditd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.5.8/policy/modules/system/logging.if ---- nsaserefpolicy/policy/modules/system/logging.if 2008-09-03 14:55:50.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/logging.if 2008-09-17 08:49:09.000000000 -0400 -@@ -281,7 +281,7 @@ - role system_r types $1; - - domtrans_pattern(audisp_t, $2, $1) -- allow $1 audisp_t:process signal; -+ allow audisp_t $1:process { sigkill sigstop signull signal }; - - allow audisp_t $2:file getattr; - allow $1 audisp_t:unix_stream_socket rw_socket_perms; +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.5.9/policy/modules/system/logging.if +--- nsaserefpolicy/policy/modules/system/logging.if 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/logging.if 2008-09-25 08:33:18.000000000 -0400 @@ -719,6 +719,8 @@ files_search_var($1) manage_files_pattern($1,logfile,logfile) @@ -30920,116 +29188,58 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -823,6 +825,42 @@ - - ######################################## - ## -+## Execute syslog server in the syslogd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`logging_syslog_script_domtrans',` -+ gen_require(` -+ type syslogd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, syslogd_script_exec_t) -+') -+ -+######################################## -+## -+## Execute audit server in the auditd domain. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`logging_audit_script_domtrans',` -+ gen_require(` -+ type auditd_script_exec_t; -+ ') -+ -+ init_script_domtrans_spec($1, auditd_script_exec_t) -+') -+ -+######################################## -+## - ## All of the rules required to administrate - ## the audit environment - ## -@@ -847,6 +885,7 @@ +@@ -847,6 +849,7 @@ gen_require(` type auditd_t, auditd_etc_t, auditd_log_t; type auditd_var_run_t; -+ type auditd_script_exec_t; ++ type auditd_initrc_exec_t; ') allow $1 auditd_t:process { ptrace signal_perms }; -@@ -862,6 +901,13 @@ +@@ -862,6 +865,12 @@ manage_files_pattern($1, auditd_var_run_t, auditd_var_run_t) logging_run_auditctl($1, $2, $3) + -+ # Allow $1 to restart the audit service -+ logging_audit_script_domtrans($1) ++ init_labeled_script_domtrans($1, auditd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 auditd_script_exec_t system_r; ++ role_transition $2 auditd_initrc_exec_t system_r; + allow $2 system_r; + ') ######################################## -@@ -882,6 +928,7 @@ +@@ -882,6 +891,7 @@ type syslogd_tmp_t, syslogd_var_lib_t; type syslogd_var_run_t, klogd_var_run_t; type klogd_tmp_t, var_log_t; -+ type syslogd_script_exec_t; ++ type syslogd_initrc_exec_t; ') allow $1 syslogd_t:process { ptrace signal_perms }; -@@ -909,6 +956,12 @@ +@@ -909,6 +919,11 @@ manage_files_pattern($1, syslogd_var_run_t, syslogd_var_run_t) logging_manage_all_logs($1) + -+ # Allow $1 to restart the syslog service -+ logging_syslog_script_domtrans($1) ++ init_labeled_script_domtrans($1, syslogd_initrc_exec_t) + domain_system_change_exemption($1) -+ role_transition $2 syslogd_script_exec_t system_r; ++ role_transition $2 syslogd_initrc_exec_t system_r; + allow $2 system_r; ') ######################################## -@@ -935,5 +988,5 @@ +@@ -935,5 +950,5 @@ # interface(`logging_admin',` logging_admin_audit($1, $2, $3) - logging_admin_syslog($1) + logging_admin_syslog($1, $2, $3) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.8/policy/modules/system/logging.te ---- nsaserefpolicy/policy/modules/system/logging.te 2008-09-03 10:17:00.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/logging.te 2008-09-23 08:51:04.000000000 -0400 -@@ -72,6 +72,12 @@ - logging_log_file(var_log_t) - files_mountpoint(var_log_t) - -+type auditd_script_exec_t; -+init_script_file(auditd_script_exec_t) -+ -+type syslogd_script_exec_t; -+init_script_file(syslogd_script_exec_t) -+ - ifdef(`enable_mls',` - init_ranged_daemon_domain(auditd_t, auditd_exec_t, mls_systemhigh) - init_ranged_daemon_domain(syslogd_t, syslogd_exec_t, mls_systemhigh) -@@ -124,6 +130,7 @@ +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.9/policy/modules/system/logging.te +--- nsaserefpolicy/policy/modules/system/logging.te 2008-09-24 09:07:28.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/logging.te 2008-09-25 08:33:18.000000000 -0400 +@@ -130,6 +130,7 @@ allow auditd_t self:file { getattr read write }; allow auditd_t self:unix_dgram_socket create_socket_perms; allow auditd_t self:fifo_file rw_file_perms; @@ -31037,7 +29247,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow auditd_t auditd_etc_t:dir list_dir_perms; allow auditd_t auditd_etc_t:file read_file_perms; -@@ -145,9 +152,18 @@ +@@ -151,9 +152,18 @@ fs_getattr_all_fs(auditd_t) fs_search_auto_mountpoints(auditd_t) @@ -31056,7 +29266,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # Needs to be able to run dispatcher. see /etc/audit/auditd.conf # Probably want a transition, and a new auditd_helper app corecmd_exec_bin(auditd_t) -@@ -230,6 +246,8 @@ +@@ -236,6 +246,8 @@ miscfiles_read_localization(audisp_t) @@ -31065,7 +29275,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # Audit remote logger local policy -@@ -241,6 +259,7 @@ +@@ -247,6 +259,7 @@ corenet_all_recvfrom_netlabel(audisp_remote_t) corenet_tcp_sendrecv_all_if(audisp_remote_t) corenet_tcp_sendrecv_all_nodes(audisp_remote_t) @@ -31073,9 +29283,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_read_etc_files(audisp_remote_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.5.8/policy/modules/system/lvm.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.5.9/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/lvm.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/lvm.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -31089,19 +29299,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.5.8/policy/modules/system/lvm.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.5.9/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/lvm.te 2008-09-17 08:49:09.000000000 -0400 -@@ -13,6 +13,9 @@ ++++ serefpolicy-3.5.9/policy/modules/system/lvm.te 2008-09-25 08:33:18.000000000 -0400 +@@ -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) -+type clvmd_script_exec_t; -+init_script_file(clvmd_script_exec_t) -+ - type lvm_t; - type lvm_exec_t; - init_system_domain(lvm_t,lvm_exec_t) @@ -22,7 +25,7 @@ role system_r types lvm_t; @@ -31272,9 +29482,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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/modutils.te serefpolicy-3.5.8/policy/modules/system/modutils.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.5.9/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2008-09-12 10:48:05.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/modutils.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/modutils.te 2008-09-25 08:33:18.000000000 -0400 @@ -42,7 +42,7 @@ # insmod local policy # @@ -31404,9 +29614,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ################################# -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.5.8/policy/modules/system/mount.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.5.9/policy/modules/system/mount.fc --- nsaserefpolicy/policy/modules/system/mount.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/mount.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/mount.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -31415,9 +29625,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.5.8/policy/modules/system/mount.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.5.9/policy/modules/system/mount.if --- nsaserefpolicy/policy/modules/system/mount.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/mount.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/mount.if 2008-09-25 08:33:18.000000000 -0400 @@ -49,6 +49,8 @@ mount_domtrans($1) role $2 types mount_t; @@ -31427,9 +29637,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` 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.5.8/policy/modules/system/mount.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.5.9/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/mount.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/mount.te 2008-09-25 08:33:18.000000000 -0400 @@ -18,17 +18,18 @@ init_system_domain(mount_t,mount_exec_t) role system_r types mount_t; @@ -31584,9 +29794,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/system/raid.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.5.9/policy/modules/system/raid.te --- nsaserefpolicy/policy/modules/system/raid.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/raid.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/raid.te 2008-09-25 08:33:18.000000000 -0400 @@ -39,6 +39,7 @@ dev_dontaudit_getattr_generic_files(mdadm_t) dev_dontaudit_getattr_generic_chr_files(mdadm_t) @@ -31595,9 +29805,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.5.8/policy/modules/system/selinuxutil.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.5.9/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/selinuxutil.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -31616,9 +29826,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +# /var/lib +# +/var/lib/selinux(/.*)? gen_context(system_u:object_r:selinux_var_lib_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.5.8/policy/modules/system/selinuxutil.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.5.9/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/selinuxutil.if 2008-09-25 08:33:18.000000000 -0400 @@ -555,6 +555,59 @@ ######################################## @@ -32079,9 +30289,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + hotplug_use_fds($1) +') +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.8/policy/modules/system/selinuxutil.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.9/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/selinuxutil.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/selinuxutil.te 2008-09-25 08:33:18.000000000 -0400 @@ -23,6 +23,9 @@ type selinux_config_t; files_type(selinux_config_t) @@ -32268,7 +30478,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') +optional_policy(` -+ setrans_script_domtrans(semanage_t) ++ setrans_initrc_domtrans(semanage_t) + domain_system_change_exemption(semanage_t) + consoletype_exec(semanage_t) +') @@ -32436,18 +30646,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - 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.fc serefpolicy-3.5.8/policy/modules/system/setrans.fc ---- nsaserefpolicy/policy/modules/system/setrans.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/setrans.fc 2008-09-17 08:49:09.000000000 -0400 -@@ -1,3 +1,5 @@ -+/etc/rc\.d/init\.d/mcstrans -- gen_context(system_u:object_r:setrans_script_exec_t,s0) -+ - /sbin/mcstransd -- gen_context(system_u:object_r:setrans_exec_t,s0) - - /var/run/setrans(/.*)? gen_context(system_u:object_r:setrans_var_run_t,mls_systemhigh) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.8/policy/modules/system/setrans.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.9/policy/modules/system/setrans.if --- nsaserefpolicy/policy/modules/system/setrans.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/setrans.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/setrans.if 2008-09-25 08:33:18.000000000 -0400 @@ -21,3 +21,23 @@ stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t) files_list_pids($1) @@ -32464,30 +30665,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +## +# +# -+interface(`setrans_script_domtrans',` ++interface(`setrans_initrc_domtrans',` + gen_require(` -+ type setrans_script_exec_t; ++ type setrans_initrc_exec_t; + ') + -+ init_script_domtrans_spec($1, setrans_script_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/setrans.te serefpolicy-3.5.8/policy/modules/system/setrans.te ---- nsaserefpolicy/policy/modules/system/setrans.te 2008-09-11 11:28:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/setrans.te 2008-09-17 08:49:09.000000000 -0400 -@@ -14,6 +14,9 @@ - files_pid_file(setrans_var_run_t) - mls_trusted_object(setrans_var_run_t) - -+type setrans_script_exec_t; -+init_script_file(setrans_script_exec_t) -+ - ifdef(`enable_mcs',` - init_ranged_daemon_domain(setrans_t, setrans_exec_t,s0 - mcs_systemhigh) - ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.9/policy/modules/system/sysnetwork.fc --- nsaserefpolicy/policy/modules/system/sysnetwork.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.fc 2008-09-23 14:00:14.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/sysnetwork.fc 2008-09-25 08:33:18.000000000 -0400 @@ -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) @@ -32502,9 +30690,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') + +/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.5.8/policy/modules/system/sysnetwork.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.9/policy/modules/system/sysnetwork.if --- nsaserefpolicy/policy/modules/system/sysnetwork.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/sysnetwork.if 2008-09-25 08:33:18.000000000 -0400 @@ -553,6 +553,7 @@ type net_conf_t; ') @@ -32583,21 +30771,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.5.8/policy/modules/system/sysnetwork.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.9/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2008-08-11 11:23:34.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/sysnetwork.te 2008-09-17 08:49:09.000000000 -0400 -@@ -20,6 +20,10 @@ ++++ serefpolicy-3.5.9/policy/modules/system/sysnetwork.te 2008-09-25 08:33:18.000000000 -0400 +@@ -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) -+init_script_domtrans_spec(dhcpc_t, dhcpc_helper_exec_t) + type dhcpc_state_t; files_type(dhcpc_state_t) -@@ -41,16 +45,16 @@ +@@ -41,16 +44,16 @@ # # DHCP client local policy # @@ -32617,7 +30804,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow dhcpc_t dhcp_etc_t:dir list_dir_perms; read_lnk_files_pattern(dhcpc_t,dhcp_etc_t,dhcp_etc_t) -@@ -117,7 +121,7 @@ +@@ -117,7 +120,7 @@ corecmd_exec_shell(dhcpc_t) domain_use_interactive_fds(dhcpc_t) @@ -32626,7 +30813,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_read_etc_files(dhcpc_t) files_read_etc_runtime_files(dhcpc_t) -@@ -136,8 +140,6 @@ +@@ -136,8 +139,6 @@ modutils_domtrans_insmod(dhcpc_t) @@ -32635,7 +30822,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ifdef(`distro_redhat', ` files_exec_etc_files(dhcpc_t) ') -@@ -186,14 +188,12 @@ +@@ -186,14 +187,12 @@ ') optional_policy(` @@ -32652,22 +30839,22 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + +optional_policy(` -+ nis_script_domtrans(dhcpc_t) ++ nis_initrc_domtrans(dhcpc_t) ') optional_policy(` -@@ -202,9 +202,7 @@ +@@ -202,9 +201,7 @@ ') optional_policy(` - # dhclient sometimes starts ntpd - init_exec_script_files(dhcpc_t) - ntp_domtrans(dhcpc_t) -+ ntp_script_domtrans(dhcpc_t) ++ ntp_initrc_domtrans(dhcpc_t) ') optional_policy(` -@@ -215,6 +213,11 @@ +@@ -215,6 +212,11 @@ optional_policy(` seutil_sigchld_newrole(dhcpc_t) seutil_dontaudit_search_config(dhcpc_t) @@ -32679,7 +30866,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -@@ -226,6 +229,10 @@ +@@ -226,6 +228,10 @@ ') optional_policy(` @@ -32690,7 +30877,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_xen_state(dhcpc_t) kernel_write_xen_state(dhcpc_t) xen_append_log(dhcpc_t) -@@ -239,7 +246,6 @@ +@@ -239,7 +245,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 }; @@ -32698,7 +30885,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol allow ifconfig_t self:fd use; allow ifconfig_t self:fifo_file rw_fifo_file_perms; -@@ -253,6 +259,7 @@ +@@ -253,6 +258,7 @@ allow ifconfig_t self:sem create_sem_perms; allow ifconfig_t self:msgq create_msgq_perms; allow ifconfig_t self:msg { send receive }; @@ -32706,12 +30893,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol # Create UDP sockets, necessary when called from dhcpc allow ifconfig_t self:udp_socket create_socket_perms; -@@ -262,13 +269,19 @@ +@@ -262,13 +268,19 @@ 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) ++read_files_pattern(ifconfig_t, dhcpc_state_t, dhcpc_state_t) + files_read_etc_files(ifconfig_t); @@ -32726,7 +30913,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol corenet_rw_tun_tap_dev(ifconfig_t) -@@ -279,8 +292,11 @@ +@@ -279,8 +291,11 @@ fs_getattr_xattr_fs(ifconfig_t) fs_search_auto_mountpoints(ifconfig_t) @@ -32738,21 +30925,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol domain_use_interactive_fds(ifconfig_t) -@@ -320,11 +336,11 @@ - ') - - optional_policy(` -- ipsec_write_pid(ifconfig_t) -+ netutils_domtrans(dhcpc_t) - ') - - optional_policy(` -- netutils_domtrans(dhcpc_t) -+ ipsec_write_pid(ifconfig_t) - ') - - optional_policy(` -@@ -336,6 +352,14 @@ +@@ -336,6 +351,14 @@ ') optional_policy(` @@ -32767,9 +30940,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.if serefpolicy-3.5.8/policy/modules/system/udev.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.9/policy/modules/system/udev.if --- nsaserefpolicy/policy/modules/system/udev.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/udev.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/udev.if 2008-09-25 08:33:18.000000000 -0400 @@ -96,6 +96,24 @@ ######################################## @@ -32823,9 +30996,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - 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.5.8/policy/modules/system/udev.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.9/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/udev.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/udev.te 2008-09-25 08:33:18.000000000 -0400 @@ -83,6 +83,7 @@ kernel_rw_unix_dgram_sockets(udev_t) kernel_dgram_send(udev_t) @@ -32881,9 +31054,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/system/unconfined.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.9/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-09-11 16:42:49.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/unconfined.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/unconfined.fc 2008-09-25 08:33:18.000000000 -0400 @@ -2,15 +2,11 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -32922,9 +31095,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/usr/libexec/ghc-[^/]+/ghc-.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) + +/opt/real/(.*/)?realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.8/policy/modules/system/unconfined.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.9/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-09-11 16:42:49.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/unconfined.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/unconfined.if 2008-09-25 08:33:18.000000000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -33253,9 +31426,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + userdom_role_change_template(unconfined, $1) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.8/policy/modules/system/unconfined.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.9/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-09-11 16:42:49.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/unconfined.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/unconfined.te 2008-09-25 08:33:18.000000000 -0400 @@ -1,40 +1,80 @@ -policy_module(unconfined, 2.3.1) @@ -33548,7 +31721,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` - xserver_domtrans_xdm_xserver(unconfined_t) + xserver_run_xdm_xserver(unconfined_t, unconfined_r, { unconfined_devpts_t unconfined_tty_device_t }) -+ xserver_xdm_rw_shm(unconfined_t) ++ xserver_rw_xdm_xserver_shm(unconfined_t) ') ######################################## @@ -33576,7 +31749,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') + +optional_policy(` -+ xserver_xdm_rw_shm(unconfined_execmem_t) ++ xserver_rw_xdm_xserver_shm(unconfined_execmem_t) ') + +######################################## @@ -33590,9 +31763,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +# Allow SELinux aware applications to request rpm_script execution +rpm_transition_script(unconfined_notrans_t) +domain_ptrace_all_domains(unconfined_notrans_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.8/policy/modules/system/userdomain.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.9/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/userdomain.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/userdomain.fc 2008-09-25 08:33:18.000000000 -0400 @@ -1,4 +1,5 @@ -HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) -HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) @@ -33603,9 +31776,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/modules/system/userdomain.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.9/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/userdomain.if 2008-09-21 07:04:00.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/userdomain.if 2008-09-25 08:33:18.000000000 -0400 @@ -28,10 +28,14 @@ class context contains; ') @@ -36244,9 +34417,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + dontaudit $1 user_home_t:file unlink; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.8/policy/modules/system/userdomain.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.9/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/userdomain.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/userdomain.te 2008-09-25 08:33:18.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -36361,9 +34534,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + manage_fifo_files_pattern(privhome, cifs_t, cifs_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.8/policy/modules/system/xen.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.9/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/xen.fc 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/xen.fc 2008-09-25 08:33:18.000000000 -0400 @@ -20,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) @@ -36372,9 +34545,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.5.8/policy/modules/system/xen.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.9/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/xen.if 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/xen.if 2008-09-25 08:33:18.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -36416,9 +34589,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.5.8/policy/modules/system/xen.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.9/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.8/policy/modules/system/xen.te 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/modules/system/xen.te 2008-09-25 08:33:18.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -36655,9 +34828,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + unconfined_domain(xend_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.8/policy/support/file_patterns.spt +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.5.9/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/support/file_patterns.spt 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/support/file_patterns.spt 2008-09-25 08:33:18.000000000 -0400 @@ -537,3 +537,18 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; @@ -36677,9 +34850,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + relabel_sock_files_pattern($1,$2,$2) + +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.8/policy/support/obj_perm_sets.spt +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.9/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/support/obj_perm_sets.spt 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/support/obj_perm_sets.spt 2008-09-25 08:33:18.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -36694,9 +34867,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.5.8/policy/users +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.9/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.8/policy/users 2008-09-17 08:49:09.000000000 -0400 ++++ serefpolicy-3.5.9/policy/users 2008-09-25 08:33:18.000000000 -0400 @@ -25,11 +25,8 @@ # permit any access to such users, then remove this entry. # diff --git a/selinux-policy.spec b/selinux-policy.spec index 737ca5d..735da8e 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -16,8 +16,8 @@ %define CHECKPOLICYVER 2.0.16-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 3.5.8 -Release: 7%{?dist} +Version: 3.5.9 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -160,7 +160,7 @@ fi; %description SELinux Reference Policy - modular. -Based off of reference policy: Checked out revision 2797. +Based off of reference policy: Checked out revision 2820. %build @@ -381,6 +381,9 @@ exit 0 %endif %changelog +* Wed Sep 24 2008 Dan Walsh 3.5.9-1 +- Upgrade to upstream + * Tue Sep 23 2008 Dan Walsh 3.5.8-7 - Allow confined users to login with dbus