From 90cfe5774b1269031b3a65876bc791036c7322c3 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Fri, 12 Apr 2013 15:54:28 +0800 Subject: shadow/openssh: use pam_selinux only if target_selinux enabled We add pam conf files for login/sshd to use pam_selinux module. When selinux is not in DISTRO_FEATURES, pam-plugin-selinux would not be built, this will cause runtime errors to not allow users to login in on the console or ssh. Use @target_selinux() to enable these pam conf files conditionally. Signed-off-by: Xin Ouyang --- recipes-connectivity/openssh/openssh_6.1p1.bbappend | 6 +++--- recipes-extended/shadow/shadow_4.1.4.3.bbappend | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-connectivity/openssh/openssh_6.1p1.bbappend b/recipes-connectivity/openssh/openssh_6.1p1.bbappend index 698f4ab..43d459c 100644 --- a/recipes-connectivity/openssh/openssh_6.1p1.bbappend +++ b/recipes-connectivity/openssh/openssh_6.1p1.bbappend @@ -1,5 +1,5 @@ -PR .= ".3" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +PR .= ".4" inherit with-selinux + +FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}" diff --git a/recipes-extended/shadow/shadow_4.1.4.3.bbappend b/recipes-extended/shadow/shadow_4.1.4.3.bbappend index c2c3332..f871e67 100644 --- a/recipes-extended/shadow/shadow_4.1.4.3.bbappend +++ b/recipes-extended/shadow/shadow_4.1.4.3.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -PR .= ".3" +PR .= ".4" inherit with-selinux with-audit + +FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}" -- cgit v1.2.3-54-g00ecf