commit:     9f3d195fffbd77c7d116aaec94cac4724d82ca19
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun May  7 17:05:55 2017 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun May  7 17:06:27 2017 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9f3d195f

Remove duplicate fcontexts that were merged upstream

 policy/modules/contrib/cron.fc    | 2 +-
 policy/modules/contrib/ntp.fc     | 1 -
 policy/modules/contrib/vnstatd.fc | 1 -
 policy/modules/system/udev.fc     | 2 --
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/policy/modules/contrib/cron.fc b/policy/modules/contrib/cron.fc
index e1b3e7b3..ea6a0da8 100644
--- a/policy/modules/contrib/cron.fc
+++ b/policy/modules/contrib/cron.fc
@@ -4,7 +4,7 @@
 /etc/crontab   --      gen_context(system_u:object_r:system_cron_spool_t,s0)
 
 /usr/bin/anacron       --      gen_context(system_u:object_r:anacron_exec_t,s0)
-/usr/bin/at    --      gen_context(system_u:object_r:crontab_exec_t,s0)
+#/usr/bin/at   --      gen_context(system_u:object_r:crontab_exec_t,s0)
 /usr/bin/atd   --      gen_context(system_u:object_r:crond_exec_t,s0)
 /usr/bin/cron(d)?      --      gen_context(system_u:object_r:crond_exec_t,s0)
 /usr/bin/fcron --      gen_context(system_u:object_r:crond_exec_t,s0)

diff --git a/policy/modules/contrib/ntp.fc b/policy/modules/contrib/ntp.fc
index 903c131c..9c8c35c9 100644
--- a/policy/modules/contrib/ntp.fc
+++ b/policy/modules/contrib/ntp.fc
@@ -39,7 +39,6 @@
 /run/ntpd\.sock        -s      gen_context(system_u:object_r:ntpd_var_run_t,s0)
 
 ifdef(`distro_gentoo',`
-/usr/bin/sntp  --      gen_context(system_u:object_r:ntpdate_exec_t,s0)
 /var/lib/openntpd/ntpd.drift   --      
gen_context(system_u:object_r:ntp_drift_t,s0)
 
 # hardlinked to ntpd

diff --git a/policy/modules/contrib/vnstatd.fc 
b/policy/modules/contrib/vnstatd.fc
index c3e1ad90..303f5009 100644
--- a/policy/modules/contrib/vnstatd.fc
+++ b/policy/modules/contrib/vnstatd.fc
@@ -14,5 +14,4 @@
 ifdef(`distro_gentoo',`
 # Fix bug 528602 - name is vnstatd in Gentoo
 /etc/rc\.d/init\.d/vnstatd     --      
gen_context(system_u:object_r:vnstatd_initrc_exec_t,s0)
-/usr/bin/vnstatd       --      gen_context(system_u:object_r:vnstatd_exec_t,s0)
 ')

diff --git a/policy/modules/system/udev.fc b/policy/modules/system/udev.fc
index 68c047c1..84705e32 100644
--- a/policy/modules/system/udev.fc
+++ b/policy/modules/system/udev.fc
@@ -48,8 +48,6 @@ ifdef(`distro_gentoo',`
 /usr/lib/udev/udevd    --      gen_context(system_u:object_r:udev_exec_t,s0)
 /usr/lib/udev/rules\.d(/.*)?   gen_context(system_u:object_r:udev_rules_t,s0)
 
-/usr/bin/udevadm       --      gen_context(system_u:object_r:udev_exec_t,s0)
-
 /usr/lib/ConsoleKit/udev-acl   --      
gen_context(system_u:object_r:udev_exec_t,s0)
 
 /run/udev/rules\.d(/.*)?       gen_context(system_u:object_r:udev_rules_t,s0)

Reply via email to