From 279b555ae3c6d20d423a6dc5eb694e00336406b2 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Tue, 10 May 2005 19:47:37 +0000 Subject: [PATCH] reorder to fit file context style rules --- refpolicy/policy/modules/system/getty.fc | 7 ++-- refpolicy/policy/modules/system/logging.fc | 41 +++++++++------------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/refpolicy/policy/modules/system/getty.fc b/refpolicy/policy/modules/system/getty.fc index 60c3d9497..0ec39d2aa 100644 --- a/refpolicy/policy/modules/system/getty.fc +++ b/refpolicy/policy/modules/system/getty.fc @@ -1,8 +1,5 @@ # Copyright (C) 2005 Tresys Technology, LLC -######################################## -# -# getty file contexts -# -/sbin/.*getty -- system_u:object_r:getty_exec_t /etc/mgetty(/.*)? system_u:object_r:getty_etc_t + +/sbin/.*getty -- system_u:object_r:getty_exec_t diff --git a/refpolicy/policy/modules/system/logging.fc b/refpolicy/policy/modules/system/logging.fc index 4a5bd6779..133039e81 100644 --- a/refpolicy/policy/modules/system/logging.fc +++ b/refpolicy/policy/modules/system/logging.fc @@ -1,32 +1,23 @@ # Copyright (C) 2005 Tresys Technology, LLC -######################################## -# -# System logs file contexts -# -/var/log(/.*)? system_u:object_r:var_log_t - -######################################## -# -# klogd file contexts -# -/sbin/klogd -- system_u:object_r:klogd_exec_t -/usr/sbin/klogd -- system_u:object_r:klogd_exec_t -/var/run/klogd\.pid -- system_u:object_r:klogd_var_run_t - -######################################## -# -# syslog file contexts -# -/sbin/syslogd -- system_u:object_r:syslogd_exec_t -/sbin/minilogd -- system_u:object_r:syslogd_exec_t -/sbin/syslog-ng -- system_u:object_r:syslogd_exec_t -/usr/sbin/syslogd -- system_u:object_r:syslogd_exec_t -/usr/sbin/metalog -- system_u:object_r:syslogd_exec_t /dev/log -s system_u:object_r:devlog_t -/var/run/log -s system_u:object_r:devlog_t + +/sbin/klogd -- system_u:object_r:klogd_exec_t +/sbin/minilogd -- system_u:object_r:syslogd_exec_t +/sbin/syslogd -- system_u:object_r:syslogd_exec_t +/sbin/syslog-ng -- system_u:object_r:syslogd_exec_t + +/usr/sbin/klogd -- system_u:object_r:klogd_exec_t +/usr/sbin/metalog -- system_u:object_r:syslogd_exec_t +/usr/sbin/syslogd -- system_u:object_r:syslogd_exec_t + ifdef(`distro_suse', ` /var/lib/stunnel/dev/log -s system_u:object_r:devlog_t ') -/var/run/syslogd\.pid -- system_u:object_r:syslogd_var_run_t + +/var/log(/.*)? system_u:object_r:var_log_t + +/var/run/klogd\.pid -- system_u:object_r:klogd_var_run_t +/var/run/log -s system_u:object_r:devlog_t /var/run/metalog\.pid -- system_u:object_r:syslogd_var_run_t +/var/run/syslogd\.pid -- system_u:object_r:syslogd_var_run_t