| 1 |
commit: 9f3d195fffbd77c7d116aaec94cac4724d82ca19 |
| 2 |
Author: Jason Zaman <jason <AT> perfinion <DOT> com> |
| 3 |
AuthorDate: Sun May 7 17:05:55 2017 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 7 17:06:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9f3d195f |
| 7 |
|
| 8 |
Remove duplicate fcontexts that were merged upstream |
| 9 |
|
| 10 |
policy/modules/contrib/cron.fc | 2 +- |
| 11 |
policy/modules/contrib/ntp.fc | 1 - |
| 12 |
policy/modules/contrib/vnstatd.fc | 1 - |
| 13 |
policy/modules/system/udev.fc | 2 -- |
| 14 |
4 files changed, 1 insertion(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/policy/modules/contrib/cron.fc b/policy/modules/contrib/cron.fc |
| 17 |
index e1b3e7b3..ea6a0da8 100644 |
| 18 |
--- a/policy/modules/contrib/cron.fc |
| 19 |
+++ b/policy/modules/contrib/cron.fc |
| 20 |
@@ -4,7 +4,7 @@ |
| 21 |
/etc/crontab -- gen_context(system_u:object_r:system_cron_spool_t,s0) |
| 22 |
|
| 23 |
/usr/bin/anacron -- gen_context(system_u:object_r:anacron_exec_t,s0) |
| 24 |
-/usr/bin/at -- gen_context(system_u:object_r:crontab_exec_t,s0) |
| 25 |
+#/usr/bin/at -- gen_context(system_u:object_r:crontab_exec_t,s0) |
| 26 |
/usr/bin/atd -- gen_context(system_u:object_r:crond_exec_t,s0) |
| 27 |
/usr/bin/cron(d)? -- gen_context(system_u:object_r:crond_exec_t,s0) |
| 28 |
/usr/bin/fcron -- gen_context(system_u:object_r:crond_exec_t,s0) |
| 29 |
|
| 30 |
diff --git a/policy/modules/contrib/ntp.fc b/policy/modules/contrib/ntp.fc |
| 31 |
index 903c131c..9c8c35c9 100644 |
| 32 |
--- a/policy/modules/contrib/ntp.fc |
| 33 |
+++ b/policy/modules/contrib/ntp.fc |
| 34 |
@@ -39,7 +39,6 @@ |
| 35 |
/run/ntpd\.sock -s gen_context(system_u:object_r:ntpd_var_run_t,s0) |
| 36 |
|
| 37 |
ifdef(`distro_gentoo',` |
| 38 |
-/usr/bin/sntp -- gen_context(system_u:object_r:ntpdate_exec_t,s0) |
| 39 |
/var/lib/openntpd/ntpd.drift -- gen_context(system_u:object_r:ntp_drift_t,s0) |
| 40 |
|
| 41 |
# hardlinked to ntpd |
| 42 |
|
| 43 |
diff --git a/policy/modules/contrib/vnstatd.fc b/policy/modules/contrib/vnstatd.fc |
| 44 |
index c3e1ad90..303f5009 100644 |
| 45 |
--- a/policy/modules/contrib/vnstatd.fc |
| 46 |
+++ b/policy/modules/contrib/vnstatd.fc |
| 47 |
@@ -14,5 +14,4 @@ |
| 48 |
ifdef(`distro_gentoo',` |
| 49 |
# Fix bug 528602 - name is vnstatd in Gentoo |
| 50 |
/etc/rc\.d/init\.d/vnstatd -- gen_context(system_u:object_r:vnstatd_initrc_exec_t,s0) |
| 51 |
-/usr/bin/vnstatd -- gen_context(system_u:object_r:vnstatd_exec_t,s0) |
| 52 |
') |
| 53 |
|
| 54 |
diff --git a/policy/modules/system/udev.fc b/policy/modules/system/udev.fc |
| 55 |
index 68c047c1..84705e32 100644 |
| 56 |
--- a/policy/modules/system/udev.fc |
| 57 |
+++ b/policy/modules/system/udev.fc |
| 58 |
@@ -48,8 +48,6 @@ ifdef(`distro_gentoo',` |
| 59 |
/usr/lib/udev/udevd -- gen_context(system_u:object_r:udev_exec_t,s0) |
| 60 |
/usr/lib/udev/rules\.d(/.*)? gen_context(system_u:object_r:udev_rules_t,s0) |
| 61 |
|
| 62 |
-/usr/bin/udevadm -- gen_context(system_u:object_r:udev_exec_t,s0) |
| 63 |
- |
| 64 |
/usr/lib/ConsoleKit/udev-acl -- gen_context(system_u:object_r:udev_exec_t,s0) |
| 65 |
|
| 66 |
/run/udev/rules\.d(/.*)? gen_context(system_u:object_r:udev_rules_t,s0) |
Archives