[oe-commits] Koen Kooi : openssh: drag in required PAM modules.

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b2f49f9d2d8cd033611108c2bfe4871d02df0887
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b2f49f9d2d8cd033611108c2bfe4871d02df0887

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Sat Jan 25 13:16:52 2014 +0100

openssh: drag in required PAM modules.

/etc/pam.d/opensshd lists keyinit and uid as required, so add them to
RDEPENDS when PAM is enabled.

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-connectivity/openssh/openssh_6.4p1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
index 892b6dc..9c0bb48 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
@@ -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"