openssh: drag in required PAM modules.
authorKoen Kooi <koen@dominion.thruhere.net>
Sat, 25 Jan 2014 12:16:52 +0000 (13:16 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 9 Feb 2014 09:40:00 +0000 (09:40 +0000)
/etc/pam.d/opensshd lists keyinit and uid as required, so add them to
RDEPENDS when PAM is enabled.

(From OE-Core rev: b2f49f9d2d8cd033611108c2bfe4871d02df0887)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/openssh/openssh_6.4p1.bb

index 892b6dc..9c0bb48 100644 (file)
@@ -122,7 +122,8 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
 FILES_${PN}-keygen = "${bindir}/ssh-keygen"
 
 RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
-RDEPENDS_${PN}-sshd += "${PN}-keygen"
+RDEPENDS_${PN}-sshd += "${PN}-keygen ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
+
 
 CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
 CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"