[selinux-policy: 139/3172] reorder to fit file context style rules
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Oct 7 19:17:05 UTC 2010
commit 279b555ae3c6d20d423a6dc5eb694e00336406b2
Author: Chris PeBenito <cpebenito at tresys.com>
Date: Tue May 10 19:47:37 2005 +0000
reorder to fit file context style rules
refpolicy/policy/modules/system/getty.fc | 7 +----
refpolicy/policy/modules/system/logging.fc | 33 ++++++++++-----------------
2 files changed, 14 insertions(+), 26 deletions(-)
---
diff --git a/refpolicy/policy/modules/system/getty.fc b/refpolicy/policy/modules/system/getty.fc
index 60c3d94..0ec39d2 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 4a5bd67..133039e 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
+/dev/log -s system_u:object_r:devlog_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/syslogd -- 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/klogd -- system_u:object_r:klogd_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
+/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
More information about the scm-commits
mailing list