From 1a0f642074eb76acf8f3c89a4dacc526f19e8aac Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Aug 11 2008 21:19:25 +0000 Subject: - Update to upstream --- diff --git a/.cvsignore b/.cvsignore index 54ec5cb..207a85f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -145,3 +145,4 @@ serefpolicy-3.4.2.tgz serefpolicy-3.5.1.tgz serefpolicy-3.5.2.tgz serefpolicy-3.5.3.tgz +serefpolicy-3.5.4.tgz diff --git a/modules-targeted.conf b/modules-targeted.conf index 558ee12..12f1400 100644 --- a/modules-targeted.conf +++ b/modules-targeted.conf @@ -1675,3 +1675,10 @@ courier = module # livecd creator # livecd = module + +# Layer: services +# Module: snort +# +# Snort network intrusion detection system +# +snort = base diff --git a/policy-20080710.patch b/policy-20080710.patch index 782b0d3..ea0f6cc 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.3/Makefile +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.4/Makefile --- nsaserefpolicy/Makefile 2008-08-07 11:15:00.000000000 -0400 -+++ serefpolicy-3.5.3/Makefile 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/Makefile 2008-08-11 16:39:48.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.3/Rules.modular +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.4/Rules.modular --- nsaserefpolicy/Rules.modular 2008-08-07 11:15:00.000000000 -0400 -+++ serefpolicy-3.5.3/Rules.modular 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/Rules.modular 2008-08-11 16:39:48.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.3/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.4/config/appconfig-mcs/default_contexts --- nsaserefpolicy/config/appconfig-mcs/default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.3/config/appconfig-mcs/default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-mcs/default_contexts 2008-08-11 16:39:48.000000000 -0400 @@ -2,7 +2,7 @@ system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 system_r:remote_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0 @@ -89,23 +89,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con system_r:xdm_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0 staff_r:staff_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.3/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.4/config/appconfig-mcs/failsafe_context --- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.3/config/appconfig-mcs/failsafe_context 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-mcs/failsafe_context 2008-08-11 16:39:48.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.3/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.4/config/appconfig-mcs/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/config/appconfig-mcs/guest_u_default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-mcs/guest_u_default_contexts 2008-08-11 16:39:48.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_crond_t:s0 -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.3/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.4/config/appconfig-mcs/root_default_contexts --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.3/config/appconfig-mcs/root_default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-mcs/root_default_contexts 2008-08-11 16:39:48.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:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 @@ -119,40 +119,40 @@ 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/userhelper_context serefpolicy-3.5.3/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.4/config/appconfig-mcs/userhelper_context --- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.3/config/appconfig-mcs/userhelper_context 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-mcs/userhelper_context 2008-08-11 16:39:48.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.3/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.4/config/appconfig-mcs/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/config/appconfig-mcs/xguest_u_default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-mcs/xguest_u_default_contexts 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,5 @@ +system_r:local_login_t xguest_r:xguest_t:s0 +system_r:remote_login_t xguest_r:xguest_t:s0 +system_r:sshd_t xguest_r:xguest_t:s0 +system_r:crond_t xguest_r:xguest_crond_t:s0 +system_r:xdm_t xguest_r:xguest_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.3/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.4/config/appconfig-mls/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/config/appconfig-mls/guest_u_default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-mls/guest_u_default_contexts 2008-08-11 16:39:48.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_crond_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.3/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.4/config/appconfig-standard/guest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/config/appconfig-standard/guest_u_default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-standard/guest_u_default_contexts 2008-08-11 16:39:48.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.3/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.4/config/appconfig-standard/root_default_contexts --- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.3/config/appconfig-standard/root_default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-standard/root_default_contexts 2008-08-11 16:39:48.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 @@ -166,18 +166,18 @@ 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/xguest_u_default_contexts serefpolicy-3.5.3/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.4/config/appconfig-standard/xguest_u_default_contexts --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/config/appconfig-standard/xguest_u_default_contexts 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/config/appconfig-standard/xguest_u_default_contexts 2008-08-11 16:39:48.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/man/man8/ftpd_selinux.8 serefpolicy-3.5.3/man/man8/ftpd_selinux.8 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.5.4/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.3/man/man8/ftpd_selinux.8 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/man/man8/ftpd_selinux.8 2008-08-11 16:39:48.000000000 -0400 @@ -1,52 +1,65 @@ -.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh@redhat.com" "ftpd Selinux Policy documentation" +.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh@redhat.com" "ftpd SELinux policy documentation" @@ -282,9 +282,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man +.PP +selinux(8), ftpd(8), setsebool(8), semanage(8), restorecon(8) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.5.3/man/man8/httpd_selinux.8 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.5.4/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 2008-08-07 11:15:14.000000000 -0400 -+++ serefpolicy-3.5.3/man/man8/httpd_selinux.8 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/man/man8/httpd_selinux.8 2008-08-11 16:39:48.000000000 -0400 @@ -22,23 +22,19 @@ .EX httpd_sys_content_t @@ -314,9 +314,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man .EX httpd_unconfined_script_exec_t .EE -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.3/policy/global_tunables +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.4/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/global_tunables 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/global_tunables 2008-08-11 16:39:48.000000000 -0400 @@ -34,7 +34,7 @@ ## @@ -355,9 +355,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/modules/admin/alsa.te serefpolicy-3.5.3/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.4/policy/modules/admin/alsa.te --- nsaserefpolicy/policy/modules/admin/alsa.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/alsa.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/alsa.te 2008-08-11 16:39:48.000000000 -0400 @@ -51,6 +51,8 @@ auth_use_nsswitch(alsa_t) @@ -367,9 +367,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.3/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.4/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/amanda.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/amanda.te 2008-08-11 16:39:48.000000000 -0400 @@ -223,6 +223,7 @@ auth_use_nsswitch(amanda_recover_t) @@ -378,9 +378,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(amanda_recover_t) libs_use_shared_libs(amanda_recover_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.3/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.4/policy/modules/admin/anaconda.te --- nsaserefpolicy/policy/modules/admin/anaconda.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/anaconda.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/anaconda.te 2008-08-11 16:39:48.000000000 -0400 @@ -31,6 +31,7 @@ modutils_domtrans_insmod(anaconda_t) @@ -389,9 +389,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/bootloader.if serefpolicy-3.5.3/policy/modules/admin/bootloader.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.if serefpolicy-3.5.4/policy/modules/admin/bootloader.if --- nsaserefpolicy/policy/modules/admin/bootloader.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/bootloader.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/bootloader.if 2008-08-11 16:39:48.000000000 -0400 @@ -49,6 +49,11 @@ role $2 types bootloader_t; @@ -404,9 +404,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/bootloader.te serefpolicy-3.5.3/policy/modules/admin/bootloader.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-3.5.4/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/bootloader.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/bootloader.te 2008-08-11 16:39:48.000000000 -0400 @@ -218,3 +218,7 @@ optional_policy(` sysadm_dontaudit_search_home_dirs(bootloader_t) @@ -415,21 +415,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + unconfined_domain(bootloader_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.5.3/policy/modules/admin/brctl.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.5.4/policy/modules/admin/brctl.te --- nsaserefpolicy/policy/modules/admin/brctl.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/brctl.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/brctl.te 2008-08-11 16:58:10.000000000 -0400 @@ -33,6 +33,8 @@ files_read_etc_files(brctl_t) -+term_use_console(brctl_t) ++term_dontaudit_use_console(brctl_t) + libs_use_ld_so(brctl_t) libs_use_shared_libs(brctl_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.3/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.4/policy/modules/admin/certwatch.te --- nsaserefpolicy/policy/modules/admin/certwatch.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/certwatch.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/certwatch.te 2008-08-11 16:39:48.000000000 -0400 @@ -15,8 +15,19 @@ # # Local policy @@ -466,9 +466,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.3/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.4/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/consoletype.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/consoletype.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,9 +8,11 @@ type consoletype_t; @@ -492,9 +492,9 @@ 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.if serefpolicy-3.5.3/policy/modules/admin/firstboot.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-3.5.4/policy/modules/admin/firstboot.if --- nsaserefpolicy/policy/modules/admin/firstboot.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/firstboot.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/firstboot.if 2008-08-11 16:39:48.000000000 -0400 @@ -141,4 +141,6 @@ ') @@ -502,9 +502,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + dontaudit $1 firstboot_t:unix_stream_socket { read write }; + ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.5.3/policy/modules/admin/firstboot.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.5.4/policy/modules/admin/firstboot.te --- nsaserefpolicy/policy/modules/admin/firstboot.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/firstboot.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/firstboot.te 2008-08-11 16:39:48.000000000 -0400 @@ -35,9 +35,6 @@ allow firstboot_t firstboot_etc_t:file { getattr read }; @@ -551,9 +551,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol - domain_auto_trans(firstboot_t, xserver_exec_t, xdm_xserver_t) -') ') dnl end TODO -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.5.3/policy/modules/admin/kudzu.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-3.5.4/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/kudzu.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/kudzu.te 2008-08-11 16:39:48.000000000 -0400 @@ -21,8 +21,8 @@ # Local policy # @@ -612,9 +612,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -') -allow kudzu_t cupsd_rw_etc_t:dir list_dir_perms; -') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.5.3/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.4/policy/modules/admin/logrotate.te --- nsaserefpolicy/policy/modules/admin/logrotate.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/logrotate.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/logrotate.te 2008-08-11 16:39:48.000000000 -0400 @@ -97,6 +97,7 @@ files_read_etc_files(logrotate_t) files_read_etc_runtime_files(logrotate_t) @@ -642,9 +642,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.3/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.4/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/logwatch.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/logwatch.te 2008-08-11 16:39:48.000000000 -0400 @@ -54,18 +54,19 @@ domain_read_all_domains_state(logwatch_t) @@ -674,9 +674,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.3/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.4/policy/modules/admin/mrtg.te --- nsaserefpolicy/policy/modules/admin/mrtg.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/mrtg.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/mrtg.te 2008-08-11 16:39:48.000000000 -0400 @@ -78,6 +78,7 @@ dev_read_urand(mrtg_t) @@ -734,9 +734,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.3/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.4/policy/modules/admin/netutils.if --- nsaserefpolicy/policy/modules/admin/netutils.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/netutils.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/netutils.if 2008-08-11 16:39:48.000000000 -0400 @@ -70,7 +70,7 @@ ######################################## @@ -827,9 +827,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.3/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.4/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/netutils.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/netutils.te 2008-08-11 16:39:48.000000000 -0400 @@ -50,6 +50,7 @@ files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir }) @@ -949,9 +949,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.3/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.4/policy/modules/admin/prelink.te --- nsaserefpolicy/policy/modules/admin/prelink.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/prelink.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/prelink.te 2008-08-11 16:39:48.000000000 -0400 @@ -26,7 +26,7 @@ # Local policy # @@ -1009,9 +1009,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/rpm.fc serefpolicy-3.5.3/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.4/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/rpm.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/rpm.fc 2008-08-11 16:39:48.000000000 -0400 @@ -11,7 +11,8 @@ /usr/sbin/system-install-packages -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -1040,9 +1040,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.3/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.4/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/rpm.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/rpm.if 2008-08-11 16:39:48.000000000 -0400 @@ -152,6 +152,24 @@ ######################################## @@ -1330,9 +1330,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + dontaudit $1 rpm_var_run_t:file write_file_perms; +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.5.3/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.4/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/rpm.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/rpm.te 2008-08-11 16:39:48.000000000 -0400 @@ -31,6 +31,9 @@ files_type(rpm_var_lib_t) typealias rpm_var_lib_t alias var_lib_rpm_t; @@ -1419,9 +1419,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.3/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.4/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/su.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/su.if 2008-08-11 16:39:48.000000000 -0400 @@ -41,15 +41,13 @@ allow $2 $1_su_t:process signal; @@ -1549,9 +1549,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.3/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.4/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/sudo.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/sudo.if 2008-08-11 16:39:48.000000000 -0400 @@ -55,7 +55,7 @@ # @@ -1664,9 +1664,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.3/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.4/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/tmpreaper.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/tmpreaper.te 2008-08-11 16:39:48.000000000 -0400 @@ -22,12 +22,16 @@ dev_read_urand(tmpreaper_t) @@ -1711,9 +1711,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.3/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.4/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/usermanage.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/usermanage.te 2008-08-11 16:39:48.000000000 -0400 @@ -97,6 +97,7 @@ # allow checking if a shell is executable @@ -1784,9 +1784,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.te serefpolicy-3.5.3/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.4/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/vbetool.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/vbetool.te 2008-08-11 16:39:48.000000000 -0400 @@ -23,6 +23,9 @@ dev_rwx_zero(vbetool_t) dev_read_sysfs(vbetool_t) @@ -1806,9 +1806,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.3/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.4/policy/modules/admin/vpn.if --- nsaserefpolicy/policy/modules/admin/vpn.if 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/vpn.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/vpn.if 2008-08-11 16:39:48.000000000 -0400 @@ -48,6 +48,7 @@ vpn_domtrans($1) role $2 types vpnc_t; @@ -1817,9 +1817,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.3/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.4/policy/modules/admin/vpn.te --- nsaserefpolicy/policy/modules/admin/vpn.te 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/admin/vpn.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/admin/vpn.te 2008-08-11 16:39:48.000000000 -0400 @@ -22,9 +22,10 @@ # Local policy # @@ -1841,18 +1841,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.3/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.4/policy/modules/apps/ethereal.fc --- nsaserefpolicy/policy/modules/apps/ethereal.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/ethereal.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/ethereal.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/apps/ethereal.if --- nsaserefpolicy/policy/modules/apps/ethereal.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/ethereal.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/ethereal.if 2008-08-11 16:39:48.000000000 -0400 @@ -35,6 +35,7 @@ template(`ethereal_per_role_template',` @@ -1956,9 +1956,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.3/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.4/policy/modules/apps/ethereal.te --- nsaserefpolicy/policy/modules/apps/ethereal.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/ethereal.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/ethereal.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,13 @@ type tethereal_tmp_t; files_tmp_file(tethereal_tmp_t) @@ -1973,9 +1973,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.3/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.4/policy/modules/apps/games.if --- nsaserefpolicy/policy/modules/apps/games.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/games.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/games.if 2008-08-11 16:39:48.000000000 -0400 @@ -130,10 +130,10 @@ sysnet_read_config($1_games_t) @@ -2015,10 +2015,10 @@ 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.3/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.4/policy/modules/apps/gnome.fc --- nsaserefpolicy/policy/modules/apps/gnome.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/gnome.fc 2008-08-07 16:06:08.000000000 -0400 -@@ -1,8 +1,9 @@ ++++ serefpolicy-3.5.4/policy/modules/apps/gnome.fc 2008-08-11 16:39:48.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) +HOME_DIR/.gnome2(/.*)? gen_context(system_u:object_r:gnome_home_t,s0) @@ -2034,9 +2034,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -/usr/libexec/gconfd-2 -- gen_context(system_u:object_r:gconfd_exec_t,s0) +# Don't use because toolchain is broken +#/usr/libexec/gconfd-2 -- gen_context(system_u:object_r:gconfd_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.5.3/policy/modules/apps/gnome.if ++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.4/policy/modules/apps/gnome.if --- nsaserefpolicy/policy/modules/apps/gnome.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/gnome.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/gnome.if 2008-08-11 16:39:48.000000000 -0400 @@ -36,6 +36,7 @@ gen_require(` type gconfd_exec_t, gconf_etc_t; @@ -2238,9 +2239,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + can_exec($1, gconfd_exec_t) ') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.5.3/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.4/policy/modules/apps/gnome.te --- nsaserefpolicy/policy/modules/apps/gnome.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/gnome.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/gnome.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,8 +8,34 @@ attribute gnomedomain; @@ -2279,9 +2280,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.3/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.4/policy/modules/apps/gpg.fc --- nsaserefpolicy/policy/modules/apps/gpg.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/gpg.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/gpg.fc 2008-08-11 16:39:48.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) @@ -2296,9 +2297,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.3/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.4/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/gpg.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/gpg.if 2008-08-11 16:39:48.000000000 -0400 @@ -37,6 +37,9 @@ template(`gpg_per_role_template',` gen_require(` @@ -2635,9 +2636,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.3/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.4/policy/modules/apps/gpg.te --- nsaserefpolicy/policy/modules/apps/gpg.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/gpg.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/gpg.te 2008-08-11 16:39:48.000000000 -0400 @@ -15,15 +15,248 @@ gen_tunable(gpg_agent_env_file, false) @@ -2891,9 +2892,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.3/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.4/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/java.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/java.fc 2008-08-11 16:39:48.000000000 -0400 @@ -3,14 +3,15 @@ # /opt/(.*/)?bin/java[^/]* -- gen_context(system_u:object_r:java_exec_t,s0) @@ -2925,9 +2926,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.3/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.4/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/java.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/java.if 2008-08-11 16:39:48.000000000 -0400 @@ -32,7 +32,7 @@ ## ## @@ -3183,9 +3184,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow java_t $3:chr_file rw_term_perms; +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.5.3/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.4/policy/modules/apps/java.te --- nsaserefpolicy/policy/modules/apps/java.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/java.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/java.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,16 +6,10 @@ # Declarations # @@ -3235,15 +3236,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + xserver_xdm_rw_shm(java_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.5.3/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.4/policy/modules/apps/livecd.fc --- nsaserefpolicy/policy/modules/apps/livecd.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/livecd.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/livecd.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/apps/livecd.if --- nsaserefpolicy/policy/modules/apps/livecd.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/livecd.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/livecd.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,56 @@ + +## policy for livecd @@ -3301,9 +3302,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.3/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.4/policy/modules/apps/livecd.te --- nsaserefpolicy/policy/modules/apps/livecd.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/livecd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/livecd.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,26 @@ +policy_module(livecd, 1.0.0) + @@ -3331,9 +3332,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.3/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.4/policy/modules/apps/loadkeys.te --- nsaserefpolicy/policy/modules/apps/loadkeys.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/loadkeys.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/loadkeys.te 2008-08-11 16:39:48.000000000 -0400 @@ -32,7 +32,6 @@ term_dontaudit_use_console(loadkeys_t) term_use_unallocated_ttys(loadkeys_t) @@ -3350,9 +3351,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.3/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.4/policy/modules/apps/mono.if --- nsaserefpolicy/policy/modules/apps/mono.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mono.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mono.if 2008-08-11 16:39:48.000000000 -0400 @@ -21,7 +21,106 @@ ######################################## @@ -3470,9 +3471,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.3/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.4/policy/modules/apps/mono.te --- nsaserefpolicy/policy/modules/apps/mono.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mono.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mono.te 2008-08-11 16:39:48.000000000 -0400 @@ -15,7 +15,7 @@ # Local policy # @@ -3490,9 +3491,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + xserver_xdm_rw_shm(mono_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.5.3/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.4/policy/modules/apps/mozilla.fc --- nsaserefpolicy/policy/modules/apps/mozilla.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mozilla.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mozilla.fc 2008-08-11 16:39:48.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) @@ -3521,9 +3522,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.3/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.4/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mozilla.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mozilla.if 2008-08-11 16:39:48.000000000 -0400 @@ -35,7 +35,10 @@ template(`mozilla_per_role_template',` gen_require(` @@ -3993,9 +3994,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.3/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.4/policy/modules/apps/mozilla.te --- nsaserefpolicy/policy/modules/apps/mozilla.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mozilla.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mozilla.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,15 +6,20 @@ # Declarations # @@ -4024,18 +4025,18 @@ 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.3/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.4/policy/modules/apps/mplayer.fc --- nsaserefpolicy/policy/modules/apps/mplayer.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mplayer.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mplayer.fc 2008-08-11 16:39:48.000000000 -0400 @@ -10,4 +10,4 @@ /usr/bin/mencoder -- gen_context(system_u:object_r:mencoder_exec_t,s0) /usr/bin/xine -- gen_context(system_u:object_r:mplayer_exec_t,s0) -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.3/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.4/policy/modules/apps/mplayer.if --- nsaserefpolicy/policy/modules/apps/mplayer.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mplayer.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mplayer.if 2008-08-11 16:39:48.000000000 -0400 @@ -34,7 +34,8 @@ # template(`mplayer_per_role_template',` @@ -4178,9 +4179,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.3/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.4/policy/modules/apps/mplayer.te --- nsaserefpolicy/policy/modules/apps/mplayer.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/mplayer.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/mplayer.te 2008-08-11 16:39:48.000000000 -0400 @@ -22,3 +22,7 @@ type mplayer_exec_t; corecmd_executable_file(mplayer_exec_t) @@ -4189,9 +4190,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.3/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.4/policy/modules/apps/nsplugin.fc --- nsaserefpolicy/policy/modules/apps/nsplugin.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/nsplugin.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/nsplugin.fc 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,8 @@ + +/usr/lib(64)?/nspluginwrapper/npviewer.bin -- gen_context(system_u:object_r:nsplugin_exec_t,s0) @@ -4201,9 +4202,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.3/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.4/policy/modules/apps/nsplugin.if --- nsaserefpolicy/policy/modules/apps/nsplugin.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/nsplugin.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/nsplugin.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,290 @@ + +## policy for nsplugin @@ -4495,9 +4496,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.3/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.4/policy/modules/apps/nsplugin.te --- nsaserefpolicy/policy/modules/apps/nsplugin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/nsplugin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/nsplugin.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,217 @@ + +policy_module(nsplugin, 1.0.0) @@ -4716,16 +4717,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.3/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.4/policy/modules/apps/openoffice.fc --- nsaserefpolicy/policy/modules/apps/openoffice.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/openoffice.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/openoffice.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/apps/openoffice.if --- nsaserefpolicy/policy/modules/apps/openoffice.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/openoffice.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/openoffice.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,102 @@ +## Openoffice + @@ -4829,9 +4830,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + fs_dontaudit_rw_tmpfs_files($1_openoffice_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.5.3/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.4/policy/modules/apps/openoffice.te --- nsaserefpolicy/policy/modules/apps/openoffice.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/apps/openoffice.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/openoffice.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,14 @@ + +policy_module(openoffice, 1.0.0) @@ -4847,17 +4848,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.3/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.4/policy/modules/apps/podsleuth.fc --- nsaserefpolicy/policy/modules/apps/podsleuth.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/podsleuth.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/podsleuth.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/apps/podsleuth.if --- nsaserefpolicy/policy/modules/apps/podsleuth.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/podsleuth.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/podsleuth.if 2008-08-11 16:39:48.000000000 -0400 @@ -16,4 +16,38 @@ ') @@ -4897,9 +4898,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.3/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.4/policy/modules/apps/podsleuth.te --- nsaserefpolicy/policy/modules/apps/podsleuth.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/podsleuth.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/podsleuth.te 2008-08-11 16:39:48.000000000 -0400 @@ -11,24 +11,55 @@ application_domain(podsleuth_t, podsleuth_exec_t) role system_r types podsleuth_t; @@ -4958,9 +4959,9 @@ 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.if serefpolicy-3.5.3/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.4/policy/modules/apps/qemu.if --- nsaserefpolicy/policy/modules/apps/qemu.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/qemu.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/qemu.if 2008-08-11 16:39:48.000000000 -0400 @@ -104,7 +104,71 @@ ######################################## @@ -5228,9 +5229,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $3 $1:fifo_file rw_fifo_file_perms; + allow $3 $1:process sigchld; ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.3/policy/modules/apps/qemu.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.4/policy/modules/apps/qemu.te --- nsaserefpolicy/policy/modules/apps/qemu.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/qemu.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/qemu.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -5367,9 +5368,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.3/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.4/policy/modules/apps/screen.fc --- nsaserefpolicy/policy/modules/apps/screen.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/screen.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/screen.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,7 +1,7 @@ # # /home @@ -5379,9 +5380,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.3/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.4/policy/modules/apps/screen.if --- nsaserefpolicy/policy/modules/apps/screen.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/screen.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/screen.if 2008-08-11 16:39:48.000000000 -0400 @@ -35,6 +35,7 @@ template(`screen_per_role_template',` gen_require(` @@ -5434,9 +5435,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.3/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.4/policy/modules/apps/screen.te --- nsaserefpolicy/policy/modules/apps/screen.te 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/screen.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/screen.te 2008-08-11 16:39:48.000000000 -0400 @@ -11,3 +11,7 @@ type screen_exec_t; @@ -5445,18 +5446,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.3/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.4/policy/modules/apps/thunderbird.fc --- nsaserefpolicy/policy/modules/apps/thunderbird.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/thunderbird.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/thunderbird.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/apps/thunderbird.if --- nsaserefpolicy/policy/modules/apps/thunderbird.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/thunderbird.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/thunderbird.if 2008-08-11 16:39:48.000000000 -0400 @@ -43,9 +43,9 @@ application_domain($1_thunderbird_t, thunderbird_exec_t) role $3 types $1_thunderbird_t; @@ -5528,9 +5529,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.3/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.4/policy/modules/apps/thunderbird.te --- nsaserefpolicy/policy/modules/apps/thunderbird.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/thunderbird.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/thunderbird.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,3 +8,7 @@ type thunderbird_exec_t; @@ -5539,9 +5540,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.3/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.4/policy/modules/apps/tvtime.if --- nsaserefpolicy/policy/modules/apps/tvtime.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/tvtime.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/tvtime.if 2008-08-11 16:39:48.000000000 -0400 @@ -35,6 +35,7 @@ template(`tvtime_per_role_template',` gen_require(` @@ -5609,9 +5610,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.3/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.4/policy/modules/apps/tvtime.te --- nsaserefpolicy/policy/modules/apps/tvtime.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/tvtime.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/tvtime.te 2008-08-11 16:39:48.000000000 -0400 @@ -11,3 +11,9 @@ type tvtime_dir_t; @@ -5622,9 +5623,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.3/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.4/policy/modules/apps/uml.fc --- nsaserefpolicy/policy/modules/apps/uml.fc 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/uml.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/uml.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,7 +1,7 @@ # # HOME_DIR/ @@ -5634,9 +5635,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.3/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.4/policy/modules/apps/vmware.fc --- nsaserefpolicy/policy/modules/apps/vmware.fc 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/vmware.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/vmware.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,9 +1,9 @@ # # HOME_DIR/ @@ -5695,9 +5696,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.3/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.4/policy/modules/apps/vmware.if --- nsaserefpolicy/policy/modules/apps/vmware.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/vmware.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/vmware.if 2008-08-11 16:39:48.000000000 -0400 @@ -47,11 +47,8 @@ domain_entry_file($1_vmware_t, vmware_exec_t) role $3 types $1_vmware_t; @@ -5727,9 +5728,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.3/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.4/policy/modules/apps/vmware.te --- nsaserefpolicy/policy/modules/apps/vmware.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/vmware.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/vmware.te 2008-08-11 16:39:48.000000000 -0400 @@ -10,14 +10,14 @@ type vmware_exec_t; corecmd_executable_file(vmware_exec_t) @@ -5800,9 +5801,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/wine.if serefpolicy-3.5.3/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.4/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 2008-08-07 11:15:02.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/wine.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/wine.if 2008-08-11 16:39:48.000000000 -0400 @@ -49,3 +49,53 @@ role $2 types wine_t; allow wine_t $3:chr_file rw_term_perms; @@ -5857,9 +5858,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + xserver_xdm_rw_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.3/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.4/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/wine.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/wine.te 2008-08-11 16:39:48.000000000 -0400 @@ -9,6 +9,7 @@ type wine_t; type wine_exec_t; @@ -5886,9 +5887,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + xserver_xdm_rw_shm(wine_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wireshark.if serefpolicy-3.5.3/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.4/policy/modules/apps/wireshark.if --- nsaserefpolicy/policy/modules/apps/wireshark.if 2008-08-07 11:15:03.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/apps/wireshark.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/apps/wireshark.if 2008-08-11 16:39:48.000000000 -0400 @@ -134,7 +134,7 @@ sysnet_read_config($1_wireshark_t) @@ -5898,9 +5899,9 @@ 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/kernel/corecommands.fc serefpolicy-3.5.3/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.4/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/corecommands.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/corecommands.fc 2008-08-11 16:39:48.000000000 -0400 @@ -129,6 +129,8 @@ /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0) ') @@ -5937,9 +5938,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.3/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.4/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/corecommands.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/corecommands.if 2008-08-11 16:39:48.000000000 -0400 @@ -894,6 +894,7 @@ read_lnk_files_pattern($1, bin_t, bin_t) @@ -5948,9 +5949,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.3/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/corenetwork.te.in 2008-08-07 16:06: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.4/policy/modules/kernel/corenetwork.te.in +--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2008-08-11 11:23:34.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/corenetwork.te.in 2008-08-11 16:39:48.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) @@ -5975,13 +5976,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol network_port(ftp_data, tcp,20,s0) network_port(ftp, tcp,21,s0) network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0) -@@ -109,19 +112,24 @@ - network_port(ircd, tcp,6667,s0) - network_port(isakmp, udp,500,s0) - network_port(iscsi, tcp,3260,s0) -+network_port(isns, tcp,3205,s0, udp,3205,s0) - network_port(jabber_client, tcp,5222,s0, tcp,5223,s0) - network_port(jabber_interserver, tcp,5269,s0) +@@ -115,14 +118,18 @@ network_port(kerberos_admin, tcp,464,s0, udp,464,s0, tcp,749,s0) network_port(kerberos_master, tcp,4444,s0, udp,4444,s0) network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0) @@ -6000,7 +5995,7 @@ 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) -@@ -133,10 +141,13 @@ +@@ -134,10 +141,13 @@ network_port(pegasus_http, tcp,5988,s0) network_port(pegasus_https, tcp,5989,s0) network_port(postfix_policyd, tcp,10031,s0) @@ -6014,7 +6009,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) -@@ -148,11 +159,11 @@ +@@ -149,11 +159,11 @@ network_port(ricci_modcluster, tcp,16851,s0, udp,16851,s0) network_port(rlogind, tcp,513,s0) network_port(rndc, tcp,953,s0) @@ -6028,7 +6023,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0) network_port(snmp, udp,161,s0, udp,162,s0, tcp,199,s0) network_port(spamd, tcp,783,s0) -@@ -165,12 +176,17 @@ +@@ -166,12 +176,17 @@ network_port(syslogd, udp,514,s0) network_port(telnetd, tcp,23,s0) network_port(tftp, udp,69,s0) @@ -6047,9 +6042,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol network_port(wccp, udp,2048,s0) network_port(xdmcp, udp,177,s0, tcp,177,s0) network_port(xen, tcp,8002,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.3/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.4/policy/modules/kernel/devices.fc --- nsaserefpolicy/policy/modules/kernel/devices.fc 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/devices.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/devices.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,7 +1,7 @@ /dev -d gen_context(system_u:object_r:device_t,s0) @@ -6169,9 +6164,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.3/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.4/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/devices.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/devices.if 2008-08-11 16:39:48.000000000 -0400 @@ -65,7 +65,7 @@ relabelfrom_dirs_pattern($1, device_t, device_node) @@ -6639,9 +6634,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.3/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.4/policy/modules/kernel/devices.te --- nsaserefpolicy/policy/modules/kernel/devices.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/devices.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/devices.te 2008-08-11 16:39:48.000000000 -0400 @@ -32,6 +32,12 @@ type apm_bios_t; dev_node(apm_bios_t) @@ -6707,9 +6702,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.3/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.4/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/domain.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/domain.if 2008-08-11 16:39:48.000000000 -0400 @@ -1247,18 +1247,34 @@ ## ## @@ -6748,9 +6743,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.3/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.4/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/domain.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/domain.te 2008-08-11 16:39:48.000000000 -0400 @@ -5,6 +5,13 @@ # # Declarations @@ -6831,9 +6826,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.3/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.4/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/files.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/files.fc 2008-08-11 16:39:48.000000000 -0400 @@ -32,6 +32,7 @@ /boot/lost\+found -d gen_context(system_u:object_r:lost_found_t,mls_systemhigh) /boot/lost\+found/.* <> @@ -6842,9 +6837,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.3/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.4/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/files.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/files.if 2008-08-11 16:39:48.000000000 -0400 @@ -110,6 +110,11 @@ ## # @@ -7136,9 +7131,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + filetrans_pattern($1, root_t, default_t, dir) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.5.3/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.4/policy/modules/kernel/files.te --- nsaserefpolicy/policy/modules/kernel/files.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/files.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/files.te 2008-08-11 16:39:48.000000000 -0400 @@ -52,11 +52,14 @@ # # etc_t is the type of the system etc directories. @@ -7175,9 +7170,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.3/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.4/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/filesystem.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/filesystem.if 2008-08-11 16:39:48.000000000 -0400 @@ -310,6 +310,25 @@ ######################################## @@ -7584,9 +7579,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.3/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.4/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/filesystem.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/filesystem.te 2008-08-11 16:39:48.000000000 -0400 @@ -21,7 +21,6 @@ # Use xattrs for the following filesystem types. @@ -7615,9 +7610,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.3/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.4/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/kernel.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/kernel.if 2008-08-11 16:39:48.000000000 -0400 @@ -1198,6 +1198,7 @@ ') @@ -7659,9 +7654,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.3/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.4/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/kernel.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/kernel.te 2008-08-11 16:39:48.000000000 -0400 @@ -63,6 +63,15 @@ genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0) @@ -7695,9 +7690,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.3/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.4/policy/modules/kernel/selinux.if --- nsaserefpolicy/policy/modules/kernel/selinux.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/selinux.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/selinux.if 2008-08-11 16:39:48.000000000 -0400 @@ -164,6 +164,7 @@ type security_t; ') @@ -7816,9 +7811,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.3/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.4/policy/modules/kernel/selinux.te --- nsaserefpolicy/policy/modules/kernel/selinux.te 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/selinux.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/selinux.te 2008-08-11 16:39:48.000000000 -0400 @@ -10,6 +10,7 @@ attribute can_setenforce; attribute can_setsecparam; @@ -7839,9 +7834,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.if serefpolicy-3.5.3/policy/modules/kernel/storage.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.5.4/policy/modules/kernel/storage.if --- nsaserefpolicy/policy/modules/kernel/storage.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/storage.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/storage.if 2008-08-11 16:39:48.000000000 -0400 @@ -81,6 +81,26 @@ ######################################## @@ -7879,9 +7874,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/terminal.if serefpolicy-3.5.3/policy/modules/kernel/terminal.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.5.4/policy/modules/kernel/terminal.if --- nsaserefpolicy/policy/modules/kernel/terminal.if 2008-08-07 11:15:01.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/kernel/terminal.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/kernel/terminal.if 2008-08-11 16:39:48.000000000 -0400 @@ -525,11 +525,13 @@ interface(`term_use_generic_ptys',` gen_require(` @@ -7908,14 +7903,14 @@ 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/guest.fc serefpolicy-3.5.3/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.4/policy/modules/roles/guest.fc --- nsaserefpolicy/policy/modules/roles/guest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/guest.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/guest.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/roles/guest.if --- nsaserefpolicy/policy/modules/roles/guest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/guest.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/guest.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,161 @@ +## Least privledge terminal user role + @@ -8078,9 +8073,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.3/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.4/policy/modules/roles/guest.te --- nsaserefpolicy/policy/modules/roles/guest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/guest.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/guest.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,44 @@ + +policy_module(guest, 1.0.0) @@ -8126,14 +8121,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + domtrans_pattern(xguest_mozilla_t, openoffice_exec_t, xguest_openoffice_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.5.3/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.4/policy/modules/roles/logadm.fc --- nsaserefpolicy/policy/modules/roles/logadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/logadm.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/logadm.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/roles/logadm.if --- nsaserefpolicy/policy/modules/roles/logadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/logadm.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/logadm.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,44 @@ +## Audit administrator role + @@ -8179,9 +8174,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.3/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.4/policy/modules/roles/logadm.te --- nsaserefpolicy/policy/modules/roles/logadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/logadm.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/logadm.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,20 @@ + +policy_module(logadm, 1.0.0) @@ -8203,9 +8198,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.3/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.4/policy/modules/roles/staff.te --- nsaserefpolicy/policy/modules/roles/staff.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/roles/staff.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/staff.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,18 +8,34 @@ role staff_r; @@ -8257,9 +8252,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.3/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.4/policy/modules/roles/sysadm.if --- nsaserefpolicy/policy/modules/roles/sysadm.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/roles/sysadm.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/sysadm.if 2008-08-11 16:39:48.000000000 -0400 @@ -334,10 +334,10 @@ # interface(`sysadm_getattr_home_dirs',` @@ -8419,9 +8414,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.if serefpolicy-3.5.3/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.4/policy/modules/roles/unprivuser.if --- nsaserefpolicy/policy/modules/roles/unprivuser.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/roles/unprivuser.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/unprivuser.if 2008-08-11 16:39:48.000000000 -0400 @@ -62,6 +62,26 @@ files_home_filetrans($1, user_home_dir_t, dir) ') @@ -9038,9 +9033,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.3/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.4/policy/modules/roles/unprivuser.te --- nsaserefpolicy/policy/modules/roles/unprivuser.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/roles/unprivuser.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/unprivuser.te 2008-08-11 16:39:48.000000000 -0400 @@ -13,3 +13,23 @@ userdom_unpriv_user_template(user) @@ -9065,14 +9060,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.3/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.4/policy/modules/roles/webadm.fc --- nsaserefpolicy/policy/modules/roles/webadm.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/webadm.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/webadm.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/roles/webadm.if --- nsaserefpolicy/policy/modules/roles/webadm.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/webadm.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/webadm.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,44 @@ +## Policy for webadm role + @@ -9118,9 +9113,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.3/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.4/policy/modules/roles/webadm.te --- nsaserefpolicy/policy/modules/roles/webadm.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/webadm.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/webadm.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,65 @@ + +policy_module(webadm, 1.0.0) @@ -9187,14 +9182,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.3/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.4/policy/modules/roles/xguest.fc --- nsaserefpolicy/policy/modules/roles/xguest.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/xguest.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/xguest.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/roles/xguest.if --- nsaserefpolicy/policy/modules/roles/xguest.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/xguest.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/xguest.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,161 @@ +## Least privledge X Windows user role + @@ -9357,9 +9352,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.3/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.4/policy/modules/roles/xguest.te --- nsaserefpolicy/policy/modules/roles/xguest.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/roles/xguest.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/roles/xguest.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,83 @@ + +policy_module(xguest, 1.0.0) @@ -9444,9 +9439,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/aide.if serefpolicy-3.5.3/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.4/policy/modules/services/aide.if --- nsaserefpolicy/policy/modules/services/aide.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/aide.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/aide.if 2008-08-11 16:39:48.000000000 -0400 @@ -70,9 +70,11 @@ allow $1 aide_t:process { ptrace signal_perms }; ps_process_pattern($1, aide_t) @@ -9455,15 +9450,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_list_etc($1) - manage_files_pattern($1, aide_db_t, aide_db_t) -+ manage_all_pattern($1, aide_db_t, aide_db_t) ++ admin_pattern($1, aide_db_t, aide_db_t) logging_list_logs($1) - manage_files_pattern($1, aide_log_t, aide_log_t) -+ manage_all_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.3/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.4/policy/modules/services/amavis.fc --- nsaserefpolicy/policy/modules/services/amavis.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/amavis.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/amavis.fc 2008-08-11 16:39:48.000000000 -0400 @@ -3,6 +3,7 @@ /etc/amavisd(/.*)? -- gen_context(system_u:object_r:amavis_etc_t,s0) @@ -9478,9 +9473,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.3/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.4/policy/modules/services/amavis.if --- nsaserefpolicy/policy/modules/services/amavis.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/amavis.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/amavis.if 2008-08-11 16:39:48.000000000 -0400 @@ -189,6 +189,25 @@ ######################################## @@ -9525,34 +9520,34 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_list_tmp($1) - manage_files_pattern($1, amavis_tmp_t, amavis_tmp_t) -+ manage_all_pattern($1, amavis_tmp_t, amavis_tmp_t) ++ admin_pattern($1, amavis_tmp_t, amavis_tmp_t) - manage_files_pattern($1, amavis_quarantine_t, amavis_quarantine_t) -+ manage_all_pattern($1, amavis_quarantine_t, amavis_quarantine_t) ++ admin_pattern($1, amavis_quarantine_t, amavis_quarantine_t) files_list_etc($1) - manage_files_pattern($1, amavis_etc_t, amavis_etc_t) -+ manage_all_pattern($1, amavis_etc_t, amavis_etc_t) ++ admin_pattern($1, amavis_etc_t, amavis_etc_t) logging_list_logs($1) - manage_files_pattern($1, amavis_var_log_t, amavis_var_log_t) -+ manage_all_pattern($1, amavis_var_log_t, amavis_var_log_t) ++ admin_pattern($1, amavis_var_log_t, amavis_var_log_t) files_list_spool($1) - manage_files_pattern($1, amavis_spool_t, amavis_spool_t) -+ manage_all_pattern($1, amavis_spool_t, amavis_spool_t) ++ admin_pattern($1, amavis_spool_t, amavis_spool_t) files_list_var_lib($1) - manage_files_pattern($1, amavis_var_lib_t, amavis_var_lib_t) -+ manage_all_pattern($1, amavis_var_lib_t, amavis_var_lib_t) ++ admin_pattern($1, amavis_var_lib_t, amavis_var_lib_t) files_list_pids($1) - manage_files_pattern($1, amavis_var_run_t, amavis_var_run_t) -+ manage_all_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.3/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.4/policy/modules/services/amavis.te --- nsaserefpolicy/policy/modules/services/amavis.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/amavis.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/amavis.te 2008-08-11 16:39:48.000000000 -0400 @@ -13,7 +13,7 @@ # configuration files @@ -9581,9 +9576,9 @@ 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.3/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.4/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/apache.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/apache.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,10 +1,10 @@ -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) @@ -9663,9 +9658,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/apache.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/apache.if 2008-08-11 16:39:48.000000000 -0400 @@ -13,21 +13,16 @@ # template(`apache_content_template',` @@ -10265,17 +10260,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + miscfiles_manage_public_files($1) + + files_search_etc($1) -+ manage_all_pattern($1, httpd_config_t) ++ admin_pattern($1, httpd_config_t) + + logging_search_logs($1) -+ manage_all_pattern($1, httpd_log_t) ++ admin_pattern($1, httpd_log_t) + -+ manage_all_pattern($1, httpd_modules_t) ++ admin_pattern($1, httpd_modules_t) + -+ manage_all_pattern($1, httpd_lock_t) ++ admin_pattern($1, httpd_lock_t) + files_lock_filetrans($1, httpd_lock_t, file) + -+ manage_all_pattern($1, httpd_var_run_t) ++ admin_pattern($1, httpd_var_run_t) + files_pid_filetrans($1, httpd_var_run_t, file) + + kernel_search_proc($1) @@ -10283,14 +10278,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + ps_process_pattern($1, httpd_t) + read_lnk_files_pattern($1, httpd_t, httpd_t) + -+ manage_all_pattern($1, httpdcontent) -+ manage_all_pattern($1, httpd_script_exec_type) ++ admin_pattern($1, httpdcontent) ++ admin_pattern($1, httpd_script_exec_type) + + seutil_domtrans_setfiles($1) + -+ manage_all_pattern($1, httpd_tmp_t) -+ manage_all_pattern($1, httpd_php_tmp_t) -+ manage_all_pattern($1, httpd_suexec_tmp_t) ++ admin_pattern($1, httpd_tmp_t) ++ admin_pattern($1, httpd_php_tmp_t) ++ admin_pattern($1, httpd_suexec_tmp_t) + files_tmp_filetrans($1, httpd_tmp_t, { file dir }) + +ifdef(`TODO',` @@ -10300,9 +10295,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow httpd_setsebool_t httpd_bool_t:file rw_file_perms; +') +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.3/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.4/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/apache.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/apache.te 2008-08-11 16:39:48.000000000 -0400 @@ -20,6 +20,8 @@ # Declarations # @@ -10901,18 +10896,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + postgresql_stream_connect(httpd_bugzilla_script_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-3.5.3/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.4/policy/modules/services/apcupsd.fc --- nsaserefpolicy/policy/modules/services/apcupsd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/apcupsd.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/apcupsd.fc 2008-08-11 16:39:48.000000000 -0400 @@ -13,3 +13,5 @@ /var/www/apcupsd/upsfstats\.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) /var/www/apcupsd/upsimage\.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) /var/www/apcupsd/upsstats\.cgi -- gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0) + +/etc/rc.d/init.d/apcupsd -- gen_context(system_u:object_r:apcupsd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-3.5.3/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.4/policy/modules/services/apcupsd.if --- nsaserefpolicy/policy/modules/services/apcupsd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/apcupsd.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/apcupsd.if 2008-08-11 16:39:48.000000000 -0400 @@ -90,10 +90,102 @@ ## ## @@ -11006,20 +11001,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, apcupsd_tmp_t) ++ admin_pattern($1, apcupsd_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, apcupsd_log_t) ++ admin_pattern($1, apcupsd_log_t) + + files_list_var($1) -+ manage_all_pattern($1, apcupsd_lock_t) ++ admin_pattern($1, apcupsd_lock_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/apcupsd.te --- nsaserefpolicy/policy/modules/services/apcupsd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/apcupsd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/apcupsd.te 2008-08-11 16:39:48.000000000 -0400 @@ -22,6 +22,9 @@ type apcupsd_var_run_t; files_pid_file(apcupsd_var_run_t) @@ -11042,18 +11037,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol optional_policy(` hostname_exec(apcupsd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.fc serefpolicy-3.5.3/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.4/policy/modules/services/arpwatch.fc --- nsaserefpolicy/policy/modules/services/arpwatch.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/arpwatch.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/arpwatch.fc 2008-08-11 16:39:48.000000000 -0400 @@ -9,3 +9,5 @@ # /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.3/policy/modules/services/arpwatch.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.if serefpolicy-3.5.4/policy/modules/services/arpwatch.if --- nsaserefpolicy/policy/modules/services/arpwatch.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/arpwatch.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/arpwatch.if 2008-08-11 16:39:48.000000000 -0400 @@ -90,3 +90,73 @@ dontaudit $1 arpwatch_t:packet_socket { read write }; @@ -11119,18 +11114,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, arpwatch_tmp_t) ++ admin_pattern($1, arpwatch_tmp_t) + + files_list_var($1) -+ manage_all_pattern($1, arpwatch_data_t) ++ admin_pattern($1, arpwatch_data_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/arpwatch.te --- nsaserefpolicy/policy/modules/services/arpwatch.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/arpwatch.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/arpwatch.te 2008-08-11 16:39:48.000000000 -0400 @@ -19,6 +19,9 @@ type arpwatch_var_run_t; files_pid_file(arpwatch_var_run_t) @@ -11141,17 +11136,17 @@ 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/services/asterisk.fc serefpolicy-3.5.3/policy/modules/services/asterisk.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.fc serefpolicy-3.5.4/policy/modules/services/asterisk.fc --- nsaserefpolicy/policy/modules/services/asterisk.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/asterisk.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/asterisk.fc 2008-08-11 16:39:48.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.3/policy/modules/services/asterisk.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.5.4/policy/modules/services/asterisk.if --- nsaserefpolicy/policy/modules/services/asterisk.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/asterisk.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/asterisk.if 2008-08-11 16:39:48.000000000 -0400 @@ -1 +1,83 @@ ## Asterisk IP telephony server + @@ -11218,27 +11213,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, asterisk_tmp_t) ++ admin_pattern($1, asterisk_tmp_t) + + files_list_etc($1) -+ manage_all_pattern($1, asterisk_etc_t) ++ admin_pattern($1, asterisk_etc_t) + + logging_list_logs($1) -+ manage_all_pattern($1, asterisk_log_t) ++ admin_pattern($1, asterisk_log_t) + + files_list_spool($1) -+ manage_all_pattern($1, asterisk_spool_t) ++ admin_pattern($1, asterisk_spool_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, asterisk_var_lib_t) ++ admin_pattern($1, asterisk_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/asterisk.te --- nsaserefpolicy/policy/modules/services/asterisk.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/asterisk.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/asterisk.te 2008-08-11 16:39:48.000000000 -0400 @@ -31,6 +31,9 @@ type asterisk_var_run_t; files_pid_file(asterisk_var_run_t) @@ -11249,9 +11244,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/services/automount.fc serefpolicy-3.5.3/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.4/policy/modules/services/automount.fc --- nsaserefpolicy/policy/modules/services/automount.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/automount.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/automount.fc 2008-08-11 16:39:48.000000000 -0400 @@ -12,4 +12,7 @@ # /var # @@ -11261,9 +11256,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.3/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.4/policy/modules/services/automount.if --- nsaserefpolicy/policy/modules/services/automount.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/automount.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/automount.if 2008-08-11 16:39:48.000000000 -0400 @@ -74,3 +74,109 @@ dontaudit $1 automount_tmp_t:dir getattr; @@ -11366,17 +11361,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_var($1) -+ manage_all_pattern($1, automount_lock_t) ++ admin_pattern($1, automount_lock_t) + + files_list_tmp($1) -+ manage_all_pattern($1, automount_tmp_t) ++ admin_pattern($1, automount_tmp_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/automount.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/automount.te 2008-08-11 16:39:48.000000000 -0400 @@ -20,6 +20,9 @@ files_tmp_file(automount_tmp_t) files_mountpoint(automount_tmp_t) @@ -11470,9 +11465,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/avahi.fc serefpolicy-3.5.3/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.4/policy/modules/services/avahi.fc --- nsaserefpolicy/policy/modules/services/avahi.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/avahi.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/avahi.fc 2008-08-11 16:39:48.000000000 -0400 @@ -3,3 +3,7 @@ /usr/sbin/avahi-dnsconfd -- gen_context(system_u:object_r:avahi_exec_t,s0) @@ -11481,9 +11476,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.3/policy/modules/services/avahi.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.5.4/policy/modules/services/avahi.if --- nsaserefpolicy/policy/modules/services/avahi.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/avahi.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/avahi.if 2008-08-11 16:39:48.000000000 -0400 @@ -57,3 +57,64 @@ dontaudit $1 avahi_var_run_t:dir search_dir_perms; @@ -11547,11 +11542,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/avahi.te --- nsaserefpolicy/policy/modules/services/avahi.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/avahi.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/avahi.te 2008-08-11 16:39:48.000000000 -0400 @@ -13,6 +13,9 @@ type avahi_var_run_t; files_pid_file(avahi_var_run_t) @@ -11579,18 +11574,18 @@ 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.3/policy/modules/services/bind.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.5.4/policy/modules/services/bind.fc --- nsaserefpolicy/policy/modules/services/bind.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bind.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bind.fc 2008-08-11 16:39:48.000000000 -0400 @@ -49,3 +49,5 @@ /var/named/chroot/var/log/named.* -- gen_context(system_u:object_r:named_log_t,s0) /var/named/dynamic(/.*)? gen_context(system_u:object_r:named_cache_t,s0) ') + +/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.3/policy/modules/services/bind.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.5.4/policy/modules/services/bind.if --- nsaserefpolicy/policy/modules/services/bind.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bind.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bind.if 2008-08-11 16:39:48.000000000 -0400 @@ -254,3 +254,94 @@ interface(`bind_udp_chat_named',` refpolicywarn(`$0($*) has been deprecated.') @@ -11668,27 +11663,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, named_tmp_t) ++ admin_pattern($1, named_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, named_log_t) ++ admin_pattern($1, named_log_t) + + files_list_etc($1) -+ manage_all_pattern($1, named_conf_t) ++ admin_pattern($1, named_conf_t) + -+ manage_all_pattern($1, named_cache_t) -+ manage_all_pattern($1, named_zone_t) -+ manage_all_pattern($1, dnssec_t) ++ admin_pattern($1, named_cache_t) ++ admin_pattern($1, named_zone_t) ++ admin_pattern($1, dnssec_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, named_var_lib_t) ++ admin_pattern($1, named_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, named_var_run_t) ++ 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.3/policy/modules/services/bind.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.5.4/policy/modules/services/bind.te --- nsaserefpolicy/policy/modules/services/bind.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bind.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bind.te 2008-08-11 16:39:48.000000000 -0400 @@ -53,6 +53,9 @@ init_system_domain(ndc_t, ndc_exec_t) role system_r types ndc_t; @@ -11732,9 +11727,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.3/policy/modules/services/bitlbee.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.fc serefpolicy-3.5.4/policy/modules/services/bitlbee.fc --- nsaserefpolicy/policy/modules/services/bitlbee.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bitlbee.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bitlbee.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,3 +1,6 @@ /usr/sbin/bitlbee -- gen_context(system_u:object_r:bitlbee_exec_t,s0) /etc/bitlbee(/.*)? gen_context(system_u:object_r:bitlbee_conf_t,s0) @@ -11742,9 +11737,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + +/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.3/policy/modules/services/bitlbee.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.if serefpolicy-3.5.4/policy/modules/services/bitlbee.if --- nsaserefpolicy/policy/modules/services/bitlbee.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bitlbee.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bitlbee.if 2008-08-11 16:39:48.000000000 -0400 @@ -20,3 +20,70 @@ allow $1 bitlbee_conf_t:file { read getattr }; ') @@ -11809,16 +11804,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, bitlbee_conf_t) ++ admin_pattern($1, bitlbee_conf_t) + + files_list_var($1) -+ manage_all_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.3/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.4/policy/modules/services/bitlbee.te --- nsaserefpolicy/policy/modules/services/bitlbee.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bitlbee.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bitlbee.te 2008-08-11 16:39:48.000000000 -0400 @@ -17,6 +17,12 @@ type bitlbee_var_t; files_type(bitlbee_var_t) @@ -11870,9 +11865,9 @@ 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.3/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.4/policy/modules/services/bluetooth.fc --- nsaserefpolicy/policy/modules/services/bluetooth.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bluetooth.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bluetooth.fc 2008-08-11 16:39:48.000000000 -0400 @@ -22,3 +22,8 @@ # /var/lib/bluetooth(/.*)? gen_context(system_u:object_r:bluetooth_var_lib_t,s0) @@ -11882,9 +11877,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/bluetooth.if --- nsaserefpolicy/policy/modules/services/bluetooth.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bluetooth.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bluetooth.if 2008-08-11 16:39:48.000000000 -0400 @@ -226,3 +226,88 @@ dontaudit $1 bluetooth_helper_domain:dir search; dontaudit $1 bluetooth_helper_domain:file { read getattr }; @@ -11955,28 +11950,28 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, bluetooth_tmp_t) ++ admin_pattern($1, bluetooth_tmp_t) + + files_list_var($1) -+ manage_all_pattern($1, bluetooth_lock_t) ++ admin_pattern($1, bluetooth_lock_t) + + files_list_etc($1) -+ manage_all_pattern($1, bluetooth_conf_t) -+ manage_all_pattern($1, bluetooth_conf_rw_t) ++ admin_pattern($1, bluetooth_conf_t) ++ admin_pattern($1, bluetooth_conf_rw_t) + + files_list_spool($1) -+ manage_all_pattern($1, bluetooth_spool_t) ++ admin_pattern($1, bluetooth_spool_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, bluetooth_var_lib_t) ++ admin_pattern($1, bluetooth_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/bluetooth.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/bluetooth.te 2008-08-11 16:39:48.000000000 -0400 @@ -32,19 +32,22 @@ type bluetooth_var_run_t; files_pid_file(bluetooth_var_run_t) @@ -12049,18 +12044,18 @@ 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.3/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.4/policy/modules/services/canna.fc --- nsaserefpolicy/policy/modules/services/canna.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/canna.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/canna.fc 2008-08-11 16:39:48.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.3/policy/modules/services/canna.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/canna.if serefpolicy-3.5.4/policy/modules/services/canna.if --- nsaserefpolicy/policy/modules/services/canna.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/canna.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/canna.if 2008-08-11 16:39:48.000000000 -0400 @@ -18,3 +18,74 @@ files_search_pids($1) stream_connect_pattern($1, canna_var_run_t, canna_var_run_t,canna_t) @@ -12126,19 +12121,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + logging_list_logs($1) -+ manage_all_pattern($1, canna_log_t) ++ admin_pattern($1, canna_log_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, canna_var_lib_t) ++ admin_pattern($1, canna_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/canna.te --- nsaserefpolicy/policy/modules/services/canna.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/canna.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/canna.te 2008-08-11 16:39:48.000000000 -0400 @@ -19,6 +19,9 @@ type canna_var_run_t; files_pid_file(canna_var_run_t) @@ -12149,9 +12144,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/services/clamav.fc serefpolicy-3.5.3/policy/modules/services/clamav.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.5.4/policy/modules/services/clamav.fc --- nsaserefpolicy/policy/modules/services/clamav.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/clamav.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/clamav.fc 2008-08-11 16:39:48.000000000 -0400 @@ -5,16 +5,18 @@ /usr/bin/freshclam -- gen_context(system_u:object_r:freshclam_exec_t,s0) @@ -12176,9 +12171,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.3/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.4/policy/modules/services/clamav.if --- nsaserefpolicy/policy/modules/services/clamav.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/clamav.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/clamav.if 2008-08-11 16:39:48.000000000 -0400 @@ -38,6 +38,27 @@ ######################################## @@ -12305,28 +12300,28 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, clamd_tmp_t) ++ admin_pattern($1, clamd_tmp_t) + + files_list_etc($1) -+ manage_all_pattern($1, clamd_etc_t) ++ admin_pattern($1, clamd_etc_t) + + logging_list_logs($1) -+ manage_all_pattern($1, clamd_var_log_t) ++ admin_pattern($1, clamd_var_log_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, clamd_var_lib_t) ++ admin_pattern($1, clamd_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, clamd_var_run_t) ++ admin_pattern($1, clamd_var_run_t) + -+ manage_all_pattern($1, clamscan_tmp_t) ++ admin_pattern($1, clamscan_tmp_t) + -+ manage_all_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.3/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.4/policy/modules/services/clamav.te --- nsaserefpolicy/policy/modules/services/clamav.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/clamav.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/clamav.te 2008-08-11 16:39:48.000000000 -0400 @@ -13,7 +13,7 @@ # configuration files @@ -12414,9 +12409,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.3/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.4/policy/modules/services/consolekit.fc --- nsaserefpolicy/policy/modules/services/consolekit.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/consolekit.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/consolekit.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,3 +1,6 @@ /usr/sbin/console-kit-daemon -- gen_context(system_u:object_r:consolekit_exec_t,s0) @@ -12424,9 +12419,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.3/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.4/policy/modules/services/consolekit.if --- nsaserefpolicy/policy/modules/services/consolekit.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/consolekit.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/consolekit.if 2008-08-11 16:39:48.000000000 -0400 @@ -38,3 +38,24 @@ allow $1 consolekit_t:dbus send_msg; allow consolekit_t $1:dbus send_msg; @@ -12452,9 +12447,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.3/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.4/policy/modules/services/consolekit.te --- nsaserefpolicy/policy/modules/services/consolekit.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/consolekit.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/consolekit.te 2008-08-11 16:39:48.000000000 -0400 @@ -13,6 +13,9 @@ type consolekit_var_run_t; files_pid_file(consolekit_var_run_t) @@ -12569,18 +12564,18 @@ 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.3/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.4/policy/modules/services/courier.fc --- nsaserefpolicy/policy/modules/services/courier.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/courier.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/courier.fc 2008-08-11 16:39:48.000000000 -0400 @@ -19,3 +19,5 @@ /var/lib/courier(/.*)? -- gen_context(system_u:object_r:courier_var_lib_t,s0) /var/run/courier(/.*)? -- gen_context(system_u:object_r:courier_var_run_t,s0) + +/var/spool/courier(/.*)? 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.if serefpolicy-3.5.3/policy/modules/services/courier.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.if serefpolicy-3.5.4/policy/modules/services/courier.if --- nsaserefpolicy/policy/modules/services/courier.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/courier.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/courier.if 2008-08-11 16:39:48.000000000 -0400 @@ -123,3 +123,77 @@ domtrans_pattern($1, courier_pop_exec_t, courier_pop_t) @@ -12659,9 +12654,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + allow $1 courier_spool_t:fifo_file rw_fifo_file_perms; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.5.3/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.4/policy/modules/services/courier.te --- nsaserefpolicy/policy/modules/services/courier.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/courier.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/courier.te 2008-08-11 16:39:48.000000000 -0400 @@ -9,7 +9,10 @@ courier_domain_template(authdaemon) @@ -12697,9 +12692,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/cron.fc serefpolicy-3.5.3/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.4/policy/modules/services/cron.fc --- nsaserefpolicy/policy/modules/services/cron.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cron.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cron.fc 2008-08-11 16:39:48.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) @@ -12714,9 +12709,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.3/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.4/policy/modules/services/cron.if --- nsaserefpolicy/policy/modules/services/cron.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cron.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cron.if 2008-08-11 16:39:48.000000000 -0400 @@ -35,39 +35,23 @@ # template(`cron_per_role_template',` @@ -13083,9 +13078,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.3/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.4/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cron.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cron.te 2008-08-11 16:39:48.000000000 -0400 @@ -12,14 +12,6 @@ ## @@ -13342,9 +13337,9 @@ 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.3/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.4/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cups.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cups.fc 2008-08-11 16:39:48.000000000 -0400 @@ -8,6 +8,7 @@ /etc/cups/ppd/.* -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) /etc/cups/ppds\.dat -- gen_context(system_u:object_r:cupsd_rw_etc_t,s0) @@ -13401,9 +13396,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) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.5.3/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.4/policy/modules/services/cups.if --- nsaserefpolicy/policy/modules/services/cups.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cups.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cups.if 2008-08-11 16:39:48.000000000 -0400 @@ -20,6 +20,30 @@ ######################################## @@ -13534,36 +13529,36 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, cups_tmp_t) ++ admin_pattern($1, cups_tmp_t) + -+ manage_all_pattern($1, cups_lpd_tmp_t) ++ admin_pattern($1, cups_lpd_tmp_t) + + files_list_etc($1) -+ manage_all_pattern($1, cups_etc_t) ++ admin_pattern($1, cups_etc_t) + -+ manage_all_pattern($1, ptal_etc_t) ++ admin_pattern($1, ptal_etc_t) + + files_list_spool($1) -+ manage_all_pattern($1, cups_spool_t) ++ admin_pattern($1, cups_spool_t) + + logging_list_logs($1) -+ manage_all_pattern($1, cups_log_t) ++ admin_pattern($1, cups_log_t) + + files_list_pids($1) -+ manage_all_pattern($1, cups_var_run_t) ++ admin_pattern($1, cups_var_run_t) + -+ manage_all_pattern($1, ptal_var_run_t) ++ admin_pattern($1, ptal_var_run_t) + -+ manage_all_pattern($1, cups_config_var_run_t) ++ admin_pattern($1, cups_config_var_run_t) + -+ manage_all_pattern($1, cups_lpd_var_run_t) ++ admin_pattern($1, cups_lpd_var_run_t) + -+ manage_all_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.3/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.4/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cups.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cups.te 2008-08-11 16:39:48.000000000 -0400 @@ -48,6 +48,9 @@ type hplip_t; type hplip_exec_t; @@ -13890,9 +13885,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.3/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.4/policy/modules/services/cvs.fc --- nsaserefpolicy/policy/modules/services/cvs.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cvs.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cvs.fc 2008-08-11 16:39:48.000000000 -0400 @@ -5,3 +5,6 @@ /var/cvs(/.*)? gen_context(system_u:object_r:cvs_data_t,s0) @@ -13900,9 +13895,9 @@ 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.3/policy/modules/services/cvs.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.if serefpolicy-3.5.4/policy/modules/services/cvs.if --- nsaserefpolicy/policy/modules/services/cvs.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cvs.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cvs.if 2008-08-11 16:39:48.000000000 -0400 @@ -36,3 +36,70 @@ can_exec($1, cvs_exec_t) @@ -13966,17 +13961,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, cvs_tmp_t) ++ admin_pattern($1, cvs_tmp_t) + -+ manage_all_pattern($1, cvs_data_t) ++ admin_pattern($1, cvs_data_t) + + files_list_pids($1) -+ manage_all_pattern($1, cvs_var_run_t) ++ 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.3/policy/modules/services/cvs.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.5.4/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cvs.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cvs.te 2008-08-11 16:39:48.000000000 -0400 @@ -28,6 +28,9 @@ type cvs_var_run_t; files_pid_file(cvs_var_run_t) @@ -14031,15 +14026,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -optional_policy(` - nscd_socket_use(cvs_t) -') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.fc serefpolicy-3.5.3/policy/modules/services/cyphesis.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.fc serefpolicy-3.5.4/policy/modules/services/cyphesis.fc --- nsaserefpolicy/policy/modules/services/cyphesis.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/cyphesis.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cyphesis.fc 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,2 @@ + +/usr/bin/cyphesis -- gen_context(system_u:object_r:cyphesis_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.if serefpolicy-3.5.3/policy/modules/services/cyphesis.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.if serefpolicy-3.5.4/policy/modules/services/cyphesis.if --- nsaserefpolicy/policy/modules/services/cyphesis.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/cyphesis.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cyphesis.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,19 @@ +## policy for cyphesis + @@ -14060,9 +14055,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + domtrans_pattern($1, cyphesis_exec_t, cyphesis_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.te serefpolicy-3.5.3/policy/modules/services/cyphesis.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyphesis.te serefpolicy-3.5.4/policy/modules/services/cyphesis.te --- nsaserefpolicy/policy/modules/services/cyphesis.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/cyphesis.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cyphesis.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,92 @@ +policy_module(cyphesis, 1.0.0) + @@ -14156,18 +14151,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + kerberos_use(cyphesis_t) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.fc serefpolicy-3.5.3/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.4/policy/modules/services/cyrus.fc --- nsaserefpolicy/policy/modules/services/cyrus.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cyrus.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cyrus.fc 2008-08-11 16:39:48.000000000 -0400 @@ -2,3 +2,5 @@ /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.3/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.4/policy/modules/services/cyrus.if --- nsaserefpolicy/policy/modules/services/cyrus.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cyrus.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cyrus.if 2008-08-11 16:39:48.000000000 -0400 @@ -39,3 +39,74 @@ files_search_var_lib($1) stream_connect_pattern($1, cyrus_var_lib_t, cyrus_var_lib_t, cyrus_t) @@ -14233,19 +14228,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, cyrus_tmp_t) ++ admin_pattern($1, cyrus_tmp_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, cyrus_var_lib_t) ++ admin_pattern($1, cyrus_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/cyrus.te --- nsaserefpolicy/policy/modules/services/cyrus.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/cyrus.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/cyrus.te 2008-08-11 16:39:48.000000000 -0400 @@ -19,6 +19,9 @@ type cyrus_var_run_t; files_pid_file(cyrus_var_run_t) @@ -14265,9 +14260,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.3/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.4/policy/modules/services/dbus.fc --- nsaserefpolicy/policy/modules/services/dbus.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dbus.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dbus.fc 2008-08-11 16:39:48.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) @@ -14278,9 +14273,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.3/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.4/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dbus.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dbus.if 2008-08-11 16:39:48.000000000 -0400 @@ -53,6 +53,7 @@ gen_require(` type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t; @@ -14574,9 +14569,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.3/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.4/policy/modules/services/dbus.te --- nsaserefpolicy/policy/modules/services/dbus.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dbus.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dbus.te 2008-08-11 16:39:48.000000000 -0400 @@ -9,9 +9,10 @@ # # Delcarations @@ -14697,9 +14692,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + xserver_xdm_rw_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.3/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.4/policy/modules/services/dcc.if --- nsaserefpolicy/policy/modules/services/dcc.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dcc.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dcc.if 2008-08-11 16:39:48.000000000 -0400 @@ -72,6 +72,24 @@ ######################################## @@ -14725,9 +14720,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.3/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.4/policy/modules/services/dcc.te --- nsaserefpolicy/policy/modules/services/dcc.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dcc.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dcc.te 2008-08-11 16:39:48.000000000 -0400 @@ -105,6 +105,8 @@ files_read_etc_files(cdcc_t) files_read_etc_runtime_files(cdcc_t) @@ -14897,18 +14892,18 @@ 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.3/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.4/policy/modules/services/ddclient.fc --- nsaserefpolicy/policy/modules/services/ddclient.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ddclient.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ddclient.fc 2008-08-11 16:39:48.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.3/policy/modules/services/ddclient.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.if serefpolicy-3.5.4/policy/modules/services/ddclient.if --- nsaserefpolicy/policy/modules/services/ddclient.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ddclient.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ddclient.if 2008-08-11 16:39:48.000000000 -0400 @@ -18,3 +18,81 @@ corecmd_search_bin($1) domtrans_pattern($1, ddclient_exec_t, ddclient_t) @@ -14976,24 +14971,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, ddclient_etc_t) ++ admin_pattern($1, ddclient_etc_t) + + files_list_var($1) -+ manage_all_pattern($1, ddclient_var_t) ++ admin_pattern($1, ddclient_var_t) + + logging_list_logs($1) -+ manage_all_pattern($1, ddclient_log_t) ++ admin_pattern($1, ddclient_log_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, ddclient_var_lib_t) ++ admin_pattern($1, ddclient_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/ddclient.te --- nsaserefpolicy/policy/modules/services/ddclient.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ddclient.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ddclient.te 2008-08-11 16:39:48.000000000 -0400 @@ -11,7 +11,7 @@ init_daemon_domain(ddclient_t, ddclient_exec_t) @@ -15013,9 +15008,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # Declarations -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.fc serefpolicy-3.5.3/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.4/policy/modules/services/dhcp.fc --- nsaserefpolicy/policy/modules/services/dhcp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dhcp.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dhcp.fc 2008-08-11 16:39:48.000000000 -0400 @@ -5,3 +5,6 @@ /var/lib/dhcp(3)?/dhcpd\.leases.* -- gen_context(system_u:object_r:dhcpd_state_t,s0) @@ -15023,9 +15018,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.3/policy/modules/services/dhcp.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.5.4/policy/modules/services/dhcp.if --- nsaserefpolicy/policy/modules/services/dhcp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dhcp.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dhcp.if 2008-08-11 16:39:48.000000000 -0400 @@ -19,3 +19,71 @@ sysnet_search_dhcp_state($1) allow $1 dhcpd_state_t:file setattr; @@ -15091,16 +15086,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, dhcpd_tmp_t) ++ admin_pattern($1, dhcpd_tmp_t) + -+ manage_all_pattern($1, dhcpd_state_t) ++ admin_pattern($1, dhcpd_state_t) + + files_list_pids($1) -+ manage_all_pattern($1, dhcpd_var_run_t) ++ 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.3/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.4/policy/modules/services/dhcp.te --- nsaserefpolicy/policy/modules/services/dhcp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dhcp.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dhcp.te 2008-08-11 16:39:48.000000000 -0400 @@ -19,18 +19,20 @@ type dhcpd_var_run_t; files_pid_file(dhcpd_var_run_t) @@ -15164,9 +15159,9 @@ 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.3/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.4/policy/modules/services/dictd.fc --- nsaserefpolicy/policy/modules/services/dictd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dictd.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dictd.fc 2008-08-11 16:39:48.000000000 -0400 @@ -4,3 +4,6 @@ /usr/sbin/dictd -- gen_context(system_u:object_r:dictd_exec_t,s0) @@ -15174,9 +15169,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/dictd.if --- nsaserefpolicy/policy/modules/services/dictd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dictd.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dictd.if 2008-08-11 16:39:48.000000000 -0400 @@ -14,3 +14,73 @@ interface(`dictd_tcp_connect',` refpolicywarn(`$0($*) has been deprecated.') @@ -15242,18 +15237,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, dictd_etc_t) ++ admin_pattern($1, dictd_etc_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, dictd_var_lib_t) ++ admin_pattern($1, dictd_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/dictd.te --- nsaserefpolicy/policy/modules/services/dictd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dictd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dictd.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,12 @@ type dictd_var_lib_t alias var_lib_dictd_t; files_type(dictd_var_lib_t) @@ -15277,9 +15272,9 @@ 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.3/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.4/policy/modules/services/dnsmasq.fc --- nsaserefpolicy/policy/modules/services/dnsmasq.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dnsmasq.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dnsmasq.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,4 +1,7 @@ /usr/sbin/dnsmasq -- gen_context(system_u:object_r:dnsmasq_exec_t,s0) @@ -15288,9 +15283,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.3/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.4/policy/modules/services/dnsmasq.if --- nsaserefpolicy/policy/modules/services/dnsmasq.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dnsmasq.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dnsmasq.if 2008-08-11 16:39:48.000000000 -0400 @@ -1 +1,125 @@ ## dnsmasq DNS forwarder and DHCP server + @@ -15412,14 +15407,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_var_lib($1) -+ manage_all_pattern($1, dnsmasq_lease_t) ++ admin_pattern($1, dnsmasq_lease_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/dnsmasq.te --- nsaserefpolicy/policy/modules/services/dnsmasq.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dnsmasq.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dnsmasq.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,9 @@ type dnsmasq_var_run_t; files_pid_file(dnsmasq_var_run_t) @@ -15465,9 +15460,9 @@ 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.3/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.4/policy/modules/services/dovecot.fc --- nsaserefpolicy/policy/modules/services/dovecot.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dovecot.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dovecot.fc 2008-08-11 16:39:48.000000000 -0400 @@ -17,23 +17,24 @@ ifdef(`distro_debian', ` @@ -15498,9 +15493,9 @@ 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) +/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.3/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.4/policy/modules/services/dovecot.if --- nsaserefpolicy/policy/modules/services/dovecot.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dovecot.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dovecot.if 2008-08-11 16:39:48.000000000 -0400 @@ -21,7 +21,46 @@ ######################################## @@ -15619,29 +15614,29 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, dovecot_etc_t) ++ admin_pattern($1, dovecot_etc_t) + + logging_list_logs($1) -+ manage_all_pattern($1, dovecot_log_t) ++ admin_pattern($1, dovecot_log_t) + + files_list_spool($1) -+ manage_all_pattern($1, dovecot_spool_t) ++ admin_pattern($1, dovecot_spool_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, dovecot_var_lib_t) ++ admin_pattern($1, dovecot_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, dovecot_var_run_t) ++ admin_pattern($1, dovecot_var_run_t) + -+ manage_all_pattern($1, dovecot_cert_t) ++ admin_pattern($1, dovecot_cert_t) + -+ manage_all_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.3/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.4/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/dovecot.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/dovecot.te 2008-08-11 16:39:48.000000000 -0400 @@ -15,6 +15,12 @@ domain_entry_file(dovecot_auth_t, dovecot_auth_exec_t) role system_r types dovecot_auth_t; @@ -15700,7 +15695,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -@@ -140,25 +156,38 @@ +@@ -140,25 +156,39 @@ # dovecot auth local policy # @@ -15730,6 +15725,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +files_read_var_symlinks(dovecot_t) allow dovecot_auth_t dovecot_var_run_t:dir list_dir_perms; ++manage_sock_files_pattern(dovecot_auth_t, dovecot_var_run_t, dovecot_var_run_t) +dovecot_auth_stream_connect(dovecot_auth_t) kernel_read_all_sysctls(dovecot_auth_t) @@ -15741,7 +15737,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol dev_read_urand(dovecot_auth_t) auth_domtrans_chk_passwd(dovecot_auth_t) -@@ -167,6 +196,7 @@ +@@ -167,6 +197,7 @@ files_read_etc_files(dovecot_auth_t) files_read_etc_runtime_files(dovecot_auth_t) files_search_pids(dovecot_auth_t) @@ -15749,7 +15745,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_read_usr_symlinks(dovecot_auth_t) files_search_tmp(dovecot_auth_t) files_read_var_lib_files(dovecot_t) -@@ -185,5 +215,53 @@ +@@ -185,5 +216,53 @@ ') optional_policy(` @@ -15804,9 +15800,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.3/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.4/policy/modules/services/exim.if --- nsaserefpolicy/policy/modules/services/exim.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/exim.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/exim.if 2008-08-11 16:39:48.000000000 -0400 @@ -97,6 +97,26 @@ ######################################## @@ -15834,9 +15830,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Allow the specified domain to append ## exim log files. ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.5.3/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.4/policy/modules/services/exim.te --- nsaserefpolicy/policy/modules/services/exim.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/exim.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/exim.te 2008-08-11 16:39:48.000000000 -0400 @@ -21,9 +21,20 @@ ## gen_tunable(exim_manage_user_files, false) @@ -15916,7 +15912,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,81 @@ +@@ -99,23 +122,85 @@ logging_send_syslog_msg(exim_t) miscfiles_read_localization(exim_t) @@ -15959,6 +15955,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +') + +optional_policy(` ++ dovecot_auth_stream_connect(exim_t) ++') ++ ++optional_policy(` + tunable_policy(`exim_can_connect_db',` + mysql_stream_connect(exim_t) + ') @@ -16005,9 +16005,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.3/policy/modules/services/fail2ban.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.fc serefpolicy-3.5.4/policy/modules/services/fail2ban.fc --- nsaserefpolicy/policy/modules/services/fail2ban.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/fail2ban.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/fail2ban.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,3 +1,7 @@ /usr/bin/fail2ban -- gen_context(system_u:object_r:fail2ban_exec_t,s0) +/usr/bin/fail2ban-server -- gen_context(system_u:object_r:fail2ban_exec_t,s0) @@ -16016,9 +16016,9 @@ 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) +/etc/rc.d/init.d/fail2ban -- gen_context(system_u:object_r:fail2ban_script_exec_t,s0) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.5.3/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.4/policy/modules/services/fail2ban.if --- nsaserefpolicy/policy/modules/services/fail2ban.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/fail2ban.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/fail2ban.if 2008-08-11 16:39:48.000000000 -0400 @@ -78,3 +78,68 @@ files_search_pids($1) allow $1 fail2ban_var_run_t:file read_file_perms; @@ -16083,14 +16083,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + logging_list_logs($1) -+ manage_all_pattern($1, fail2ban_log_t) ++ admin_pattern($1, fail2ban_log_t) + + files_list_pids($1) -+ manage_all_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.3/policy/modules/services/fail2ban.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.5.4/policy/modules/services/fail2ban.te --- nsaserefpolicy/policy/modules/services/fail2ban.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/fail2ban.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/fail2ban.te 2008-08-11 16:39:48.000000000 -0400 @@ -18,6 +18,9 @@ type fail2ban_var_run_t; files_pid_file(fail2ban_var_run_t) @@ -16161,26 +16161,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol iptables_domtrans(fail2ban_t) ') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.3/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.4/policy/modules/services/fetchmail.if --- nsaserefpolicy/policy/modules/services/fetchmail.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/fetchmail.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/fetchmail.if 2008-08-11 16:39:48.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) -+ manage_all_pattern($1, fetchmail_etc_t) ++ admin_pattern($1, fetchmail_etc_t) - manage_files_pattern($1, fetchmail_uidl_cache_t, fetchmail_uidl_cache_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/fetchmail.te --- nsaserefpolicy/policy/modules/services/fetchmail.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/fetchmail.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/fetchmail.te 2008-08-11 16:39:48.000000000 -0400 @@ -91,6 +91,10 @@ ') @@ -16192,9 +16192,9 @@ 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.3/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.4/policy/modules/services/ftp.fc --- nsaserefpolicy/policy/modules/services/ftp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ftp.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ftp.fc 2008-08-11 16:39:48.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) @@ -16202,9 +16202,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.3/policy/modules/services/ftp.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-3.5.4/policy/modules/services/ftp.if --- nsaserefpolicy/policy/modules/services/ftp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ftp.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ftp.if 2008-08-11 16:39:48.000000000 -0400 @@ -28,11 +28,13 @@ type ftpd_t; ') @@ -16300,28 +16300,28 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + miscfiles_manage_public_files($1) + + files_list_tmp($1) -+ manage_all_pattern($1, ftp_tmp_t) ++ admin_pattern($1, ftp_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, ftp_log_t) ++ admin_pattern($1, ftp_log_t) + -+ manage_all_pattern($1, xferlog_t) ++ admin_pattern($1, xferlog_t) + + files_list_etc($1) -+ manage_all_pattern($1, ftp_etc_t) ++ admin_pattern($1, ftp_etc_t) + + files_list_var($1) -+ manage_all_pattern($1, ftp_lock_t) ++ admin_pattern($1, ftp_lock_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, ftp_var_lib_t) ++ admin_pattern($1, ftp_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, ftp_var_run_t) ++ admin_pattern($1, ftp_var_run_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.5.3/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.4/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ftp.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ftp.te 2008-08-11 16:39:48.000000000 -0400 @@ -75,6 +75,9 @@ type xferlog_t; logging_log_file(xferlog_t) @@ -16385,15 +16385,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/gamin.fc serefpolicy-3.5.3/policy/modules/services/gamin.fc +@@ -266,6 +280,14 @@ + ') + + optional_policy(` ++ dbus_system_bus_client_template(notused, ftpd_t) ++ optional_policy(` ++ oddjob_dbus_chat(ftpd_t) ++ oddjob_domtrans_mkhomedir(ftpd_t) ++ ') ++') ++ ++optional_policy(` + seutil_sigchld_newrole(ftpd_t) + ') + +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.5.4/policy/modules/services/gamin.fc --- nsaserefpolicy/policy/modules/services/gamin.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/gamin.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/gamin.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/gamin.if --- nsaserefpolicy/policy/modules/services/gamin.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/gamin.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/gamin.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,57 @@ + +## policy for gamin @@ -16452,9 +16467,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.3/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.4/policy/modules/services/gamin.te --- nsaserefpolicy/policy/modules/services/gamin.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/gamin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/gamin.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,39 @@ +policy_module(gamin, 1.0.0) + @@ -16495,16 +16510,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.3/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.4/policy/modules/services/gnomeclock.fc --- nsaserefpolicy/policy/modules/services/gnomeclock.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/gnomeclock.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/gnomeclock.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/gnomeclock.if --- nsaserefpolicy/policy/modules/services/gnomeclock.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/gnomeclock.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/gnomeclock.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,75 @@ + +## policy for gnomeclock @@ -16581,9 +16596,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.3/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.4/policy/modules/services/gnomeclock.te --- nsaserefpolicy/policy/modules/services/gnomeclock.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/gnomeclock.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/gnomeclock.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,55 @@ +policy_module(gnomeclock, 1.0.0) +######################################## @@ -16640,9 +16655,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.if serefpolicy-3.5.3/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.4/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/hal.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/hal.if 2008-08-11 16:39:48.000000000 -0400 @@ -302,3 +302,42 @@ files_search_pids($1) allow $1 hald_var_run_t:file rw_file_perms; @@ -16686,9 +16701,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.3/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.4/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/hal.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/hal.te 2008-08-11 16:56:59.000000000 -0400 @@ -49,6 +49,9 @@ type hald_var_lib_t; files_type(hald_var_lib_t) @@ -16699,6 +16714,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # Local policy +@@ -159,7 +162,7 @@ + selinux_compute_relabel_context(hald_t) + selinux_compute_user_contexts(hald_t) + +-storage_raw_read_removable_device(hald_t) ++storage_raw_read_removable_device(hald_t + storage_raw_write_removable_device(hald_t) + storage_raw_read_fixed_disk(hald_t) + storage_raw_write_fixed_disk(hald_t) @@ -280,6 +283,12 @@ ') @@ -16712,7 +16736,29 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol rpc_search_nfs_state_data(hald_t) ') -@@ -344,13 +353,22 @@ +@@ -293,6 +302,10 @@ + ') + + optional_policy(` ++ unconfined_domain(hald_t) ++') ++ ++optional_policy(` + updfstab_domtrans(hald_t) + ') + +@@ -300,6 +313,10 @@ + vbetool_domtrans(hald_t) + ') + ++optional_policy(` ++ virt_manage_images(hald_t) ++') ++ + ######################################## + # + # Hal acl local policy +@@ -344,13 +361,22 @@ libs_use_ld_so(hald_acl_t) libs_use_shared_libs(hald_acl_t) @@ -16735,7 +16781,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol domtrans_pattern(hald_t, hald_mac_exec_t, hald_mac_t) allow hald_t hald_mac_t:process signal; allow hald_mac_t hald_t:unix_stream_socket connectto; -@@ -366,6 +384,9 @@ +@@ -366,6 +392,9 @@ dev_read_sysfs(hald_mac_t) files_read_usr_files(hald_mac_t) @@ -16745,15 +16791,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol libs_use_ld_so(hald_mac_t) libs_use_shared_libs(hald_mac_t) -@@ -419,4 +440,4 @@ +@@ -419,4 +448,4 @@ # This is caused by a bug in hald and PolicyKit. # Should be removed when this is fixed -#cron_read_system_job_lib_files(hald_t) +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.if serefpolicy-3.5.3/policy/modules/services/inetd.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.if serefpolicy-3.5.4/policy/modules/services/inetd.if --- nsaserefpolicy/policy/modules/services/inetd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/inetd.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/inetd.if 2008-08-11 16:39:48.000000000 -0400 @@ -115,6 +115,10 @@ allow $1 inetd_t:tcp_socket rw_stream_socket_perms; @@ -16765,9 +16811,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/inetd.te serefpolicy-3.5.3/policy/modules/services/inetd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.5.4/policy/modules/services/inetd.te --- nsaserefpolicy/policy/modules/services/inetd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/inetd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/inetd.te 2008-08-11 16:39:48.000000000 -0400 @@ -30,6 +30,10 @@ type inetd_child_var_run_t; files_pid_file(inetd_child_var_run_t) @@ -16803,36 +16849,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol unconfined_domtrans(inetd_t) ') -@@ -181,6 +188,9 @@ - # for identd - allow inetd_child_t self:netlink_tcpdiag_socket r_netlink_socket_perms; - allow inetd_child_t self:capability { setuid setgid }; -+allow inetd_child_t self:dir search; -+allow inetd_child_t self:{ lnk_file file } { getattr read }; -+ - files_search_home(inetd_child_t) +@@ -194,6 +201,8 @@ + kernel_read_system_state(inetd_child_t) + kernel_read_network_state(inetd_child_t) - manage_dirs_pattern(inetd_child_t, inetd_child_tmp_t, inetd_child_tmp_t) -@@ -227,3 +237,7 @@ - optional_policy(` - unconfined_domain(inetd_child_t) - ') ++corecmd_bin_domtrans(inetd_t, inetd_child_t) + -+optional_policy(` -+ inetd_service_domain(inetd_child_t, bin_t) -+') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.fc serefpolicy-3.5.3/policy/modules/services/inn.fc + corenet_all_recvfrom_unlabeled(inetd_child_t) + corenet_all_recvfrom_netlabel(inetd_child_t) + corenet_tcp_sendrecv_all_if(inetd_child_t) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.fc serefpolicy-3.5.4/policy/modules/services/inn.fc --- nsaserefpolicy/policy/modules/services/inn.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/inn.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/inn.fc 2008-08-11 16:39:48.000000000 -0400 @@ -64,3 +64,5 @@ /var/run/news(/.*)? gen_context(system_u:object_r:innd_var_run_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.3/policy/modules/services/inn.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inn.if serefpolicy-3.5.4/policy/modules/services/inn.if --- nsaserefpolicy/policy/modules/services/inn.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/inn.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/inn.if 2008-08-11 16:39:48.000000000 -0400 @@ -54,8 +54,7 @@ ') @@ -16910,23 +16947,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, innd_etc_t) ++ admin_pattern($1, innd_etc_t) + + logging_list_logs($1) -+ manage_all_pattern($1, innd_log_t) ++ admin_pattern($1, innd_log_t) + + files_list_spool($1) -+ manage_all_pattern($1, news_spool_t) ++ admin_pattern($1, news_spool_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, innd_var_lib_t) ++ admin_pattern($1, innd_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/inn.te --- nsaserefpolicy/policy/modules/services/inn.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/inn.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/inn.te 2008-08-11 16:39:48.000000000 -0400 @@ -22,7 +22,10 @@ files_pid_file(innd_var_run_t) @@ -16939,17 +16976,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/services/jabber.fc serefpolicy-3.5.3/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.4/policy/modules/services/jabber.fc --- nsaserefpolicy/policy/modules/services/jabber.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/jabber.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/jabber.fc 2008-08-11 16:39:48.000000000 -0400 @@ -2,3 +2,4 @@ /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.3/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.4/policy/modules/services/jabber.if --- nsaserefpolicy/policy/modules/services/jabber.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/jabber.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/jabber.if 2008-08-11 16:39:48.000000000 -0400 @@ -13,3 +13,73 @@ interface(`jabber_tcp_connect',` refpolicywarn(`$0($*) has been deprecated.') @@ -17015,18 +17052,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + logging_list_logs($1) -+ manage_all_pattern($1, jabber_log_t) ++ admin_pattern($1, jabber_log_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, jabber_var_lib_t) ++ admin_pattern($1, jabber_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/jabber.te --- nsaserefpolicy/policy/modules/services/jabber.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/jabber.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/jabber.te 2008-08-11 16:39:48.000000000 -0400 @@ -19,6 +19,9 @@ type jabberd_var_run_t; files_pid_file(jabberd_var_run_t) @@ -17037,9 +17074,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/services/kerberos.fc serefpolicy-3.5.3/policy/modules/services/kerberos.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.fc serefpolicy-3.5.4/policy/modules/services/kerberos.fc --- nsaserefpolicy/policy/modules/services/kerberos.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/kerberos.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/kerberos.fc 2008-08-11 16:39:48.000000000 -0400 @@ -13,6 +13,14 @@ /var/kerberos/krb5kdc(/.*)? gen_context(system_u:object_r:krb5kdc_conf_t,s0) @@ -17055,9 +17092,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/kerberos.if --- nsaserefpolicy/policy/modules/services/kerberos.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/kerberos.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/kerberos.if 2008-08-11 16:39:48.000000000 -0400 @@ -23,6 +23,25 @@ ######################################## @@ -17295,35 +17332,35 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + role_transition $2 kpropd_script_exec_t system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, kadmind_tmp_t) ++ admin_pattern($1, kadmind_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, kadmind_log_t) ++ admin_pattern($1, kadmind_log_t) + + files_list_spool($1) -+ manage_all_pattern($1, kadmind_spool_t) ++ admin_pattern($1, kadmind_spool_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, kadmind_var_lib_t) ++ admin_pattern($1, kadmind_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, kadmind_var_run_t) ++ admin_pattern($1, kadmind_var_run_t) + -+ manage_all_pattern($1, krb5_conf_t) ++ admin_pattern($1, krb5_conf_t) + -+ manage_all_pattern($1, krb5_keytab_t) ++ admin_pattern($1, krb5_keytab_t) + -+ manage_all_pattern($1, krb5kdc_principal_t) ++ admin_pattern($1, krb5kdc_principal_t) + -+ manage_all_pattern($1, krb5kdc_tmp_t) ++ admin_pattern($1, krb5kdc_tmp_t) + -+ manage_all_pattern($1, krb5kdc_var_run_t) ++ admin_pattern($1, krb5kdc_var_run_t) -+ manage_all_pattern($1, krb5_host_rcache_t) ++ admin_pattern($1, krb5_host_rcache_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.5.3/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.4/policy/modules/services/kerberos.te --- nsaserefpolicy/policy/modules/services/kerberos.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/kerberos.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/kerberos.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,7 @@ type kadmind_t; type kadmind_exec_t; @@ -17519,16 +17556,16 @@ 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.3/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.4/policy/modules/services/kerneloops.fc --- nsaserefpolicy/policy/modules/services/kerneloops.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/kerneloops.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/kerneloops.fc 2008-08-11 16:39:48.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_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.3/policy/modules/services/kerneloops.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.if serefpolicy-3.5.4/policy/modules/services/kerneloops.if --- nsaserefpolicy/policy/modules/services/kerneloops.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/kerneloops.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/kerneloops.if 2008-08-11 16:39:48.000000000 -0400 @@ -21,6 +21,24 @@ ######################################## @@ -17586,9 +17623,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.3/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.4/policy/modules/services/kerneloops.te --- nsaserefpolicy/policy/modules/services/kerneloops.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/kerneloops.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/kerneloops.te 2008-08-11 16:39:48.000000000 -0400 @@ -10,6 +10,9 @@ type kerneloops_exec_t; init_daemon_domain(kerneloops_t, kerneloops_exec_t) @@ -17608,18 +17645,18 @@ 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.3/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.4/policy/modules/services/ldap.fc --- nsaserefpolicy/policy/modules/services/ldap.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ldap.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ldap.fc 2008-08-11 16:39:48.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.3/policy/modules/services/ldap.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-3.5.4/policy/modules/services/ldap.if --- nsaserefpolicy/policy/modules/services/ldap.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ldap.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ldap.if 2008-08-11 16:39:48.000000000 -0400 @@ -73,3 +73,80 @@ allow $1 slapd_var_run_t:sock_file write; allow $1 slapd_t:unix_stream_socket connectto; @@ -17687,23 +17724,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, slapd_tmp_t) ++ admin_pattern($1, slapd_tmp_t) + -+ manage_all_pattern($1, slapd_replog_t) ++ admin_pattern($1, slapd_replog_t) + + files_list_etc($1) -+ manage_all_pattern($1, slapd_etc_t) ++ admin_pattern($1, slapd_etc_t) + -+ manage_all_pattern($1, slapd_lock_t) ++ admin_pattern($1, slapd_lock_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/ldap.te --- nsaserefpolicy/policy/modules/services/ldap.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ldap.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ldap.te 2008-08-11 16:39:48.000000000 -0400 @@ -31,6 +31,9 @@ type slapd_var_run_t; files_pid_file(slapd_var_run_t) @@ -17723,9 +17760,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.3/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.4/policy/modules/services/lpd.fc --- nsaserefpolicy/policy/modules/services/lpd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/lpd.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/lpd.fc 2008-08-11 16:39:48.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) @@ -17741,17 +17778,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.3/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.4/policy/modules/services/mailman.fc --- nsaserefpolicy/policy/modules/services/mailman.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mailman.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mailman.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/mailman.if --- nsaserefpolicy/policy/modules/services/mailman.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mailman.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mailman.if 2008-08-11 16:39:48.000000000 -0400 @@ -211,6 +211,7 @@ type mailman_data_t; ') @@ -17786,9 +17823,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.3/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.4/policy/modules/services/mailman.te --- nsaserefpolicy/policy/modules/services/mailman.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mailman.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mailman.te 2008-08-11 16:39:48.000000000 -0400 @@ -53,10 +53,9 @@ apache_use_fds(mailman_cgi_t) apache_dontaudit_append_log(mailman_cgi_t) @@ -17802,23 +17839,25 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') ######################################## -@@ -65,8 +64,15 @@ +@@ -65,8 +64,17 @@ # allow mailman_mail_t self:unix_dgram_socket create_socket_perms; +allow mailman_mail_t initrc_t:process signal; +allow mailman_mail_t self:process signal; -+allow mailman_mail_t self:capability { setuid setgid sys_tty_config }; ++allow mailman_mail_t self:capability { kill dac_override setuid setgid sys_tty_config }; + +files_search_spool(mailman_mail_t) +fs_rw_anon_inodefs_files(mailman_mail_t) ++ ++read_files_pattern(mailman_mail_t, mailman_archive_t, mailman_archive_t) mta_dontaudit_rw_delivery_tcp_sockets(mailman_mail_t) +mta_dontaudit_rw_queue(mailman_mail_t) ifdef(`TODO',` optional_policy(` -@@ -104,6 +110,7 @@ +@@ -104,6 +112,7 @@ # some of the following could probably be changed to dontaudit, someone who # knows mailman well should test this out and send the changes sysadm_search_home_dirs(mailman_queue_t) @@ -17826,15 +17865,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.3/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.4/policy/modules/services/mailscanner.fc --- nsaserefpolicy/policy/modules/services/mailscanner.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/mailscanner.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mailscanner.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/mailscanner.if --- nsaserefpolicy/policy/modules/services/mailscanner.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/mailscanner.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mailscanner.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,59 @@ +## Anti-Virus and Anti-Spam Filter + @@ -17895,18 +17934,18 @@ 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.3/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.4/policy/modules/services/mailscanner.te --- nsaserefpolicy/policy/modules/services/mailscanner.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/mailscanner.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mailscanner.te 2008-08-11 16:39:48.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/mta.fc serefpolicy-3.5.3/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.4/policy/modules/services/mta.fc --- nsaserefpolicy/policy/modules/services/mta.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mta.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mta.fc 2008-08-11 16:39:48.000000000 -0400 @@ -11,6 +11,7 @@ /usr/lib(64)?/sendmail -- gen_context(system_u:object_r:sendmail_exec_t,s0) @@ -17923,9 +17962,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.3/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.4/policy/modules/services/mta.if --- nsaserefpolicy/policy/modules/services/mta.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mta.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mta.if 2008-08-11 16:39:48.000000000 -0400 @@ -133,6 +133,15 @@ sendmail_create_log($1_mail_t) ') @@ -18111,9 +18150,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.3/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.4/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mta.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mta.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,6 +6,8 @@ # Declarations # @@ -18277,9 +18316,9 @@ 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.3/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.4/policy/modules/services/munin.fc --- nsaserefpolicy/policy/modules/services/munin.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/munin.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/munin.fc 2008-08-11 16:39:48.000000000 -0400 @@ -6,6 +6,9 @@ /usr/share/munin/plugins/.* -- gen_context(system_u:object_r:munin_exec_t,s0) @@ -18292,9 +18331,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/munin.if --- nsaserefpolicy/policy/modules/services/munin.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/munin.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/munin.if 2008-08-11 16:39:48.000000000 -0400 @@ -80,3 +80,105 @@ dontaudit $1 munin_var_lib_t:dir search_dir_perms; @@ -18384,26 +18423,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, munin_tmp_t) ++ admin_pattern($1, munin_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, munin_log_t) ++ admin_pattern($1, munin_log_t) + + files_list_etc($1) -+ manage_all_pattern($1, munin_etc_t) ++ admin_pattern($1, munin_etc_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, munin_var_lib_t) ++ admin_pattern($1, munin_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, munin_var_run_t) ++ admin_pattern($1, munin_var_run_t) + -+ manage_all_pattern($1, httpd_munin_content_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.3/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.4/policy/modules/services/munin.te --- nsaserefpolicy/policy/modules/services/munin.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/munin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/munin.te 2008-08-11 16:39:48.000000000 -0400 @@ -25,26 +25,33 @@ type munin_var_run_t alias lrrd_var_run_t; files_pid_file(munin_var_run_t) @@ -18529,18 +18568,18 @@ 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.3/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.4/policy/modules/services/mysql.fc --- nsaserefpolicy/policy/modules/services/mysql.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mysql.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mysql.fc 2008-08-11 16:39:48.000000000 -0400 @@ -22,3 +22,5 @@ /var/log/mysql.* -- gen_context(system_u:object_r:mysqld_log_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.3/policy/modules/services/mysql.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.5.4/policy/modules/services/mysql.if --- nsaserefpolicy/policy/modules/services/mysql.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mysql.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mysql.if 2008-08-11 16:39:48.000000000 -0400 @@ -53,9 +53,11 @@ interface(`mysql_stream_connect',` gen_require(` @@ -18615,19 +18654,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + role_transition $2 mysqld_script_exec_t system_r; + allow $2 system_r; + -+ manage_all_pattern($1, mysqld_var_run_t) ++ admin_pattern($1, mysqld_var_run_t) + -+ manage_all_pattern($1, mysqld_db_t) ++ admin_pattern($1, mysqld_db_t) + -+ manage_all_pattern($1, mysqld_etc_t) ++ admin_pattern($1, mysqld_etc_t) + -+ manage_all_pattern($1, mysqld_log_t) ++ admin_pattern($1, mysqld_log_t) + -+ manage_all_pattern($1, mysqld_tmp_t) ++ 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.3/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.4/policy/modules/services/mysql.te --- nsaserefpolicy/policy/modules/services/mysql.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/mysql.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/mysql.te 2008-08-11 16:39:48.000000000 -0400 @@ -25,6 +25,9 @@ type mysqld_tmp_t; files_tmp_file(mysqld_tmp_t) @@ -18656,9 +18695,9 @@ 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.3/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.4/policy/modules/services/nagios.fc --- nsaserefpolicy/policy/modules/services/nagios.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nagios.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nagios.fc 2008-08-11 16:39:48.000000000 -0400 @@ -4,13 +4,17 @@ /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) @@ -18681,9 +18720,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/nagios.if --- nsaserefpolicy/policy/modules/services/nagios.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nagios.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nagios.if 2008-08-11 16:39:48.000000000 -0400 @@ -44,7 +44,7 @@ ######################################## @@ -18773,25 +18812,25 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, nagios_tmp_t) ++ admin_pattern($1, nagios_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, nagios_log_t) ++ admin_pattern($1, nagios_log_t) + + files_list_etc($1) -+ manage_all_pattern($1, nagios_etc_t) ++ admin_pattern($1, nagios_etc_t) + + files_list_spool($1) -+ manage_all_pattern($1, nagios_spool_t) ++ admin_pattern($1, nagios_spool_t) + + files_list_pids($1) -+ manage_all_pattern($1, nagios_var_run_t) ++ admin_pattern($1, nagios_var_run_t) + -+ manage_all_pattern($1, nrpe_etc_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.3/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.4/policy/modules/services/nagios.te --- nsaserefpolicy/policy/modules/services/nagios.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nagios.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nagios.te 2008-08-11 16:39:48.000000000 -0400 @@ -10,10 +10,6 @@ type nagios_exec_t; init_daemon_domain(nagios_t, nagios_exec_t) @@ -18894,9 +18933,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/networkmanager.fc serefpolicy-3.5.3/policy/modules/services/networkmanager.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.5.4/policy/modules/services/networkmanager.fc --- nsaserefpolicy/policy/modules/services/networkmanager.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/networkmanager.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/networkmanager.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,7 +1,13 @@ /usr/s?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) /usr/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) @@ -18911,9 +18950,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/var/log/wpa_supplicant\.log.* -- gen_context(system_u:object_r:NetworkManager_log_t,s0) +/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.if serefpolicy-3.5.3/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.4/policy/modules/services/networkmanager.if --- nsaserefpolicy/policy/modules/services/networkmanager.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/networkmanager.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/networkmanager.if 2008-08-11 16:39:48.000000000 -0400 @@ -97,3 +97,58 @@ allow $1 NetworkManager_t:dbus send_msg; allow NetworkManager_t $1:dbus send_msg; @@ -18973,9 +19012,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_search_pids($1) + allow $1 NetworkManager_var_run_t:file read_file_perms; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.3/policy/modules/services/networkmanager.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.4/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/networkmanager.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/networkmanager.te 2008-08-11 16:39:48.000000000 -0400 @@ -10,9 +10,16 @@ type NetworkManager_exec_t; init_daemon_domain(NetworkManager_t, NetworkManager_exec_t) @@ -19089,10 +19128,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') optional_policy(` -@@ -156,19 +178,25 @@ +@@ -156,19 +178,26 @@ ppp_domtrans(NetworkManager_t) ppp_read_pid_files(NetworkManager_t) ppp_signal(NetworkManager_t) ++ ppp_signull(NetworkManager_t) + ppp_read_config(NetworkManager_t) ') @@ -19119,9 +19159,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/nis.fc serefpolicy-3.5.3/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.4/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nis.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nis.fc 2008-08-11 16:39:48.000000000 -0400 @@ -4,9 +4,14 @@ /sbin/ypbind -- gen_context(system_u:object_r:ypbind_exec_t,s0) @@ -19137,9 +19177,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nis.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nis.if 2008-08-11 16:39:48.000000000 -0400 @@ -28,7 +28,7 @@ type var_yp_t; ') @@ -19260,25 +19300,25 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, ypbind_tmp_t) ++ admin_pattern($1, ypbind_tmp_t) + + files_list_pids($1) -+ manage_all_pattern($1, ypbind_var_run_t) ++ admin_pattern($1, ypbind_var_run_t) + -+ manage_all_pattern($1, yppasswdd_var_run_t) ++ admin_pattern($1, yppasswdd_var_run_t) + + files_list_etc($1) -+ manage_all_pattern($1, ypserv_conf_t) ++ admin_pattern($1, ypserv_conf_t) + -+ manage_all_pattern($1, ypserv_tmp_t) ++ admin_pattern($1, ypserv_tmp_t) + -+ manage_all_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.3/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.4/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nis.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nis.te 2008-08-11 16:39:48.000000000 -0400 @@ -44,6 +44,9 @@ type ypxfr_exec_t; init_daemon_domain(ypxfr_t, ypxfr_exec_t) @@ -19347,18 +19387,18 @@ 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.3/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.4/policy/modules/services/nscd.fc --- nsaserefpolicy/policy/modules/services/nscd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nscd.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nscd.fc 2008-08-11 16:39:48.000000000 -0400 @@ -9,3 +9,5 @@ /var/run/\.nscd_socket -s gen_context(system_u:object_r:nscd_var_run_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.3/policy/modules/services/nscd.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.5.4/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nscd.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nscd.if 2008-08-11 16:39:48.000000000 -0400 @@ -70,15 +70,14 @@ interface(`nscd_socket_use',` gen_require(` @@ -19438,15 +19478,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + logging_list_logs($1) -+ manage_all_pattern($1, nscd_log_t) ++ admin_pattern($1, nscd_log_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/nscd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/nscd.te 2008-08-11 16:39:48.000000000 -0400 @@ -23,19 +23,22 @@ type nscd_log_t; logging_log_file(nscd_log_t) @@ -19542,9 +19582,9 @@ 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.fc serefpolicy-3.5.3/policy/modules/services/ntp.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.fc serefpolicy-3.5.4/policy/modules/services/ntp.fc --- nsaserefpolicy/policy/modules/services/ntp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ntp.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ntp.fc 2008-08-11 16:39:48.000000000 -0400 @@ -17,3 +17,8 @@ /var/log/xntpd.* -- gen_context(system_u:object_r:ntpd_log_t,s0) @@ -19554,9 +19594,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/etc/ntp/keys -- gen_context(system_u:object_r:ntpd_key_t,s0) + +/etc/rc\.d/init\.d/ntpd -- gen_context(system_u:object_r:ntpd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.5.3/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.4/policy/modules/services/ntp.if --- nsaserefpolicy/policy/modules/services/ntp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ntp.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ntp.if 2008-08-11 16:39:48.000000000 -0400 @@ -53,3 +53,72 @@ corecmd_search_bin($1) domtrans_pattern($1, ntpdate_exec_t, ntpd_t) @@ -19619,20 +19659,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, ntp_tmp_t) ++ admin_pattern($1, ntp_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, ntp_log_t) ++ admin_pattern($1, ntp_log_t) + -+ manage_all_pattern($1, ntp_key_t) ++ admin_pattern($1, ntp_key_t) + + files_list_pids($1) -+ manage_all_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.3/policy/modules/services/ntp.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.5.4/policy/modules/services/ntp.te --- nsaserefpolicy/policy/modules/services/ntp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ntp.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ntp.te 2008-08-11 16:39:48.000000000 -0400 @@ -25,6 +25,12 @@ type ntpdate_exec_t; init_system_domain(ntpd_t, ntpdate_exec_t) @@ -19703,18 +19743,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol logrotate_exec(ntpd_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.5.3/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.4/policy/modules/services/oddjob.fc --- nsaserefpolicy/policy/modules/services/oddjob.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/oddjob.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/oddjob.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/oddjob.if --- nsaserefpolicy/policy/modules/services/oddjob.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/oddjob.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/oddjob.if 2008-08-11 16:39:48.000000000 -0400 @@ -44,6 +44,7 @@ ') @@ -19758,9 +19798,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.3/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.4/policy/modules/services/oddjob.te --- nsaserefpolicy/policy/modules/services/oddjob.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/oddjob.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/oddjob.te 2008-08-11 16:39:48.000000000 -0400 @@ -10,14 +10,21 @@ type oddjob_exec_t; domain_type(oddjob_t) @@ -19820,9 +19860,9 @@ 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.3/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.4/policy/modules/services/openvpn.fc --- nsaserefpolicy/policy/modules/services/openvpn.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/openvpn.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/openvpn.fc 2008-08-11 16:39:48.000000000 -0400 @@ -11,5 +11,7 @@ # # /var @@ -19832,9 +19872,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.3/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.4/policy/modules/services/openvpn.if --- nsaserefpolicy/policy/modules/services/openvpn.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/openvpn.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/openvpn.if 2008-08-11 16:39:48.000000000 -0400 @@ -90,3 +90,74 @@ read_files_pattern($1, openvpn_etc_t, openvpn_etc_t) read_lnk_files_pattern($1, openvpn_etc_t, openvpn_etc_t) @@ -19900,19 +19940,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, openvpn_etc_t) ++ admin_pattern($1, openvpn_etc_t) + + logging_list_logs($1) -+ manage_all_pattern($1, openvpn_var_log_t) ++ admin_pattern($1, openvpn_var_log_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/openvpn.te --- nsaserefpolicy/policy/modules/services/openvpn.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/openvpn.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/openvpn.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,7 +8,7 @@ ## @@ -19977,9 +20017,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/pegasus.te serefpolicy-3.5.3/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.4/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/pegasus.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/pegasus.te 2008-08-11 16:39:48.000000000 -0400 @@ -96,13 +96,12 @@ auth_use_nsswitch(pegasus_t) @@ -20004,9 +20044,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.3/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.4/policy/modules/services/polkit.fc --- nsaserefpolicy/policy/modules/services/polkit.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/polkit.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/polkit.fc 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,9 @@ + +/usr/libexec/polkit-read-auth-helper -- gen_context(system_u:object_r:polkit_auth_exec_t,s0) @@ -20017,9 +20057,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.3/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.4/policy/modules/services/polkit.if --- nsaserefpolicy/policy/modules/services/polkit.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/polkit.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/polkit.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,208 @@ + +## policy for polkit_auth @@ -20229,9 +20269,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.3/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.4/policy/modules/services/polkit.te --- nsaserefpolicy/policy/modules/services/polkit.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/polkit.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/polkit.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,231 @@ +policy_module(polkit_auth, 1.0.0) + @@ -20464,9 +20504,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/postfix.fc serefpolicy-3.5.3/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.4/policy/modules/services/postfix.fc --- nsaserefpolicy/policy/modules/services/postfix.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postfix.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postfix.fc 2008-08-11 16:39:48.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) @@ -20491,9 +20531,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.3/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.4/policy/modules/services/postfix.if --- nsaserefpolicy/policy/modules/services/postfix.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postfix.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postfix.if 2008-08-11 16:39:48.000000000 -0400 @@ -211,9 +211,8 @@ type postfix_etc_t; ') @@ -20568,9 +20608,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Execute postfix user mail programs ## in their respective domains. ## -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.3/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.4/policy/modules/services/postfix.te --- nsaserefpolicy/policy/modules/services/postfix.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postfix.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postfix.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,6 +6,14 @@ # Declarations # @@ -20822,18 +20862,18 @@ 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.3/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.4/policy/modules/services/postfixpolicyd.fc --- nsaserefpolicy/policy/modules/services/postfixpolicyd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postfixpolicyd.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postfixpolicyd.fc 2008-08-11 16:39:48.000000000 -0400 @@ -3,3 +3,5 @@ /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.3/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.4/policy/modules/services/postfixpolicyd.if --- nsaserefpolicy/policy/modules/services/postfixpolicyd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postfixpolicyd.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postfixpolicyd.if 2008-08-11 16:39:48.000000000 -0400 @@ -1 +1,68 @@ ## Postfix policy server + @@ -20896,16 +20936,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, postfix_policyd_conf_t) ++ admin_pattern($1, postfix_policyd_conf_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/postfixpolicyd.te --- nsaserefpolicy/policy/modules/services/postfixpolicyd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postfixpolicyd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postfixpolicyd.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,9 @@ type postfix_policyd_var_run_t; files_pid_file(postfix_policyd_var_run_t) @@ -20916,9 +20956,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/services/postgresql.fc serefpolicy-3.5.3/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.4/policy/modules/services/postgresql.fc --- nsaserefpolicy/policy/modules/services/postgresql.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postgresql.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postgresql.fc 2008-08-11 16:39:48.000000000 -0400 @@ -34,6 +34,7 @@ /var/lib/sepgsql/pgstartup\.log -- gen_context(system_u:object_r:postgresql_log_t,s0) @@ -20933,9 +20973,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.3/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.4/policy/modules/services/postgresql.if --- nsaserefpolicy/policy/modules/services/postgresql.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postgresql.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postgresql.if 2008-08-11 16:39:48.000000000 -0400 @@ -372,3 +372,70 @@ typeattribute $1 sepgsql_unconfined_type; @@ -20997,19 +21037,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + role_transition $2 postgresql_script_exec_t system_r; + allow $2 system_r; + -+ manage_all_pattern($1, postgresql_var_run_t) ++ admin_pattern($1, postgresql_var_run_t) + -+ manage_all_pattern($1, postgresql_db_t) ++ admin_pattern($1, postgresql_db_t) + -+ manage_all_pattern($1, postgresql_etc_t) ++ admin_pattern($1, postgresql_etc_t) + -+ manage_all_pattern($1, postgresql_log_t) ++ admin_pattern($1, postgresql_log_t) + -+ manage_all_pattern($1, postgresql_tmp_t) ++ admin_pattern($1, postgresql_tmp_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.5.3/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.4/policy/modules/services/postgresql.te --- nsaserefpolicy/policy/modules/services/postgresql.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postgresql.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postgresql.te 2008-08-11 16:39:48.000000000 -0400 @@ -44,6 +44,9 @@ type postgresql_var_run_t; files_pid_file(postgresql_var_run_t) @@ -21028,9 +21068,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol selinux_get_enforce_mode(postgresql_t) selinux_validate_context(postgresql_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-3.5.3/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.4/policy/modules/services/postgrey.fc --- nsaserefpolicy/policy/modules/services/postgrey.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postgrey.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postgrey.fc 2008-08-11 16:39:48.000000000 -0400 @@ -7,3 +7,7 @@ /var/run/postgrey(/.*)? gen_context(system_u:object_r:postgrey_var_run_t,s0) @@ -21039,9 +21079,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/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.4/policy/modules/services/postgrey.if --- nsaserefpolicy/policy/modules/services/postgrey.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postgrey.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postgrey.if 2008-08-11 16:39:48.000000000 -0400 @@ -12,10 +12,80 @@ # interface(`postgrey_stream_connect',` @@ -21114,19 +21154,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, postgrey_etc_t) ++ admin_pattern($1, postgrey_etc_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, postgrey_var_lib_t) ++ admin_pattern($1, postgrey_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/postgrey.te --- nsaserefpolicy/policy/modules/services/postgrey.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/postgrey.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/postgrey.te 2008-08-11 16:39:48.000000000 -0400 @@ -13,26 +13,38 @@ type postgrey_etc_t; files_config_file(postgrey_etc_t) @@ -21179,19 +21219,44 @@ 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.3/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.4/policy/modules/services/ppp.fc --- nsaserefpolicy/policy/modules/services/ppp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ppp.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ppp.fc 2008-08-11 16:39:48.000000000 -0400 @@ -33,3 +33,5 @@ /var/log/ppp-connect-errors.* -- gen_context(system_u:object_r:pppd_log_t,s0) /var/log/ppp/.* -- gen_context(system_u:object_r:pppd_log_t,s0) + +/etc/rc.d/init.d/ppp -- gen_context(system_u:object_r:pppd_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.5.3/policy/modules/services/ppp.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.5.4/policy/modules/services/ppp.if --- nsaserefpolicy/policy/modules/services/ppp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ppp.if 2008-08-07 16:06:08.000000000 -0400 -@@ -309,33 +309,36 @@ ++++ serefpolicy-3.5.4/policy/modules/services/ppp.if 2008-08-11 16:39:48.000000000 -0400 +@@ -76,6 +76,24 @@ + + ######################################## + ## ++## Send a generic signull to PPP. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`ppp_signull',` ++ gen_require(` ++ type pppd_t; ++ ') ++ ++ allow $1 pppd_t:process signull; ++') ++ ++######################################## ++## + ## Execute domain in the ppp domain. + ## + ## +@@ -309,33 +327,36 @@ type pppd_etc_rw_t, pppd_var_run_t; type pptp_t, pptp_log_t, pptp_var_run_t; @@ -21203,43 +21268,52 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_list_tmp($1) - manage_files_pattern($1, pppd_tmp_t, pppd_tmp_t) -+ manage_all_pattern($1, pppd_tmp_t, pppd_tmp_t) ++ admin_pattern($1, pppd_tmp_t, pppd_tmp_t) logging_list_logs($1) - manage_files_pattern($1, pppd_log_t, pppd_log_t) -+ manage_all_pattern($1, pppd_log_t, pppd_log_t) ++ admin_pattern($1, pppd_log_t, pppd_log_t) - manage_files_pattern($1, pppd_lock_t, pppd_lock_t) -+ manage_all_pattern($1, pppd_lock_t, pppd_lock_t) ++ admin_pattern($1, pppd_lock_t, pppd_lock_t) files_list_etc($1) - manage_files_pattern($1, pppd_etc_t, pppd_etc_t) -+ manage_all_pattern($1, pppd_etc_t, pppd_etc_t) ++ admin_pattern($1, pppd_etc_t, pppd_etc_t) ++ ++ admin_pattern($1, pppd_etc_rw_t, pppd_etc_rw_t) - manage_files_pattern($1, pppd_etc_rw_t, pppd_etc_rw_t) -+ manage_all_pattern($1, pppd_etc_rw_t, pppd_etc_rw_t) ++ admin_pattern($1, pppd_secret_t, pppd_secret_t) - manage_files_pattern($1, pppd_secret_t, pppd_secret_t) -+ manage_all_pattern($1, pppd_secret_t, pppd_secret_t) -+ -+ manage_all_pattern($1, pppd_script_exec_t) ++ admin_pattern($1, pppd_script_exec_t) files_list_pids($1) - manage_files_pattern($1, pppd_var_run_t, pppd_var_run_t) -+ manage_all_pattern($1, pppd_var_run_t, pppd_var_run_t) ++ admin_pattern($1, pppd_var_run_t, pppd_var_run_t) allow $1 pptp_t:process { ptrace signal_perms getattr }; ps_process_pattern($1, pptp_t) - manage_files_pattern($1, pptp_log_t, pptp_log_t) -+ manage_all_pattern($1, pptp_log_t, pptp_log_t) ++ admin_pattern($1, pptp_log_t, pptp_log_t) - manage_files_pattern($1, pptp_var_run_t, pptp_var_run_t) -+ manage_all_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.3/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.4/policy/modules/services/ppp.te --- nsaserefpolicy/policy/modules/services/ppp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ppp.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ppp.te 2008-08-11 16:47:39.000000000 -0400 +@@ -71,7 +71,7 @@ + # PPPD Local policy + # + +-allow pppd_t self:capability { net_admin setuid setgid fsetid fowner net_raw dac_override }; ++allow pppd_t self:capability { kill net_admin setuid setgid fsetid fowner net_raw dac_override }; + dontaudit pppd_t self:capability sys_tty_config; + allow pppd_t self:process signal; + allow pppd_t self:fifo_file rw_fifo_file_perms; @@ -116,7 +116,7 @@ kernel_read_kernel_sysctls(pppd_t) @@ -21277,9 +21351,9 @@ 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.3/policy/modules/services/prelude.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.5.4/policy/modules/services/prelude.fc --- nsaserefpolicy/policy/modules/services/prelude.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/prelude.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/prelude.fc 2008-08-11 16:39:48.000000000 -0400 @@ -9,3 +9,10 @@ /var/spool/prelude-manager(/.*)? gen_context(system_u:object_r:prelude_spool_t,s0) @@ -21291,9 +21365,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.5.3/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.4/policy/modules/services/prelude.if --- nsaserefpolicy/policy/modules/services/prelude.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/prelude.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/prelude.if 2008-08-11 16:39:48.000000000 -0400 @@ -6,7 +6,7 @@ ## ## @@ -21446,16 +21520,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + prelude_lml_script_domtrans($1) + role_transition $2 prelude_lml_script_exec_t system_r; + -+ manage_all_pattern($1, prelude_spool_t) -+ manage_all_pattern($1, prelude_var_lib_t) -+ manage_all_pattern($1, prelude_var_run_t) -+ manage_all_pattern($1, prelude_audisp_var_run_t) -+ manage_all_pattern($1, prelude_lml_tmp_t) -+ manage_all_pattern($1, prelude_lml_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) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.5.3/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.4/policy/modules/services/prelude.te --- nsaserefpolicy/policy/modules/services/prelude.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/prelude.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/prelude.te 2008-08-11 16:39:48.000000000 -0400 @@ -19,12 +19,31 @@ type prelude_var_lib_t; files_type(prelude_var_lib_t) @@ -21612,9 +21686,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.3/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.4/policy/modules/services/privoxy.fc --- nsaserefpolicy/policy/modules/services/privoxy.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/privoxy.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/privoxy.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,6 +1,10 @@ /etc/privoxy/user\.action -- gen_context(system_u:object_r:privoxy_etc_rw_t,s0) @@ -21626,9 +21700,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.3/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.4/policy/modules/services/privoxy.if --- nsaserefpolicy/policy/modules/services/privoxy.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/privoxy.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/privoxy.if 2008-08-11 16:39:48.000000000 -0400 @@ -2,6 +2,25 @@ ######################################## @@ -21673,19 +21747,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + logging_list_logs($1) - manage_files_pattern($1, privoxy_log_t, privoxy_log_t) -+ manage_all_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) -+ manage_all_pattern($1, privoxy_etc_rw_t) ++ admin_pattern($1, privoxy_etc_rw_t) files_list_pids($1) - manage_files_pattern($1, privoxy_var_run_t, privoxy_var_run_t) -+ manage_all_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.3/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.4/policy/modules/services/privoxy.te --- nsaserefpolicy/policy/modules/services/privoxy.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/privoxy.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/privoxy.te 2008-08-11 16:39:48.000000000 -0400 @@ -19,6 +19,9 @@ type privoxy_var_run_t; files_pid_file(privoxy_var_run_t) @@ -21704,18 +21778,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.3/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.4/policy/modules/services/procmail.fc --- nsaserefpolicy/policy/modules/services/procmail.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/procmail.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/procmail.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/procmail.if --- nsaserefpolicy/policy/modules/services/procmail.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/procmail.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/procmail.if 2008-08-11 16:39:48.000000000 -0400 @@ -39,3 +39,41 @@ corecmd_search_bin($1) can_exec($1, procmail_exec_t) @@ -21758,9 +21832,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.3/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.4/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/procmail.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/procmail.te 2008-08-11 16:39:48.000000000 -0400 @@ -14,6 +14,10 @@ type procmail_tmp_t; files_tmp_file(procmail_tmp_t) @@ -21838,9 +21912,9 @@ 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.3/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.4/policy/modules/services/pyzor.fc --- nsaserefpolicy/policy/modules/services/pyzor.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/pyzor.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/pyzor.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,9 +1,12 @@ /etc/pyzor(/.*)? gen_context(system_u:object_r:pyzor_etc_t, s0) @@ -21855,9 +21929,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.3/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.4/policy/modules/services/pyzor.if --- nsaserefpolicy/policy/modules/services/pyzor.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/pyzor.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/pyzor.if 2008-08-11 16:39:48.000000000 -0400 @@ -25,16 +25,16 @@ # template(`pyzor_per_role_template',` @@ -21948,22 +22022,22 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, pyzor_tmp_t) ++ admin_pattern($1, pyzor_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, pyzord_log_t) ++ admin_pattern($1, pyzord_log_t) + + files_list_etc($1) -+ manage_all_pattern($1, pyzor_etc_t) ++ admin_pattern($1, pyzor_etc_t) + + files_list_var_lib($1) -+ manage_all_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.3/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.4/policy/modules/services/pyzor.te --- nsaserefpolicy/policy/modules/services/pyzor.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/pyzor.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/pyzor.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,6 +6,37 @@ # Declarations # @@ -22049,43 +22123,10 @@ 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.3/policy/modules/services/qmail.te ---- nsaserefpolicy/policy/modules/services/qmail.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/qmail.te 2008-08-07 16:06:08.000000000 -0400 -@@ -14,7 +14,7 @@ - qmail_child_domain_template(qmail_clean, qmail_start_t) - - type qmail_etc_t; --files_type(qmail_etc_t) -+files_config_file(qmail_etc_t) - - type qmail_exec_t; - files_type(qmail_exec_t) -@@ -85,6 +85,8 @@ - libs_use_ld_so(qmail_inject_t) - libs_use_shared_libs(qmail_inject_t) - -+miscfiles_read_localization(qmail_inject_t) -+ - qmail_read_config(qmail_inject_t) - - ######################################## -@@ -106,15 +108,25 @@ - - kernel_read_system_state(qmail_local_t) - -+corecmd_exec_bin(qmail_local_t) - corecmd_exec_shell(qmail_local_t) -+can_exec(qmail_local_t, qmail_local_exec_t) - - files_read_etc_files(qmail_local_t) - files_read_etc_runtime_files(qmail_local_t) - -+auth_use_nsswitch(qmail_local_t) -+ -+logging_send_syslog_msg(qmail_local_t) -+ - mta_append_spool(qmail_local_t) +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.te serefpolicy-3.5.4/policy/modules/services/qmail.te +--- nsaserefpolicy/policy/modules/services/qmail.te 2008-08-11 11:23:34.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/qmail.te 2008-08-11 16:39:48.000000000 -0400 +@@ -124,6 +124,10 @@ qmail_domtrans_queue(qmail_local_t) @@ -22096,18 +22137,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # qmail-lspawn local policy -@@ -155,6 +167,10 @@ - manage_files_pattern(qmail_queue_t, qmail_spool_t, qmail_spool_t) - rw_fifo_files_pattern(qmail_queue_t, qmail_spool_t, qmail_spool_t) - -+corecmd_exec_bin(qmail_queue_t) -+ -+logging_send_syslog_msg(qmail_queue_t) -+ - optional_policy(` - daemontools_ipc_domain(qmail_queue_t) - ') -@@ -242,6 +258,10 @@ +@@ -255,6 +259,10 @@ ') optional_policy(` @@ -22118,18 +22148,18 @@ 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.3/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.4/policy/modules/services/radius.fc --- nsaserefpolicy/policy/modules/services/radius.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/radius.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/radius.fc 2008-08-11 16:39:48.000000000 -0400 @@ -20,3 +20,5 @@ /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.3/policy/modules/services/radius.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.if serefpolicy-3.5.4/policy/modules/services/radius.if --- nsaserefpolicy/policy/modules/services/radius.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/radius.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/radius.if 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,25 @@ ######################################## @@ -22174,26 +22204,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_list_etc($1) - manage_files_pattern($1, radiusd_etc_t, radiusd_etc_t) -+ manage_all_pattern($1, radiusd_etc_t, radiusd_etc_t) ++ admin_pattern($1, radiusd_etc_t, radiusd_etc_t) logging_list_logs($1) - manage_files_pattern($1, radiusd_log_t, radiusd_log_t) -+ manage_all_pattern($1, radiusd_log_t, radiusd_log_t) ++ admin_pattern($1, radiusd_log_t, radiusd_log_t) - manage_files_pattern($1, radiusd_etc_rw_t, radiusd_etc_rw_t) -+ manage_all_pattern($1, radiusd_etc_rw_t, radiusd_etc_rw_t) ++ admin_pattern($1, radiusd_etc_rw_t, radiusd_etc_rw_t) files_list_var_lib($1) - manage_files_pattern($1, radiusd_var_lib_t, radiusd_var_lib_t) -+ manage_all_pattern($1, radiusd_var_lib_t, radiusd_var_lib_t) ++ admin_pattern($1, radiusd_var_lib_t, radiusd_var_lib_t) files_list_pids($1) - manage_files_pattern($1, radiusd_var_run_t, radiusd_var_run_t) -+ manage_all_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.3/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.4/policy/modules/services/radius.te --- nsaserefpolicy/policy/modules/services/radius.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/radius.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/radius.te 2008-08-11 16:39:48.000000000 -0400 @@ -25,6 +25,9 @@ type radiusd_var_run_t; files_pid_file(radiusd_var_run_t) @@ -22259,17 +22289,17 @@ 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.3/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.4/policy/modules/services/radvd.fc --- nsaserefpolicy/policy/modules/services/radvd.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/radvd.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/radvd.fc 2008-08-11 16:39:48.000000000 -0400 @@ -5,3 +5,4 @@ /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.3/policy/modules/services/radvd.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.if serefpolicy-3.5.4/policy/modules/services/radvd.if --- nsaserefpolicy/policy/modules/services/radvd.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/radvd.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/radvd.if 2008-08-11 16:39:48.000000000 -0400 @@ -2,6 +2,25 @@ ######################################## @@ -22314,15 +22344,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_list_etc($1) - manage_files_pattern($1, radvd_etc_t, radvd_etc_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/radvd.te --- nsaserefpolicy/policy/modules/services/radvd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/radvd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/radvd.te 2008-08-11 16:39:48.000000000 -0400 @@ -15,6 +15,9 @@ type radvd_etc_t; files_config_file(radvd_etc_t) @@ -22341,18 +22371,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.3/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.4/policy/modules/services/razor.fc --- nsaserefpolicy/policy/modules/services/razor.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/razor.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/razor.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/razor.if --- nsaserefpolicy/policy/modules/services/razor.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/razor.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/razor.if 2008-08-11 16:39:48.000000000 -0400 @@ -137,6 +137,7 @@ template(`razor_per_role_template',` gen_require(` @@ -22472,9 +22502,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.3/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.4/policy/modules/services/razor.te --- nsaserefpolicy/policy/modules/services/razor.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/razor.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/razor.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,21 +6,51 @@ # Declarations # @@ -22530,9 +22560,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/rdisc.if serefpolicy-3.5.3/policy/modules/services/rdisc.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rdisc.if serefpolicy-3.5.4/policy/modules/services/rdisc.if --- nsaserefpolicy/policy/modules/services/rdisc.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rdisc.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rdisc.if 2008-08-11 16:39:48.000000000 -0400 @@ -1 +1,20 @@ ## Network router discovery daemon + @@ -22554,9 +22584,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + init_script_domtrans_spec($1, rdisc_script_exec_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rdisc.te serefpolicy-3.5.3/policy/modules/services/rdisc.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rdisc.te serefpolicy-3.5.4/policy/modules/services/rdisc.te --- nsaserefpolicy/policy/modules/services/rdisc.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rdisc.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rdisc.te 2008-08-11 16:39:48.000000000 -0400 @@ -45,6 +45,8 @@ libs_use_ld_so(rdisc_t) libs_use_shared_libs(rdisc_t) @@ -22566,9 +22596,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol logging_send_syslog_msg(rdisc_t) sysnet_read_config(rdisc_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-3.5.3/policy/modules/services/remotelogin.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-3.5.4/policy/modules/services/remotelogin.te --- nsaserefpolicy/policy/modules/services/remotelogin.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/remotelogin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/remotelogin.te 2008-08-11 16:39:48.000000000 -0400 @@ -85,6 +85,7 @@ miscfiles_read_localization(remote_login_t) @@ -22577,9 +22607,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol userdom_use_unpriv_users_fds(remote_login_t) userdom_search_all_users_home_content(remote_login_t) # Only permit unprivileged user domains to be entered via rlogin, -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.5.3/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.4/policy/modules/services/rlogin.te --- nsaserefpolicy/policy/modules/services/rlogin.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rlogin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rlogin.te 2008-08-11 16:39:48.000000000 -0400 @@ -94,8 +94,8 @@ remotelogin_signal(rlogind_t) @@ -22591,18 +22621,18 @@ 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.3/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.4/policy/modules/services/roundup.fc --- nsaserefpolicy/policy/modules/services/roundup.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/roundup.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/roundup.fc 2008-08-11 16:39:48.000000000 -0400 @@ -7,3 +7,5 @@ # /var # /var/lib/roundup(/.*)? -- gen_context(system_u:object_r:roundup_var_lib_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.3/policy/modules/services/roundup.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.if serefpolicy-3.5.4/policy/modules/services/roundup.if --- nsaserefpolicy/policy/modules/services/roundup.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/roundup.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/roundup.if 2008-08-11 16:39:48.000000000 -0400 @@ -1 +1,66 @@ ## Roundup Issue Tracking System policy + @@ -22665,14 +22695,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_var_lib($1) -+ manage_all_pattern($1, roundup_var_lib_t) ++ admin_pattern($1, roundup_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/roundup.te --- nsaserefpolicy/policy/modules/services/roundup.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/roundup.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/roundup.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,9 @@ type roundup_var_lib_t; files_type(roundup_var_lib_t) @@ -22683,9 +22713,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/services/rpc.if serefpolicy-3.5.3/policy/modules/services/rpc.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.5.4/policy/modules/services/rpc.if --- nsaserefpolicy/policy/modules/services/rpc.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rpc.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rpc.if 2008-08-11 16:39:48.000000000 -0400 @@ -88,8 +88,11 @@ # bind to arbitary unused ports corenet_tcp_bind_generic_port($1_t) @@ -22724,9 +22754,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.3/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.4/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rpc.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rpc.te 2008-08-11 16:39:48.000000000 -0400 @@ -23,7 +23,7 @@ gen_tunable(allow_nfsd_anon_write, false) @@ -22838,18 +22868,18 @@ 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.3/policy/modules/services/rpcbind.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.4/policy/modules/services/rpcbind.fc --- nsaserefpolicy/policy/modules/services/rpcbind.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rpcbind.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rpcbind.fc 2008-08-11 16:39:48.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.3/policy/modules/services/rpcbind.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.5.4/policy/modules/services/rpcbind.if --- nsaserefpolicy/policy/modules/services/rpcbind.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rpcbind.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rpcbind.if 2008-08-11 16:39:48.000000000 -0400 @@ -95,3 +95,68 @@ manage_files_pattern($1, rpcbind_var_lib_t, rpcbind_var_lib_t) files_search_var_lib($1) @@ -22914,14 +22944,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_var_lib($1) -+ manage_all_pattern($1, rpcbind_var_lib_t) ++ admin_pattern($1, rpcbind_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, rpcbind_var_run_t) ++ 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.3/policy/modules/services/rpcbind.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.4/policy/modules/services/rpcbind.te --- nsaserefpolicy/policy/modules/services/rpcbind.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rpcbind.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rpcbind.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,16 +16,21 @@ type rpcbind_var_lib_t; files_type(rpcbind_var_lib_t) @@ -22953,9 +22983,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol kernel_read_network_state(rpcbind_t) 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.3/policy/modules/services/rshd.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.5.4/policy/modules/services/rshd.te --- nsaserefpolicy/policy/modules/services/rshd.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rshd.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rshd.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,7 +16,7 @@ # # Local policy @@ -23017,18 +23047,18 @@ 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/rwho.fc serefpolicy-3.5.3/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.4/policy/modules/services/rwho.fc --- nsaserefpolicy/policy/modules/services/rwho.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rwho.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rwho.fc 2008-08-11 16:39:48.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) + +/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.3/policy/modules/services/rwho.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-3.5.4/policy/modules/services/rwho.if --- nsaserefpolicy/policy/modules/services/rwho.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rwho.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rwho.if 2008-08-11 16:39:48.000000000 -0400 @@ -118,6 +118,25 @@ ######################################## @@ -23073,15 +23103,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + logging_list_logs($1) - manage_files_pattern($1, rwho_log_t, rwho_log_t) -+ manage_all_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) -+ manage_all_pattern($1, 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.3/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.4/policy/modules/services/rwho.te --- nsaserefpolicy/policy/modules/services/rwho.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/rwho.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/rwho.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,9 @@ type rwho_spool_t; files_type(rwho_spool_t) @@ -23092,9 +23122,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # rwho local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.5.3/policy/modules/services/samba.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.5.4/policy/modules/services/samba.fc --- nsaserefpolicy/policy/modules/services/samba.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/samba.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/samba.fc 2008-08-11 16:39:48.000000000 -0400 @@ -15,6 +15,7 @@ /usr/bin/ntlm_auth -- gen_context(system_u:object_r:winbind_helper_exec_t,s0) /usr/bin/smbmount -- gen_context(system_u:object_r:smbmount_exec_t,s0) @@ -23115,9 +23145,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +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.3/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.4/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/samba.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/samba.if 2008-08-11 16:39:48.000000000 -0400 @@ -33,12 +33,12 @@ ') @@ -23456,38 +23486,38 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, smbd_tmp_t) -+ manage_all_pattern($1, swat_tmp_t) -+ manage_all_pattern($1, winbind_tmp_t) ++ admin_pattern($1, smbd_tmp_t) ++ admin_pattern($1, swat_tmp_t) ++ admin_pattern($1, winbind_tmp_t) + -+ manage_all_pattern($1, samba_secrets_t) ++ admin_pattern($1, samba_secrets_t) + + files_list_etc($1) -+ manage_all_pattern($1, samba_etc_t) ++ admin_pattern($1, samba_etc_t) + -+ manage_all_pattern($1, samba_share_t) ++ admin_pattern($1, samba_share_t) + + logging_list_logs($1) -+ manage_all_pattern($1, samba_log_t) -+ manage_all_pattern($1, winbind_log_t) ++ admin_pattern($1, samba_log_t) ++ admin_pattern($1, winbind_log_t) + + files_list_spool($1) -+ manage_all_pattern($1, smbd_spool_t) ++ admin_pattern($1, smbd_spool_t) + + files_list_var($1) -+ manage_all_pattern($1, samba_var_t) ++ admin_pattern($1, samba_var_t) + + files_list_pids($1) -+ manage_all_pattern($1, smbd_var_run_t) -+ manage_all_pattern($1, nmbd_var_run_t) -+ manage_all_pattern($1, swat_var_run_t) -+ manage_all_pattern($1, winbind_var_run_t) -+ manage_all_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.3/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.4/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/samba.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/samba.te 2008-08-11 16:39:48.000000000 -0400 @@ -66,6 +66,13 @@ ## gen_tunable(samba_share_nfs, false) @@ -23828,18 +23858,18 @@ 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.3/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.4/policy/modules/services/sasl.fc --- nsaserefpolicy/policy/modules/services/sasl.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/sasl.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/sasl.fc 2008-08-11 16:39:48.000000000 -0400 @@ -8,3 +8,5 @@ # /var # /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.3/policy/modules/services/sasl.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.if serefpolicy-3.5.4/policy/modules/services/sasl.if --- nsaserefpolicy/policy/modules/services/sasl.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/sasl.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/sasl.if 2008-08-11 16:39:48.000000000 -0400 @@ -21,6 +21,25 @@ ######################################## @@ -23884,15 +23914,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_list_tmp($1) - manage_files_pattern($1, saslauthd_tmp_t, saslauthd_tmp_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/sasl.te --- nsaserefpolicy/policy/modules/services/sasl.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/sasl.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/sasl.te 2008-08-11 16:39:48.000000000 -0400 @@ -23,6 +23,9 @@ type saslauthd_var_run_t; files_pid_file(saslauthd_var_run_t) @@ -23923,9 +23953,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.3/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.4/policy/modules/services/sendmail.if --- nsaserefpolicy/policy/modules/services/sendmail.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/sendmail.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/sendmail.if 2008-08-11 16:39:48.000000000 -0400 @@ -149,3 +149,104 @@ logging_log_filetrans($1, sendmail_log_t, file) @@ -24031,9 +24061,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.3/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.4/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/sendmail.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/sendmail.te 2008-08-11 16:39:48.000000000 -0400 @@ -20,13 +20,17 @@ mta_mailserver_delivery(sendmail_t) mta_mailserver_sender(sendmail_t) @@ -24191,18 +24221,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.3/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.4/policy/modules/services/setroubleshoot.fc --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/setroubleshoot.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/setroubleshoot.fc 2008-08-11 16:39:48.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) + +/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.3/policy/modules/services/setroubleshoot.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.5.4/policy/modules/services/setroubleshoot.if --- nsaserefpolicy/policy/modules/services/setroubleshoot.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/setroubleshoot.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/setroubleshoot.if 2008-08-11 16:39:48.000000000 -0400 @@ -16,14 +16,13 @@ ') @@ -24290,19 +24320,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + logging_list_logs($1) -+ manage_all_pattern($1, setroubleshoot_log_t) ++ admin_pattern($1, setroubleshoot_log_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, setroubleshoot_var_lib_t) ++ admin_pattern($1, setroubleshoot_var_lib_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/setroubleshoot.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/setroubleshoot.te 2008-08-11 16:39:48.000000000 -0400 @@ -22,13 +22,16 @@ type setroubleshoot_var_run_t; files_pid_file(setroubleshoot_var_run_t) @@ -24382,17 +24412,17 @@ 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/smartmon.fc serefpolicy-3.5.3/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.4/policy/modules/services/smartmon.fc --- nsaserefpolicy/policy/modules/services/smartmon.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/smartmon.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/smartmon.fc 2008-08-11 16:39:48.000000000 -0400 @@ -8,3 +8,4 @@ # /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.3/policy/modules/services/smartmon.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.if serefpolicy-3.5.4/policy/modules/services/smartmon.if --- nsaserefpolicy/policy/modules/services/smartmon.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/smartmon.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/smartmon.if 2008-08-11 16:39:48.000000000 -0400 @@ -20,6 +20,25 @@ ######################################## @@ -24437,15 +24467,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_list_tmp($1) - manage_files_pattern($1, fsdaemon_tmp_t, fsdaemon_tmp_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/smartmon.te --- nsaserefpolicy/policy/modules/services/smartmon.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/smartmon.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/smartmon.te 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,10 @@ type fsdaemon_tmp_t; files_tmp_file(fsdaemon_tmp_t) @@ -24485,9 +24515,9 @@ 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.3/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.4/policy/modules/services/snmp.fc --- nsaserefpolicy/policy/modules/services/snmp.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/snmp.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/snmp.fc 2008-08-11 16:39:48.000000000 -0400 @@ -17,3 +17,6 @@ /var/run/snmpd -d gen_context(system_u:object_r:snmpd_var_run_t,s0) @@ -24495,9 +24525,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.3/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.4/policy/modules/services/snmp.if --- nsaserefpolicy/policy/modules/services/snmp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/snmp.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/snmp.if 2008-08-11 16:39:48.000000000 -0400 @@ -87,6 +87,25 @@ ######################################## @@ -24558,19 +24588,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + logging_list_logs($1) - manage_files_pattern($1, snmpd_log_t, snmpd_log_t) -+ manage_all_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) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/snmp.te --- nsaserefpolicy/policy/modules/services/snmp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/snmp.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/snmp.te 2008-08-11 16:39:48.000000000 -0400 @@ -18,12 +18,16 @@ type snmpd_var_lib_t; files_type(snmpd_var_lib_t) @@ -24632,9 +24662,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/snort.fc serefpolicy-3.5.3/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.4/policy/modules/services/snort.fc --- nsaserefpolicy/policy/modules/services/snort.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/snort.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/snort.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,6 +1,10 @@ +/usr/s?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) +/usr/sbin/snort-plain -- gen_context(system_u:object_r:snort_exec_t,s0) @@ -24647,9 +24677,9 @@ 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) + +/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.3/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.4/policy/modules/services/snort.if --- nsaserefpolicy/policy/modules/services/snort.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/snort.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/snort.if 2008-08-11 17:10:21.000000000 -0400 @@ -1 +1,91 @@ ## Snort network intrusion detection system + @@ -24720,9 +24750,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $1 snort_t:process { ptrace signal_perms }; + ps_process_pattern($1, snort_t) + -+ manage_all_pattern($1, snort_etc_t) -+ manage_all_pattern($1, snort_var_run_t) -+ manage_all_pattern($1, snort_log_t) ++ admin_pattern($1, snort_etc_t) ++ admin_pattern($1, snort_var_run_t) ++ admin_pattern($1, snort_log_t) +') + +######################################## @@ -24742,9 +24772,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + 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.3/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.4/policy/modules/services/snort.te --- nsaserefpolicy/policy/modules/services/snort.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/snort.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/snort.te 2008-08-11 16:39:48.000000000 -0400 @@ -10,8 +10,11 @@ type snort_exec_t; init_daemon_domain(snort_t, snort_exec_t) @@ -24790,9 +24820,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.3/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.4/policy/modules/services/soundserver.fc --- nsaserefpolicy/policy/modules/services/soundserver.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/soundserver.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/soundserver.fc 2008-08-11 16:39:48.000000000 -0400 @@ -7,4 +7,8 @@ /usr/sbin/yiff -- gen_context(system_u:object_r:soundd_exec_t,s0) @@ -24802,9 +24832,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol /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.3/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.4/policy/modules/services/soundserver.if --- nsaserefpolicy/policy/modules/services/soundserver.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/soundserver.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/soundserver.if 2008-08-11 16:39:48.000000000 -0400 @@ -13,3 +13,74 @@ interface(`soundserver_tcp_connect',` refpolicywarn(`$0($*) has been deprecated.') @@ -24870,19 +24900,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, soundd_tmp_t) ++ admin_pattern($1, soundd_tmp_t) + + files_list_etc($1) -+ manage_all_pattern($1, soundd_etc_t) ++ admin_pattern($1, soundd_etc_t) + + files_list_pids($1) -+ manage_all_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.3/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.4/policy/modules/services/soundserver.te --- nsaserefpolicy/policy/modules/services/soundserver.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/soundserver.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/soundserver.te 2008-08-11 16:39:48.000000000 -0400 @@ -11,7 +11,7 @@ init_daemon_domain(soundd_t, soundd_exec_t) @@ -24947,9 +24977,9 @@ 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.3/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.4/policy/modules/services/spamassassin.fc --- nsaserefpolicy/policy/modules/services/spamassassin.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/spamassassin.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/spamassassin.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,16 +1,22 @@ -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) @@ -24976,9 +25006,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) + +/etc/rc.d/init.d/spamd -- 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.3/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.4/policy/modules/services/spamassassin.if --- nsaserefpolicy/policy/modules/services/spamassassin.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/spamassassin.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/spamassassin.if 2008-08-11 16:39:48.000000000 -0400 @@ -34,10 +34,10 @@ # cjp: when tunables are available, spamc stuff should be # toggled on activation of spamc, and similarly for spamd. @@ -25493,19 +25523,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_tmp($1) -+ manage_all_pattern($1, spamd_tmp_t) ++ admin_pattern($1, spamd_tmp_t) + + logging_list_logs($1) -+ manage_all_pattern($1, spamd_log_t) ++ admin_pattern($1, spamd_log_t) + + files_list_spool($1) -+ manage_all_pattern($1, spamd_spool_t) ++ admin_pattern($1, spamd_spool_t) + + files_list_var_lib($1) -+ manage_all_pattern($1, spamd_var_lib_t) ++ admin_pattern($1, spamd_var_lib_t) + + files_list_pids($1) -+ manage_all_pattern($1, spamd_var_run_t) ++ admin_pattern($1, spamd_var_run_t) +') + +######################################## @@ -25541,9 +25571,9 @@ 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.3/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.4/policy/modules/services/spamassassin.te --- nsaserefpolicy/policy/modules/services/spamassassin.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/spamassassin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/spamassassin.te 2008-08-11 16:39:48.000000000 -0400 @@ -21,8 +21,10 @@ gen_tunable(spamd_enable_home_dirs, true) @@ -25800,9 +25830,9 @@ 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.3/policy/modules/services/squid.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-3.5.4/policy/modules/services/squid.fc --- nsaserefpolicy/policy/modules/services/squid.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/squid.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/squid.fc 2008-08-11 16:39:48.000000000 -0400 @@ -12,3 +12,8 @@ /var/run/squid\.pid -- gen_context(system_u:object_r:squid_var_run_t,s0) @@ -25812,9 +25842,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.if serefpolicy-3.5.3/policy/modules/services/squid.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-3.5.4/policy/modules/services/squid.if --- nsaserefpolicy/policy/modules/services/squid.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/squid.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/squid.if 2008-08-11 16:39:48.000000000 -0400 @@ -131,3 +131,114 @@ interface(`squid_use',` refpolicywarn(`$0($*) has been deprecated.') @@ -25900,16 +25930,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $2 system_r; + + files_list_etc($1) -+ manage_all_pattern($1, squid_conf_t) ++ admin_pattern($1, squid_conf_t) + + logging_list_logs($1) -+ manage_all_pattern($1, squid_log_t) ++ admin_pattern($1, squid_log_t) + + files_list_var($1) -+ manage_all_pattern($1, squid_cache_t) ++ admin_pattern($1, squid_cache_t) + + files_list_pids($1) -+ manage_all_pattern($1, squid_var_run_t) ++ admin_pattern($1, squid_var_run_t) +') + +######################################## @@ -25930,9 +25960,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow $1 squid_t:process signal; +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.3/policy/modules/services/squid.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.4/policy/modules/services/squid.te --- nsaserefpolicy/policy/modules/services/squid.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/squid.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/squid.te 2008-08-11 16:39:48.000000000 -0400 @@ -31,12 +31,15 @@ type squid_var_run_t; files_pid_file(squid_var_run_t) @@ -26018,18 +26048,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + 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.3/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.4/policy/modules/services/ssh.fc --- nsaserefpolicy/policy/modules/services/ssh.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ssh.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ssh.fc 2008-08-11 16:39:48.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.3/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.4/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ssh.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ssh.if 2008-08-11 16:39:48.000000000 -0400 @@ -36,6 +36,7 @@ gen_require(` attribute ssh_server; @@ -26180,9 +26210,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/ssh.te serefpolicy-3.5.3/policy/modules/services/ssh.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.5.4/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/ssh.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/ssh.te 2008-08-11 16:39:48.000000000 -0400 @@ -24,7 +24,7 @@ # Type for the ssh-agent executable. @@ -26244,9 +26274,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/telnet.te serefpolicy-3.5.3/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.4/policy/modules/services/telnet.te --- nsaserefpolicy/policy/modules/services/telnet.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/telnet.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/telnet.te 2008-08-11 16:39:48.000000000 -0400 @@ -89,15 +89,19 @@ userdom_search_unpriv_users_home_dirs(telnetd_t) @@ -26271,26 +26301,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.3/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.4/policy/modules/services/tftp.if --- nsaserefpolicy/policy/modules/services/tftp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/tftp.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/tftp.if 2008-08-11 16:39:48.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) -+ manage_all_pattern($1, tftpdir_rw_t) ++ admin_pattern($1, tftpdir_rw_t) - manage_files_pattern($1, tftpdir_t, tftpdir_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/tftp.te --- nsaserefpolicy/policy/modules/services/tftp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/tftp.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/tftp.te 2008-08-11 16:39:48.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; @@ -26335,18 +26365,18 @@ 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.3/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.4/policy/modules/services/tor.fc --- nsaserefpolicy/policy/modules/services/tor.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/tor.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/tor.fc 2008-08-11 16:39:48.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.3/policy/modules/services/tor.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-3.5.4/policy/modules/services/tor.if --- nsaserefpolicy/policy/modules/services/tor.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/tor.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/tor.if 2008-08-11 16:39:48.000000000 -0400 @@ -20,6 +20,25 @@ ######################################## @@ -26391,24 +26421,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + logging_list_logs($1) - manage_files_pattern($1, tor_var_log_t, tor_var_log_t) -+ manage_all_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) -+ manage_all_pattern($1, tor_etc_t) ++ admin_pattern($1, tor_etc_t) files_list_var_lib($1) - manage_files_pattern($1, tor_var_lib_t, tor_var_lib_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/tor.te --- nsaserefpolicy/policy/modules/services/tor.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/tor.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/tor.te 2008-08-11 16:39:48.000000000 -0400 @@ -26,11 +26,15 @@ type tor_var_run_t; files_pid_file(tor_var_run_t) @@ -26441,37 +26471,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.3/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.4/policy/modules/services/uucp.if --- nsaserefpolicy/policy/modules/services/uucp.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/uucp.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/uucp.if 2008-08-11 16:39:48.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) -+ manage_all_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) -+ manage_all_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) -+ manage_all_pattern($1, uucpd_spool_t) ++ admin_pattern($1, uucpd_spool_t) - manage_files_pattern($1, uucpd_rw_t, uucpd_rw_t) -+ manage_all_pattern($1, uucpd_rw_t) ++ admin_pattern($1, uucpd_rw_t) - manage_files_pattern($1, uucpd_ro_t, uucpd_ro_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/uucp.te --- nsaserefpolicy/policy/modules/services/uucp.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/uucp.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/uucp.te 2008-08-11 16:39:48.000000000 -0400 @@ -116,6 +116,8 @@ files_read_etc_files(uux_t) @@ -26481,9 +26511,9 @@ 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.3/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.4/policy/modules/services/virt.fc --- nsaserefpolicy/policy/modules/services/virt.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/virt.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/virt.fc 2008-08-11 16:39:48.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) @@ -26491,9 +26521,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +/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.3/policy/modules/services/virt.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.5.4/policy/modules/services/virt.if --- nsaserefpolicy/policy/modules/services/virt.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/virt.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/virt.if 2008-08-11 16:39:48.000000000 -0400 @@ -68,7 +68,7 @@ ## ## @@ -26591,9 +26621,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol 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.3/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.4/policy/modules/services/virt.te --- nsaserefpolicy/policy/modules/services/virt.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/virt.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/virt.te 2008-08-11 16:39:48.000000000 -0400 @@ -1,6 +1,8 @@ policy_module(virt, 1.0.0) @@ -26724,15 +26754,15 @@ 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/w3c.fc serefpolicy-3.5.3/policy/modules/services/w3c.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-3.5.4/policy/modules/services/w3c.fc --- nsaserefpolicy/policy/modules/services/w3c.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/w3c.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/w3c.fc 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,2 @@ +/usr/share/w3c-markup-validator(/.*)? gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0) +/usr/share/w3c-markup-validator/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-3.5.3/policy/modules/services/w3c.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-3.5.4/policy/modules/services/w3c.if --- nsaserefpolicy/policy/modules/services/w3c.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/w3c.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/w3c.if 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,20 @@ +## W3C + @@ -26754,9 +26784,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + init_script_domtrans_spec($1, w3c_script_exec_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.5.3/policy/modules/services/w3c.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.5.4/policy/modules/services/w3c.te --- nsaserefpolicy/policy/modules/services/w3c.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.5.3/policy/modules/services/w3c.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/w3c.te 2008-08-11 16:39:48.000000000 -0400 @@ -0,0 +1,14 @@ +policy_module(w3c, 1.2.1) + @@ -26772,9 +26802,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t) + +miscfiles_read_certs(httpd_w3c_validator_script_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.5.3/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.4/policy/modules/services/xserver.fc --- nsaserefpolicy/policy/modules/services/xserver.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/xserver.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/xserver.fc 2008-08-11 16:39:48.000000000 -0400 @@ -1,13 +1,14 @@ # # HOME_DIR @@ -26845,9 +26875,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.3/policy/modules/services/xserver.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.5.4/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/xserver.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/xserver.if 2008-08-11 16:39:48.000000000 -0400 @@ -16,6 +16,7 @@ gen_require(` type xkb_var_lib_t, xserver_exec_t, xserver_log_t; @@ -27907,9 +27937,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + read_files_pattern($1, fonts_home_t, fonts_home_t) + read_lnk_files_pattern($1, fonts_home_t, fonts_home_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.3/policy/modules/services/xserver.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.4/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/xserver.te 2008-08-07 16:11:36.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/xserver.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,6 +8,14 @@ ## @@ -28147,7 +28177,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -userdom_read_unpriv_users_home_content_files(xdm_t) +unprivuser_read_home_content_files(xdm_t) +unprivuser_dontaudit_write_home_content_files(xdm_t) -+userdom_manage_user_home_content_files(xdm_t) ++userdom_manage_user_home_content_files(user, xdm_t) + # Search /proc for any user domain processes. userdom_read_all_users_state(xdm_t) @@ -28344,18 +28374,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow x_domain xdm_xserver_tmpfs_t:file rw_file_perms; +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.fc serefpolicy-3.5.3/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.4/policy/modules/services/zabbix.fc --- nsaserefpolicy/policy/modules/services/zabbix.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/zabbix.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/zabbix.fc 2008-08-11 16:39:48.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) + +/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.3/policy/modules/services/zabbix.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zabbix.if serefpolicy-3.5.4/policy/modules/services/zabbix.if --- nsaserefpolicy/policy/modules/services/zabbix.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/zabbix.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/zabbix.if 2008-08-11 16:39:48.000000000 -0400 @@ -79,6 +79,25 @@ ######################################## @@ -28402,15 +28432,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol logging_list_logs($1) - manage_files_pattern($1, zabbix_log_t, zabbix_log_t) -+ manage_all_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) -+ manage_all_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.3/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.4/policy/modules/services/zabbix.te --- nsaserefpolicy/policy/modules/services/zabbix.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/zabbix.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/zabbix.te 2008-08-11 16:39:48.000000000 -0400 @@ -18,6 +18,9 @@ type zabbix_var_run_t; files_pid_file(zabbix_var_run_t) @@ -28421,9 +28451,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ######################################## # # zabbix local policy -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.fc serefpolicy-3.5.3/policy/modules/services/zebra.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.fc serefpolicy-3.5.4/policy/modules/services/zebra.fc --- nsaserefpolicy/policy/modules/services/zebra.fc 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/zebra.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/zebra.fc 2008-08-11 16:39:48.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) @@ -28435,9 +28465,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/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.3/policy/modules/services/zebra.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.5.4/policy/modules/services/zebra.if --- nsaserefpolicy/policy/modules/services/zebra.if 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/zebra.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/zebra.if 2008-08-11 16:39:48.000000000 -0400 @@ -24,6 +24,26 @@ ######################################## @@ -28485,23 +28515,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol files_list_tmp($1) - manage_files_pattern($1, zebra_tmp_t, zebra_tmp_t) -+ manage_all_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) -+ manage_all_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) -+ manage_all_pattern($1, zebra_conf_t) ++ admin_pattern($1, zebra_conf_t) files_list_pids($1) - manage_files_pattern($1, zebra_var_run_t, zebra_var_run_t) -+ manage_all_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.3/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.4/policy/modules/services/zebra.te --- nsaserefpolicy/policy/modules/services/zebra.te 2008-08-07 11:15:11.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/services/zebra.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/services/zebra.te 2008-08-11 16:39:48.000000000 -0400 @@ -30,6 +30,9 @@ type zebra_var_run_t; files_pid_file(zebra_var_run_t) @@ -28529,9 +28559,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.3/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.4/policy/modules/system/application.te --- nsaserefpolicy/policy/modules/system/application.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/application.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/application.te 2008-08-11 16:39:48.000000000 -0400 @@ -7,6 +7,12 @@ # Executables to be run by user attribute application_exec_type; @@ -28545,9 +28575,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.3/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.4/policy/modules/system/authlogin.fc --- nsaserefpolicy/policy/modules/system/authlogin.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/authlogin.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/authlogin.fc 2008-08-11 16:39:48.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) @@ -28574,9 +28604,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.3/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.4/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/authlogin.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/authlogin.if 2008-08-11 16:39:48.000000000 -0400 @@ -56,10 +56,6 @@ miscfiles_read_localization($1_chkpwd_t) @@ -28836,9 +28866,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.3/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.4/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/authlogin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/authlogin.te 2008-08-11 16:39:48.000000000 -0400 @@ -59,6 +59,9 @@ type utempter_exec_t; application_domain(utempter_t,utempter_exec_t) @@ -28938,9 +28968,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.3/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.4/policy/modules/system/fstools.fc --- nsaserefpolicy/policy/modules/system/fstools.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/fstools.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/fstools.fc 2008-08-11 16:39:48.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) @@ -28954,9 +28984,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.if serefpolicy-3.5.3/policy/modules/system/fstools.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-3.5.4/policy/modules/system/fstools.if --- nsaserefpolicy/policy/modules/system/fstools.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/fstools.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/fstools.if 2008-08-11 16:39:48.000000000 -0400 @@ -142,3 +142,21 @@ allow $1 swapfile_t:file getattr; @@ -28979,9 +29009,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + + allow $1 fsadm_t:process signal; +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.5.3/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.4/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/fstools.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/fstools.te 2008-08-11 16:39:48.000000000 -0400 @@ -97,6 +97,10 @@ fs_getattr_tmpfs_dirs(fsadm_t) fs_read_tmpfs_symlinks(fsadm_t) @@ -29003,9 +29033,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/getty.fc serefpolicy-3.5.3/policy/modules/system/getty.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-3.5.4/policy/modules/system/getty.fc --- nsaserefpolicy/policy/modules/system/getty.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/getty.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/getty.fc 2008-08-11 16:39:48.000000000 -0400 @@ -8,5 +8,5 @@ /var/run/mgetty\.pid.* -- gen_context(system_u:object_r:getty_var_run_t,s0) @@ -29014,9 +29044,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol -/var/spool/voice -- gen_context(system_u:object_r:getty_var_run_t,s0) +/var/spool/fax(/.*)? gen_context(system_u:object_r:getty_var_run_t,s0) +/var/spool/voice(/.*)? gen_context(system_u:object_r:getty_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.5.3/policy/modules/system/getty.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-3.5.4/policy/modules/system/getty.te --- nsaserefpolicy/policy/modules/system/getty.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/getty.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/getty.te 2008-08-11 16:39:48.000000000 -0400 @@ -9,6 +9,7 @@ type getty_t; type getty_exec_t; @@ -29025,9 +29055,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol domain_interactive_fd(getty_t) type getty_etc_t; -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.5.3/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.4/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/hostname.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/hostname.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,7 +8,9 @@ type hostname_t; @@ -29039,9 +29069,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.3/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.4/policy/modules/system/init.fc --- nsaserefpolicy/policy/modules/system/init.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/init.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/init.fc 2008-08-11 16:39:48.000000000 -0400 @@ -4,8 +4,7 @@ /etc/init\.d/.* -- gen_context(system_u:object_r:initrc_exec_t,s0) @@ -29061,9 +29091,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.3/policy/modules/system/init.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.5.4/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/init.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/init.if 2008-08-11 16:39:48.000000000 -0400 @@ -211,6 +211,19 @@ kernel_dontaudit_use_fds($1) ') @@ -29384,9 +29414,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + allow init_t $1:unix_dgram_socket sendto; +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.3/policy/modules/system/init.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.4/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/init.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/init.te 2008-08-11 16:39:48.000000000 -0400 @@ -17,6 +17,20 @@ ## gen_tunable(init_upstart,false) @@ -29620,53 +29650,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +unprivuser_write_tmp_files(daemon) +logging_append_all_logs(daemon) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-3.5.3/policy/modules/system/ipsec.if ---- nsaserefpolicy/policy/modules/system/ipsec.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/ipsec.if 2008-08-07 16:06:08.000000000 -0400 -@@ -150,6 +150,26 @@ - manage_files_pattern($1,ipsec_var_run_t,ipsec_var_run_t) - ') - -+ -+######################################## -+## -+## write the ipsec_var_run_t files. -+## -+## -+## -+## The type of the process performing this action. -+## -+## -+# -+interface(`ipsec_write_pid',` -+ gen_require(` -+ type ipsec_var_run_t; -+ ') -+ -+ files_search_pids($1) -+ write_files_pattern($1, ipsec_var_run_t, ipsec_var_run_t) -+') -+ - ######################################## - ## - ## Execute racoon in the racoon domain. -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.5.3/policy/modules/system/ipsec.te ---- nsaserefpolicy/policy/modules/system/ipsec.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/ipsec.te 2008-08-07 16:06:08.000000000 -0400 -@@ -69,8 +69,8 @@ - read_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t) - read_lnk_files_pattern(ipsec_t,ipsec_key_file_t,ipsec_key_file_t) - --allow ipsec_t ipsec_var_run_t:file manage_file_perms; --allow ipsec_t ipsec_var_run_t:sock_file manage_sock_file_perms; -+manage_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t) -+manage_sock_files_pattern(ipsec_t, ipsec_var_run_t, ipsec_var_run_t) - files_pid_filetrans(ipsec_t,ipsec_var_run_t,{ file sock_file }) - - can_exec(ipsec_t, ipsec_mgmt_exec_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.if serefpolicy-3.5.3/policy/modules/system/iptables.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.if serefpolicy-3.5.4/policy/modules/system/iptables.if --- nsaserefpolicy/policy/modules/system/iptables.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/iptables.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/iptables.if 2008-08-11 16:39:48.000000000 -0400 @@ -49,6 +49,12 @@ iptables_domtrans($1) role $2 types iptables_t; @@ -29680,9 +29666,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/iptables.te serefpolicy-3.5.3/policy/modules/system/iptables.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.5.4/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/iptables.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/iptables.te 2008-08-11 16:39:48.000000000 -0400 @@ -48,6 +48,7 @@ fs_getattr_xattr_fs(iptables_t) @@ -29708,40 +29694,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +optional_policy(` + unconfined_rw_stream_sockets(iptables_t) +') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.fc serefpolicy-3.5.3/policy/modules/system/iscsi.fc ---- nsaserefpolicy/policy/modules/system/iscsi.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/iscsi.fc 2008-08-07 16:06:08.000000000 -0400 -@@ -1,5 +1,5 @@ - /sbin/iscsid -- gen_context(system_u:object_r:iscsid_exec_t,s0) - --/var/lib/iscsi(/.*)? -- gen_context(system_u:object_r:iscsi_var_lib_t,s0) --/var/lock/iscsi(/.*)? -- gen_context(system_u:object_r:iscsi_lock_t,s0) -+/var/lib/iscsi(/.*)? gen_context(system_u:object_r:iscsi_var_lib_t,s0) -+/var/lock/iscsi(/.*)? gen_context(system_u:object_r:iscsi_lock_t,s0) - /var/run/iscsid\.pid -- gen_context(system_u:object_r:iscsi_var_run_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.5.3/policy/modules/system/iscsi.te ---- nsaserefpolicy/policy/modules/system/iscsi.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/iscsi.te 2008-08-07 16:06:08.000000000 -0400 -@@ -29,7 +29,7 @@ - # - - allow iscsid_t self:capability { dac_override ipc_lock net_admin sys_nice sys_resource }; --allow iscsid_t self:process { setrlimit setsched }; -+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 }; - allow iscsid_t self:unix_dgram_socket create_socket_perms; -@@ -63,6 +63,7 @@ - corenet_tcp_sendrecv_all_ports(iscsid_t) - corenet_tcp_connect_http_port(iscsid_t) - corenet_tcp_connect_iscsi_port(iscsid_t) -+corenet_tcp_connect_isns_port(iscsid_t) - - dev_rw_sysfs(iscsid_t) - -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.3/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.4/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/libraries.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/libraries.fc 2008-08-11 16:39:48.000000000 -0400 @@ -69,8 +69,10 @@ ifdef(`distro_gentoo',` # despite the extensions, they are actually libs @@ -29816,9 +29771,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.3/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.4/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/libraries.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/libraries.te 2008-08-11 16:39:48.000000000 -0400 @@ -23,6 +23,9 @@ init_system_domain(ldconfig_t,ldconfig_exec_t) role system_r types ldconfig_t; @@ -29885,9 +29840,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.3/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.4/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/locallogin.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/locallogin.te 2008-08-11 16:39:48.000000000 -0400 @@ -100,7 +100,6 @@ auth_rw_login_records(local_login_t) @@ -29964,9 +29919,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.3/policy/modules/system/logging.fc +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.5.4/policy/modules/system/logging.fc --- nsaserefpolicy/policy/modules/system/logging.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/logging.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/logging.fc 2008-08-11 16:39:48.000000000 -0400 @@ -4,6 +4,8 @@ /etc/syslog.conf gen_context(system_u:object_r:syslog_conf_t,s0) /etc/audit(/.*)? gen_context(system_u:object_r:auditd_etc_t,mls_systemhigh) @@ -30011,9 +29966,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol +/etc/rc\.d/init\.d/auditd -- gen_context(system_u:object_r:auditd_script_exec_t,s0) + +/var/cfengine/outputs(/.*)? gen_context(system_u:object_r:var_log_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.5.3/policy/modules/system/logging.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.5.4/policy/modules/system/logging.if --- nsaserefpolicy/policy/modules/system/logging.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/logging.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/logging.if 2008-08-11 16:39:48.000000000 -0400 @@ -213,12 +213,7 @@ ## # @@ -30273,9 +30228,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + files_search_pids($1) + stream_connect_pattern($1, audisp_var_run_t, audisp_var_run_t, audisp_t) ') -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.3/policy/modules/system/logging.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.4/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/logging.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/logging.te 2008-08-11 16:39:48.000000000 -0400 @@ -61,10 +61,29 @@ logging_log_file(var_log_t) files_mountpoint(var_log_t) @@ -30491,9 +30446,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + +sysnet_dns_name_resolve(audisp_remote_t) + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.5.3/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.4/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/lvm.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/lvm.fc 2008-08-11 16:39:48.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) @@ -30507,9 +30462,9 @@ 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.3/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.4/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/lvm.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/lvm.te 2008-08-11 16:39:48.000000000 -0400 @@ -13,6 +13,9 @@ type clvmd_var_run_t; files_pid_file(clvmd_var_run_t) @@ -30690,9 +30645,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.if serefpolicy-3.5.3/policy/modules/system/modutils.if +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-3.5.4/policy/modules/system/modutils.if --- nsaserefpolicy/policy/modules/system/modutils.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/modutils.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/modutils.if 2008-08-11 16:39:48.000000000 -0400 @@ -66,6 +66,25 @@ ######################################## @@ -30727,9 +30682,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/modutils.te serefpolicy-3.5.3/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.4/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/modutils.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/modutils.te 2008-08-11 16:39:48.000000000 -0400 @@ -22,6 +22,8 @@ type insmod_exec_t; application_domain(insmod_t,insmod_exec_t) @@ -30868,9 +30823,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.3/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.4/policy/modules/system/mount.fc --- nsaserefpolicy/policy/modules/system/mount.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/mount.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/mount.fc 2008-08-11 16:39:48.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) @@ -30879,9 +30834,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.3/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.4/policy/modules/system/mount.if --- nsaserefpolicy/policy/modules/system/mount.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/mount.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/mount.if 2008-08-11 16:39:48.000000000 -0400 @@ -49,6 +49,8 @@ mount_domtrans($1) role $2 types mount_t; @@ -30891,9 +30846,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.3/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.4/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/mount.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/mount.te 2008-08-11 16:39:48.000000000 -0400 @@ -18,17 +18,18 @@ init_system_domain(mount_t,mount_exec_t) role system_r types mount_t; @@ -31052,18 +31007,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.3/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.4/policy/modules/system/raid.te --- nsaserefpolicy/policy/modules/system/raid.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/raid.te 2008-08-07 16:06:08.000000000 -0400 -@@ -19,7 +19,7 @@ - # Local policy - # - --allow mdadm_t self:capability { dac_override sys_admin ipc_lock }; -+allow mdadm_t self:capability { dac_override mknod sys_admin ipc_lock }; - dontaudit mdadm_t self:capability sys_tty_config; - allow mdadm_t self:process { sigchld sigkill sigstop signull signal }; - allow mdadm_t self:fifo_file rw_fifo_file_perms; ++++ serefpolicy-3.5.4/policy/modules/system/raid.te 2008-08-11 17:00:44.000000000 -0400 @@ -39,6 +39,7 @@ dev_dontaudit_getattr_generic_files(mdadm_t) dev_dontaudit_getattr_generic_chr_files(mdadm_t) @@ -31072,9 +31018,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.3/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.4/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/selinuxutil.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/selinuxutil.fc 2008-08-11 16:39:48.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) @@ -31093,9 +31039,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.3/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.4/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/selinuxutil.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/selinuxutil.if 2008-08-11 16:39:48.000000000 -0400 @@ -555,6 +555,59 @@ ######################################## @@ -31556,9 +31502,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.3/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.4/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/selinuxutil.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/selinuxutil.te 2008-08-11 16:39:48.000000000 -0400 @@ -23,6 +23,9 @@ type selinux_config_t; files_type(selinux_config_t) @@ -31907,9 +31853,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.if serefpolicy-3.5.3/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.4/policy/modules/system/setrans.if --- nsaserefpolicy/policy/modules/system/setrans.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/setrans.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/setrans.if 2008-08-11 16:39:48.000000000 -0400 @@ -13,7 +13,6 @@ interface(`setrans_translate_context',` gen_require(` @@ -31918,9 +31864,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ') allow $1 self:unix_stream_socket create_stream_socket_perms; -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.5.3/policy/modules/system/setrans.te +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-3.5.4/policy/modules/system/setrans.te --- nsaserefpolicy/policy/modules/system/setrans.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/setrans.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/setrans.te 2008-08-11 16:39:48.000000000 -0400 @@ -28,7 +28,7 @@ # @@ -31938,18 +31884,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol selinux_compute_access_vector(setrans_t) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.3/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.4/policy/modules/system/sysnetwork.fc --- nsaserefpolicy/policy/modules/system/sysnetwork.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/sysnetwork.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/sysnetwork.fc 2008-08-11 16:39:48.000000000 -0400 @@ -57,3 +57,5 @@ ifdef(`distro_gentoo',` /var/lib/dhcpc(/.*)? gen_context(system_u:object_r:dhcpc_state_t,s0) ') + +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0) -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.3/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.4/policy/modules/system/sysnetwork.if --- nsaserefpolicy/policy/modules/system/sysnetwork.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/sysnetwork.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/sysnetwork.if 2008-08-11 16:39:48.000000000 -0400 @@ -553,6 +553,7 @@ type net_conf_t; ') @@ -32028,9 +31974,9 @@ 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.3/policy/modules/system/sysnetwork.te ---- nsaserefpolicy/policy/modules/system/sysnetwork.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/sysnetwork.te 2008-08-07 16:06:08.000000000 -0400 +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.4/policy/modules/system/sysnetwork.te +--- nsaserefpolicy/policy/modules/system/sysnetwork.te 2008-08-11 11:23:34.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/sysnetwork.te 2008-08-11 16:39:48.000000000 -0400 @@ -20,6 +20,10 @@ init_daemon_domain(dhcpc_t,dhcpc_exec_t) role system_r types dhcpc_t; @@ -32174,18 +32120,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol domain_use_interactive_fds(ifconfig_t) -@@ -324,6 +337,10 @@ +@@ -320,11 +333,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(` - nis_use_ypbind(ifconfig_t) ') -@@ -332,6 +349,14 @@ + optional_policy(` +@@ -336,6 +349,14 @@ ') optional_policy(` @@ -32200,9 +32149,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.3/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.4/policy/modules/system/udev.if --- nsaserefpolicy/policy/modules/system/udev.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/udev.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/udev.if 2008-08-11 16:39:48.000000000 -0400 @@ -96,6 +96,24 @@ ######################################## @@ -32256,9 +32205,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.3/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.4/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/udev.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/udev.te 2008-08-11 16:39:48.000000000 -0400 @@ -83,6 +83,7 @@ kernel_rw_unix_dgram_sockets(udev_t) kernel_dgram_send(udev_t) @@ -32314,9 +32263,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.3/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.4/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/unconfined.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/unconfined.fc 2008-08-11 16:39:48.000000000 -0400 @@ -2,15 +2,11 @@ # e.g.: # /usr/local/bin/appsrv -- gen_context(system_u:object_r:unconfined_exec_t,s0) @@ -32355,9 +32304,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.3/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.4/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/unconfined.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/unconfined.if 2008-08-11 16:39:48.000000000 -0400 @@ -12,14 +12,13 @@ # interface(`unconfined_domain_noaudit',` @@ -32720,9 +32669,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.3/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.4/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/unconfined.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/unconfined.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,35 +6,75 @@ # Declarations # @@ -33056,9 +33005,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.3/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.4/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/userdomain.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/userdomain.fc 2008-08-11 16:39:48.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) @@ -33069,9 +33018,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.3/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.4/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/userdomain.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/userdomain.if 2008-08-11 16:39:48.000000000 -0400 @@ -28,10 +28,14 @@ class context contains; ') @@ -34189,7 +34138,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ##

