summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2014-02-20 08:07:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-21 16:09:08 +0000
commit40f3e48947883fc18edbdef6e043e53d441afeb1 (patch)
treefcdad9186483bb2f2990561dcfab3c6347d4b3a0
parent27b81efd3aa35f27456820634b5bbb0f764c7e8f (diff)
downloadpoky-40f3e48947883fc18edbdef6e043e53d441afeb1.tar.gz
openssh: enable PAM at runtime based on DISTRO_FEATURES
Everything is setup to use PAM except for the server config. If 'pam' is in DISTRO_FEATURES the configs will be changed to enable it. Syslog will now show: Feb 19 09:28:36 beast sshd[2980]: pam_unix(sshd:session): session opened for user koen by (uid=0) And more importantly: koen@beast:~$ loginctl SESSION UID USER SEAT c1 1000 koen seat0 c3 1000 koen seat0 c13 1000 koen 3 sessions listed. Systemd now registers the session properly so it won't kill things like 'screen' and 'tmux' when disconnecting the ssh session. (From OE-Core rev: 08c523daec0f5161803d2a6704402490c18ff6ca) Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.4p1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
index 9c0bb4817a..b5e84d4838 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
@@ -80,8 +80,8 @@ do_compile_append () {
80 80
81do_install_append () { 81do_install_append () {
82 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 82 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
83 install -d ${D}${sysconfdir}/pam.d 83 install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
84 install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd 84 sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config
85 fi 85 fi
86 86
87 install -d ${D}${sysconfdir}/init.d 87 install -d ${D}${sysconfdir}/init.d