]> code.ossystems Code Review - openembedded-core.git/commitdiff
openssh: enable PAM at runtime based on DISTRO_FEATURES
authorKoen Kooi <koen@dominion.thruhere.net>
Thu, 20 Feb 2014 07:07:22 +0000 (08:07 +0100)
committerSaul Wold <sgw@linux.intel.com>
Fri, 21 Feb 2014 04:06:22 +0000 (20:06 -0800)
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.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-connectivity/openssh/openssh_6.4p1.bb

index 9c0bb4817a02f8f51beb4124fbf7d5601330fb73..b5e84d48384ab498b21ae33269b188718f005271 100644 (file)
@@ -80,8 +80,8 @@ do_compile_append () {
 
 do_install_append () {
        if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
-               install -d ${D}${sysconfdir}/pam.d
-               install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
+               install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
+               sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config
        fi
 
        install -d ${D}${sysconfdir}/init.d