From 2e7fb736e1b080d3a83ed9f44369779c96d4ba06 Mon Sep 17 00:00:00 2001 From: Qiang Chen Date: Thu, 18 Jul 2013 17:24:35 +0800 Subject: selinux: remove reference to locale env files from login [ CQID: WIND00425413 ] pam.d/login refered to the /etc/default/locale env file. This file is not used in oe-core/Poky. Remove the this reference to avoid error messages in auth.log. Signed-off-by: Qiang Chen Signed-off-by: Jeff Polk Signed-off-by: Mark Hatle Signed-off-by: Joe MacDonald --- recipes-extended/shadow/files/pam.d/login | 3 --- recipes-extended/shadow/shadow_4.1.4.3.bbappend | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/recipes-extended/shadow/files/pam.d/login b/recipes-extended/shadow/files/pam.d/login index 1ec26a3..ec5bba9 100644 --- a/recipes-extended/shadow/files/pam.d/login +++ b/recipes-extended/shadow/files/pam.d/login @@ -39,9 +39,6 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux # # parsing /etc/environment needs "readenv=1" session required pam_env.so readenv=1 -# locale variables are also kept into /etc/default/locale in etch -# reading this file *in addition to /etc/environment* does not hurt -session required pam_env.so readenv=1 envfile=/etc/default/locale # Standard Un*x authentication. auth include common-auth diff --git a/recipes-extended/shadow/shadow_4.1.4.3.bbappend b/recipes-extended/shadow/shadow_4.1.4.3.bbappend index cacfb8b..befe620 100644 --- a/recipes-extended/shadow/shadow_4.1.4.3.bbappend +++ b/recipes-extended/shadow/shadow_4.1.4.3.bbappend @@ -1,4 +1,4 @@ -PR .= ".5" +PR .= ".6" inherit with-selinux with-audit -- cgit v1.2.3-54-g00ecf