| 1 |
commit: dbba0b6ab4505e103c539802dab362c9e695d9dd |
| 2 |
Author: Dominick Grift <dominick.grift <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Sep 26 21:36:48 2013 +0000 |
| 4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 30 19:02:50 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=dbba0b6a |
| 7 |
|
| 8 |
revert regular expressions |
| 9 |
|
| 10 |
Signed-off-by: Dominick Grift <dominick.grift <AT> gmail.com> |
| 11 |
|
| 12 |
--- |
| 13 |
policy/modules/contrib/aide.fc | 2 +- |
| 14 |
policy/modules/contrib/amtu.fc | 2 +- |
| 15 |
policy/modules/contrib/cron.fc | 2 +- |
| 16 |
policy/modules/contrib/finger.fc | 4 ++-- |
| 17 |
policy/modules/contrib/inetd.fc | 6 +++--- |
| 18 |
policy/modules/contrib/ircd.fc | 2 +- |
| 19 |
policy/modules/contrib/nagios.fc | 4 ++-- |
| 20 |
policy/modules/contrib/networkmanager.fc | 10 +++++----- |
| 21 |
policy/modules/contrib/puppet.fc | 6 +++--- |
| 22 |
policy/modules/contrib/snort.fc | 2 +- |
| 23 |
policy/modules/contrib/tftp.fc | 2 +- |
| 24 |
policy/modules/contrib/tor.fc | 2 +- |
| 25 |
12 files changed, 22 insertions(+), 22 deletions(-) |
| 26 |
|
| 27 |
diff --git a/policy/modules/contrib/aide.fc b/policy/modules/contrib/aide.fc |
| 28 |
index 15eb282..06f050f 100644 |
| 29 |
--- a/policy/modules/contrib/aide.fc |
| 30 |
+++ b/policy/modules/contrib/aide.fc |
| 31 |
@@ -1,4 +1,4 @@ |
| 32 |
-/usr/s?bin/aide -- gen_context(system_u:object_r:aide_exec_t,mls_systemhigh) |
| 33 |
+/usr/(s)?bin/aide -- gen_context(system_u:object_r:aide_exec_t,mls_systemhigh) |
| 34 |
|
| 35 |
/var/lib/aide(/.*)? gen_context(system_u:object_r:aide_db_t,mls_systemhigh) |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/policy/modules/contrib/amtu.fc b/policy/modules/contrib/amtu.fc |
| 39 |
index 6392306..305a1a0 100644 |
| 40 |
--- a/policy/modules/contrib/amtu.fc |
| 41 |
+++ b/policy/modules/contrib/amtu.fc |
| 42 |
@@ -1,3 +1,3 @@ |
| 43 |
/etc/rc\.d/init\.d/amtu -- gen_context(system_u:object_r:amtu_initrc_exec_t,s0) |
| 44 |
|
| 45 |
-/usr/s?bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) |
| 46 |
+/usr/(s)?bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) |
| 47 |
|
| 48 |
diff --git a/policy/modules/contrib/cron.fc b/policy/modules/contrib/cron.fc |
| 49 |
index 3d06fed..266a439 100644 |
| 50 |
--- a/policy/modules/contrib/cron.fc |
| 51 |
+++ b/policy/modules/contrib/cron.fc |
| 52 |
@@ -4,7 +4,7 @@ |
| 53 |
/etc/crontab -- gen_context(system_u:object_r:system_cron_spool_t,s0) |
| 54 |
|
| 55 |
|
| 56 |
-/usr/bin/f?crontab -- gen_context(system_u:object_r:crontab_exec_t,s0) |
| 57 |
+/usr/bin/(f)?crontab -- gen_context(system_u:object_r:crontab_exec_t,s0) |
| 58 |
|
| 59 |
/usr/libexec/fcron -- gen_context(system_u:object_r:crond_exec_t,s0) |
| 60 |
/usr/libexec/fcronsighup -- gen_context(system_u:object_r:crontab_exec_t,s0) |
| 61 |
|
| 62 |
diff --git a/policy/modules/contrib/finger.fc b/policy/modules/contrib/finger.fc |
| 63 |
index 5df3720..843940b 100644 |
| 64 |
--- a/policy/modules/contrib/finger.fc |
| 65 |
+++ b/policy/modules/contrib/finger.fc |
| 66 |
@@ -1,8 +1,8 @@ |
| 67 |
/etc/cfingerd(/.*)? gen_context(system_u:object_r:fingerd_etc_t,s0) |
| 68 |
|
| 69 |
-/etc/cron\.weekly/c?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) |
| 70 |
+/etc/cron\.weekly/(c)?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) |
| 71 |
|
| 72 |
-/usr/sbin/in\.x?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) |
| 73 |
+/usr/sbin/in\.(x)?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) |
| 74 |
/usr/sbin/[cef]fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) |
| 75 |
|
| 76 |
/var/log/cfingerd\.log.* -- gen_context(system_u:object_r:fingerd_log_t,s0) |
| 77 |
|
| 78 |
diff --git a/policy/modules/contrib/inetd.fc b/policy/modules/contrib/inetd.fc |
| 79 |
index d00440b..0374509 100644 |
| 80 |
--- a/policy/modules/contrib/inetd.fc |
| 81 |
+++ b/policy/modules/contrib/inetd.fc |
| 82 |
@@ -6,8 +6,8 @@ |
| 83 |
/usr/sbin/in\..*d -- gen_context(system_u:object_r:inetd_child_exec_t,s0) |
| 84 |
|
| 85 |
/usr/sbin/rlinetd -- gen_context(system_u:object_r:inetd_exec_t,s0) |
| 86 |
-/usr/sbin/x?inetd -- gen_context(system_u:object_r:inetd_exec_t,s0) |
| 87 |
+/usr/sbin/(x)?inetd -- gen_context(system_u:object_r:inetd_exec_t,s0) |
| 88 |
|
| 89 |
-/var/log/x?inetd\.log.* -- gen_context(system_u:object_r:inetd_log_t,s0) |
| 90 |
+/var/log/(x)?inetd\.log.* -- gen_context(system_u:object_r:inetd_log_t,s0) |
| 91 |
|
| 92 |
-/var/run/x?inetd\.pid -- gen_context(system_u:object_r:inetd_var_run_t,s0) |
| 93 |
+/var/run/(x)?inetd\.pid -- gen_context(system_u:object_r:inetd_var_run_t,s0) |
| 94 |
|
| 95 |
diff --git a/policy/modules/contrib/ircd.fc b/policy/modules/contrib/ircd.fc |
| 96 |
index 0f0e648..8060f08 100644 |
| 97 |
--- a/policy/modules/contrib/ircd.fc |
| 98 |
+++ b/policy/modules/contrib/ircd.fc |
| 99 |
@@ -6,7 +6,7 @@ |
| 100 |
/etc/rc\.d/init\.d/((ircd)|(ngircd)|(dancer-ircd)) -- gen_context(system_u:object_r:ircd_initrc_exec_t,s0) |
| 101 |
|
| 102 |
/usr/sbin/dancer-ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 103 |
-/usr/s?bin/ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 104 |
+/usr/(s)?bin/ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 105 |
/usr/sbin/ngircd -- gen_context(system_u:object_r:ircd_exec_t,s0) |
| 106 |
|
| 107 |
/var/lib/dancer-ircd(/.*)? gen_context(system_u:object_r:ircd_var_lib_t,s0) |
| 108 |
|
| 109 |
diff --git a/policy/modules/contrib/nagios.fc b/policy/modules/contrib/nagios.fc |
| 110 |
index 431ce38..5e47e3f 100644 |
| 111 |
--- a/policy/modules/contrib/nagios.fc |
| 112 |
+++ b/policy/modules/contrib/nagios.fc |
| 113 |
@@ -4,8 +4,8 @@ |
| 114 |
/etc/rc\.d/init\.d/nagios -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0) |
| 115 |
/etc/rc\.d/init\.d/nrpe -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0) |
| 116 |
|
| 117 |
-/usr/s?bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) |
| 118 |
-/usr/s?bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) |
| 119 |
+/usr/(s)?bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) |
| 120 |
+/usr/(s)?bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) |
| 121 |
|
| 122 |
/usr/lib/cgi-bin/nagios(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) |
| 123 |
/usr/lib/cgi-bin/netsaint(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) |
| 124 |
|
| 125 |
diff --git a/policy/modules/contrib/networkmanager.fc b/policy/modules/contrib/networkmanager.fc |
| 126 |
index 4751a7b..a697d60 100644 |
| 127 |
--- a/policy/modules/contrib/networkmanager.fc |
| 128 |
+++ b/policy/modules/contrib/networkmanager.fc |
| 129 |
@@ -16,15 +16,15 @@ |
| 130 |
/usr/lib/NetworkManager/nm-dispatcher\.action -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0) |
| 131 |
/usr/libexec/nm-dispatcher\.action -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0) |
| 132 |
|
| 133 |
-/s?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 134 |
-/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 135 |
+/(s)?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 136 |
+/(s)?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 137 |
|
| 138 |
-/usr/s?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 139 |
+/usr/(s)?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 140 |
/usr/sbin/NetworkManagerDispatcher -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 141 |
/usr/sbin/nm-system-settings -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 142 |
/usr/sbin/wicd -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 143 |
-/usr/s?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 144 |
-/usr/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 145 |
+/usr/(s)?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) |
| 146 |
+/usr/(s)?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) |
| 147 |
|
| 148 |
/var/lib/wicd(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t,s0) |
| 149 |
/var/lib/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t,s0) |
| 150 |
|
| 151 |
diff --git a/policy/modules/contrib/puppet.fc b/policy/modules/contrib/puppet.fc |
| 152 |
index 9468048..5a6da67 100644 |
| 153 |
--- a/policy/modules/contrib/puppet.fc |
| 154 |
+++ b/policy/modules/contrib/puppet.fc |
| 155 |
@@ -3,9 +3,9 @@ |
| 156 |
/etc/rc\.d/init\.d/puppet -- gen_context(system_u:object_r:puppet_initrc_exec_t,s0) |
| 157 |
/etc/rc\.d/init\.d/puppetmaster -- gen_context(system_u:object_r:puppetmaster_initrc_exec_t,s0) |
| 158 |
|
| 159 |
-/usr/s?bin/puppetca -- gen_context(system_u:object_r:puppetca_exec_t,s0) |
| 160 |
-/usr/s?bin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) |
| 161 |
-/usr/s?bin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) |
| 162 |
+/usr/(s)?bin/puppetca -- gen_context(system_u:object_r:puppetca_exec_t,s0) |
| 163 |
+/usr/(s)?bin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) |
| 164 |
+/usr/(s)?bin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) |
| 165 |
|
| 166 |
/var/lib/puppet(/.*)? gen_context(system_u:object_r:puppet_var_lib_t,s0) |
| 167 |
|
| 168 |
|
| 169 |
diff --git a/policy/modules/contrib/snort.fc b/policy/modules/contrib/snort.fc |
| 170 |
index f85247b..aae25d9 100644 |
| 171 |
--- a/policy/modules/contrib/snort.fc |
| 172 |
+++ b/policy/modules/contrib/snort.fc |
| 173 |
@@ -2,7 +2,7 @@ |
| 174 |
|
| 175 |
/etc/snort(/.*)? gen_context(system_u:object_r:snort_etc_t,s0) |
| 176 |
|
| 177 |
-/usr/s?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) |
| 178 |
+/usr/(s)?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) |
| 179 |
/usr/sbin/snort-plain -- gen_context(system_u:object_r:snort_exec_t,s0) |
| 180 |
|
| 181 |
/var/log/snort(/.*)? gen_context(system_u:object_r:snort_log_t,s0) |
| 182 |
|
| 183 |
diff --git a/policy/modules/contrib/tftp.fc b/policy/modules/contrib/tftp.fc |
| 184 |
index cd569af..3dd87da 100644 |
| 185 |
--- a/policy/modules/contrib/tftp.fc |
| 186 |
+++ b/policy/modules/contrib/tftp.fc |
| 187 |
@@ -1,4 +1,4 @@ |
| 188 |
-/etc/x?inetd\.d/tftp -- gen_context(system_u:object_r:tftpd_conf_t,s0) |
| 189 |
+/etc/(x)?inetd\.d/tftp -- gen_context(system_u:object_r:tftpd_conf_t,s0) |
| 190 |
|
| 191 |
/usr/sbin/atftpd -- gen_context(system_u:object_r:tftpd_exec_t,s0) |
| 192 |
/usr/sbin/in\.tftpd -- gen_context(system_u:object_r:tftpd_exec_t,s0) |
| 193 |
|
| 194 |
diff --git a/policy/modules/contrib/tor.fc b/policy/modules/contrib/tor.fc |
| 195 |
index 420a5ee..14a355a 100644 |
| 196 |
--- a/policy/modules/contrib/tor.fc |
| 197 |
+++ b/policy/modules/contrib/tor.fc |
| 198 |
@@ -2,7 +2,7 @@ |
| 199 |
|
| 200 |
/etc/rc\.d/init\.d/tor -- gen_context(system_u:object_r:tor_initrc_exec_t,s0) |
| 201 |
|
| 202 |
-/usr/s?bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) |
| 203 |
+/usr/(s)?bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) |
| 204 |
|
| 205 |
/var/lib/tor(/.*)? gen_context(system_u:object_r:tor_var_lib_t,s0) |
| 206 |
/var/lib/tor-data(/.*)? gen_context(system_u:object_r:tor_var_lib_t,s0) |
Archives