diff options
author | Qiang Chen <qiang.chen@windriver.com> | 2013-07-18 17:24:35 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2013-10-02 13:24:45 -0400 |
commit | 2e7fb736e1b080d3a83ed9f44369779c96d4ba06 (patch) | |
tree | 2ffffd83f66747c05d7ad044eef77e11625a882f | |
parent | 479c9803f0de0b0660b97d4ff0c498ee5a7cbd03 (diff) | |
download | meta-selinux-2e7fb736e1b080d3a83ed9f44369779c96d4ba06.tar.gz |
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 <qiang.chen@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-extended/shadow/files/pam.d/login | 3 | ||||
-rw-r--r-- | recipes-extended/shadow/shadow_4.1.4.3.bbappend | 2 |
2 files changed, 1 insertions, 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 | |||
39 | # | 39 | # |
40 | # parsing /etc/environment needs "readenv=1" | 40 | # parsing /etc/environment needs "readenv=1" |
41 | session required pam_env.so readenv=1 | 41 | session required pam_env.so readenv=1 |
42 | # locale variables are also kept into /etc/default/locale in etch | ||
43 | # reading this file *in addition to /etc/environment* does not hurt | ||
44 | session required pam_env.so readenv=1 envfile=/etc/default/locale | ||
45 | 42 | ||
46 | # Standard Un*x authentication. | 43 | # Standard Un*x authentication. |
47 | auth include common-auth | 44 | 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 @@ | |||
1 | PR .= ".5" | 1 | PR .= ".6" |
2 | 2 | ||
3 | inherit with-selinux with-audit | 3 | inherit with-selinux with-audit |
4 | 4 | ||