From 85c20af3c10867e3d62afa4326ea3d0f5dec4e41 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Thu, 19 Jan 2006 22:47:40 +0000 Subject: [PATCH] fixes from serge --- refpolicy/Changelog | 1 + refpolicy/policy/modules/kernel/terminal.fc | 4 ++++ refpolicy/policy/modules/kernel/terminal.if | 4 ++++ refpolicy/policy/modules/system/authlogin.fc | 3 +++ refpolicy/policy/modules/system/logging.fc | 3 +++ 5 files changed, 15 insertions(+) diff --git a/refpolicy/Changelog b/refpolicy/Changelog index 060c291c..8eb8a53f 100644 --- a/refpolicy/Changelog +++ b/refpolicy/Changelog @@ -1,3 +1,4 @@ +- Login fixes from Serge Hallyn. - Move xserver_log_t from xdm to xserver. - Add lpr per-userdomain policy to lpd. - Miscellaneous fixes from Dan Walsh. diff --git a/refpolicy/policy/modules/kernel/terminal.fc b/refpolicy/policy/modules/kernel/terminal.fc index 2fd702da..a19c3a3f 100644 --- a/refpolicy/policy/modules/kernel/terminal.fc +++ b/refpolicy/policy/modules/kernel/terminal.fc @@ -24,3 +24,7 @@ /dev/vcs[^/]* -c gen_context(system_u:object_r:tty_device_t,s0) /dev/usb/tty.* -c gen_context(system_u:object_r:usbtty_device_t,s0) + +ifdef(`distro_gentoo',` +/dev/tts/[0-9]* -c gen_context(system_u:object_r:tty_device_t,s0) +') diff --git a/refpolicy/policy/modules/kernel/terminal.if b/refpolicy/policy/modules/kernel/terminal.if index 51f3ff18..e9c1e4e0 100644 --- a/refpolicy/policy/modules/kernel/terminal.if +++ b/refpolicy/policy/modules/kernel/terminal.if @@ -88,6 +88,10 @@ interface(`term_tty',` type_change $1 ttynode:chr_file $2; ') + ifdef(`distro_gentoo',` + fs_associate_tmpfs($2) + ') + ifdef(`distro_redhat',` fs_associate_tmpfs($2) ') diff --git a/refpolicy/policy/modules/system/authlogin.fc b/refpolicy/policy/modules/system/authlogin.fc index 898eab64..278b7278 100644 --- a/refpolicy/policy/modules/system/authlogin.fc +++ b/refpolicy/policy/modules/system/authlogin.fc @@ -20,6 +20,9 @@ ifdef(`distro_suse', ` /usr/kerberos/sbin/login\.krb5 -- gen_context(system_u:object_r:login_exec_t,s0) /usr/sbin/utempter -- gen_context(system_u:object_r:utempter_exec_t,s0) +ifdef(`distro_gentoo', ` +/usr/sbin/unix_chkpwd -- gen_context(system_u:object_r:chkpwd_exec_t,s0) +') /var/db/shadow.* -- gen_context(system_u:object_r:shadow_t,s0) diff --git a/refpolicy/policy/modules/system/logging.fc b/refpolicy/policy/modules/system/logging.fc index 934c86ee..ad83e09f 100644 --- a/refpolicy/policy/modules/system/logging.fc +++ b/refpolicy/policy/modules/system/logging.fc @@ -14,6 +14,9 @@ /usr/sbin/klogd -- gen_context(system_u:object_r:klogd_exec_t,s0) /usr/sbin/metalog -- gen_context(system_u:object_r:syslogd_exec_t,s0) /usr/sbin/syslogd -- gen_context(system_u:object_r:syslogd_exec_t,s0) +ifdef(`distro_gentoo', ` +/usr/sbin/syslog-ng -- gen_context(system_u:object_r:syslogd_exec_t,s0) +') ifdef(`distro_suse', ` /var/lib/stunnel/dev/log -s gen_context(system_u:object_r:devlog_t,s0)