commit:     a83e03c5d3b7668f0133349cdb8c6e1ae4290ca6
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Sep 13 09:37:00 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sat Sep 13 09:37:00 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=a83e03c5

Reintroduce refpolicy quircks as merging becomes difficult otherwise

---
 policy/modules/system/logging.fc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/policy/modules/system/logging.fc b/policy/modules/system/logging.fc
index 22034dc..a0e957c 100644
--- a/policy/modules/system/logging.fc
+++ b/policy/modules/system/logging.fc
@@ -26,7 +26,7 @@
 /usr/sbin/syslog-ng    --      gen_context(system_u:object_r:syslogd_exec_t,s0)
 /usr/sbin/syslogd      --      gen_context(system_u:object_r:syslogd_exec_t,s0)
 
-/var/lib/misc/syslog-ng\.persist-?     --      
gen_context(system_u:object_r:syslogd_var_lib_t,s0)
+/var/lib/misc/syslog-ng.persist-? -- 
gen_context(system_u:object_r:syslogd_var_lib_t,s0)
 /var/lib/syslog-ng(/.*)?       
gen_context(system_u:object_r:syslogd_var_lib_t,s0)
 /var/lib/r?syslog(/.*)?                
gen_context(system_u:object_r:syslogd_var_lib_t,s0)
 /var/lib/syslog-ng.persist --  
gen_context(system_u:object_r:syslogd_var_lib_t,s0)
@@ -68,12 +68,12 @@ ifdef(`distro_redhat',`
 /var/run/metalog\.pid  --      
gen_context(system_u:object_r:syslogd_var_run_t,s0)
 /var/run/rsyslogd\.pid --      
gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
 /var/run/syslogd\.pid  --      
gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
-/var/run/syslog-ng.ctl --      
gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
+/var/run/syslog-ng.ctl --      
gen_context(system_u:object_r:syslogd_var_run_t,s0)
 /var/run/syslog-ng\.pid        --      
gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
-/var/run/syslog-ng(.*)?        
gen_context(system_u:object_r:syslogd_var_run_t,s0)
+/var/run/syslog-ng(/.*)?       
gen_context(system_u:object_r:syslogd_var_run_t,s0)
 /var/run/systemd/journal(/.*)? 
gen_context(system_u:object_r:syslogd_var_run_t,mls_systemhigh)
-/var/run/systemd/journal/syslog        -s 
gen_context(system_u:object_r:devlog_t,mls_systemhigh)
-/var/run/systemd/journal/dev-log       -s 
gen_context(system_u:object_r:devlog_t,mls_systemhigh)
+/var/run/systemd/journal/syslog         -s 
gen_context(system_u:object_r:devlog_t,mls_systemhigh)
+/var/run/systemd/journal/dev-log -s 
gen_context(system_u:object_r:devlog_t,mls_systemhigh)
 
 /var/spool/audit(/.*)?         
gen_context(system_u:object_r:audit_spool_t,mls_systemhigh)
 /var/spool/bacula/log(/.*)?    gen_context(system_u:object_r:var_log_t,s0)

Reply via email to