##

## This template creates a user domain, types, and -@@ -1171,7 +1164,6 @@ +@@ -1167,11 +1160,10 @@ + # + + # port access is audited even if dac would not have allowed it, so dontaudit it here +- corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) ++# corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) # Need the following rule to allow users to run vpnc corenet_tcp_bind_xserver_port($1_t) @@ -35625,9 +35579,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol + delete_lnk_files_pattern($1, home_type, home_type) +') + -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.3/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.4/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/userdomain.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/userdomain.te 2008-08-11 16:39:48.000000000 -0400 @@ -8,13 +8,6 @@ ## @@ -35742,9 +35696,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.3/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.4/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/xen.fc 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/xen.fc 2008-08-11 16:39:48.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) @@ -35753,9 +35707,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.3/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.4/policy/modules/system/xen.if --- nsaserefpolicy/policy/modules/system/xen.if 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/xen.if 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/xen.if 2008-08-11 16:39:48.000000000 -0400 @@ -167,11 +167,14 @@ # interface(`xen_stream_connect',` @@ -35797,9 +35751,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.3/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.4/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2008-08-07 11:15:12.000000000 -0400 -+++ serefpolicy-3.5.3/policy/modules/system/xen.te 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/modules/system/xen.te 2008-08-11 16:39:48.000000000 -0400 @@ -6,6 +6,13 @@ # Declarations # @@ -36036,36 +35990,31 @@ 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.3/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.4/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/support/file_patterns.spt 2008-08-07 16:06:08.000000000 -0400 -@@ -537,3 +537,23 @@ ++++ serefpolicy-3.5.4/policy/support/file_patterns.spt 2008-08-11 16:39:48.000000000 -0400 +@@ -537,3 +537,18 @@ allow $1 $2:dir rw_dir_perms; type_transition $1 $2:$4 $3; ') + -+define(`manage_all_pattern',` ++define(`admin_pattern',` + manage_dirs_pattern($1,$2,$2) + manage_files_pattern($1,$2,$2) + manage_lnk_files_pattern($1,$2,$2) + manage_fifo_files_pattern($1,$2,$2) + manage_sock_files_pattern($1,$2,$2) + -+ relabelto_dirs_pattern($1,$2,$2) -+ relabelto_files_pattern($1,$2,$2) -+ relabelto_lnk_files_pattern($1,$2,$2) -+ relabelto_fifo_files_pattern($1,$2,$2) -+ relabelto_sock_files_pattern($1,$2,$2) ++ relabel_dirs_pattern($1,$2,$2) ++ relabel_files_pattern($1,$2,$2) ++ relabel_lnk_files_pattern($1,$2,$2) ++ relabel_fifo_files_pattern($1,$2,$2) ++ relabel_sock_files_pattern($1,$2,$2) + -+ relabelfrom_dirs_pattern($1,$2,$2) -+ relabelfrom_files_pattern($1,$2,$2) -+ relabelfrom_lnk_files_pattern($1,$2,$2) -+ relabelfrom_fifo_files_pattern($1,$2,$2) -+ relabelfrom_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.3/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.4/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/support/obj_perm_sets.spt 2008-08-08 09:47:53.000000000 -0400 ++++ serefpolicy-3.5.4/policy/support/obj_perm_sets.spt 2008-08-11 16:39:48.000000000 -0400 @@ -316,3 +316,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -36080,9 +36029,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.3/policy/users +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.4/policy/users --- nsaserefpolicy/policy/users 2008-08-07 11:15:13.000000000 -0400 -+++ serefpolicy-3.5.3/policy/users 2008-08-07 16:06:08.000000000 -0400 ++++ serefpolicy-3.5.4/policy/users 2008-08-11 16:39:48.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 f43b066..267c682 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -16,7 +16,7 @@ %define CHECKPOLICYVER 2.0.16-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 3.5.3 +Version: 3.5.4 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -379,6 +379,9 @@ exit 0 %endif %changelog +* Mon Aug 11 2008 Dan Walsh 3.5.4-1 +- Update to upstream + * Thu Aug 7 2008 Dan Walsh 3.5.3-1 - Update to upstream diff --git a/sources b/sources index 771e731..adcf3c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c6ba5ba2c9bde35a902840bd7092e91 serefpolicy-3.5.3.tgz +4dd322271523416bf7249a228ab90820 serefpolicy-3.5.4.tgz