summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-07-26 17:04:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 12:02:42 +0100
commitf491a7ea0c570e481728d57cf7848b09c93f4373 (patch)
tree5ccb124ad00a76b6121ab358058a4f267c2ed11d
parenta601df4fec99302c4d4fec686674ea202a15cd8b (diff)
downloadpoky-f491a7ea0c570e481728d57cf7848b09c93f4373.tar.gz
openssh: Support PAM
Adding configuration file "sshd" in /etc/pam.d/ for supporting pam. (From OE-Core rev: 8279f771a482d890ad897971cba1d656fdcaefe9) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh-5.8p2/sshd10
-rw-r--r--meta/recipes-connectivity/openssh/openssh_5.8p2.bb13
2 files changed, 21 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd b/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
new file mode 100644
index 0000000000..4882e58b48
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
@@ -0,0 +1,10 @@
1#%PAM-1.0
2
3auth include common-auth
4account required pam_nologin.so
5account include common-account
6password include common-password
7session optional pam_keyinit.so force revoke
8session include common-session
9session required pam_loginuid.so
10
diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
index e23069cb77..89b011d6f8 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
9 9
10PR = "r0" 10PR = "r1"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -23,7 +23,9 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
23 file://sshd_config \ 23 file://sshd_config \
24 file://ssh_config \ 24 file://ssh_config \
25 file://init \ 25 file://init \
26 " 26 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
27
28PAM_SRC_URI = "file://sshd"
27SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e" 29SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
28SRC_URI[sha256sum] = "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314" 30SRC_URI[sha256sum] = "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
29 31
@@ -58,6 +60,13 @@ do_compile_append () {
58} 60}
59 61
60do_install_append () { 62do_install_append () {
63 for i in ${DISTRO_FEATURES};
64 do
65 if [ ${i} = "pam" ]; then
66 install -d ${D}${sysconfdir}/pam.d
67 install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
68 fi
69 done
61 install -d ${D}${sysconfdir}/init.d 70 install -d ${D}${sysconfdir}/init.d
62 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd 71 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
63 mv ${D}${bindir}/scp ${D}${bindir}/scp.${PN} 72 mv ${D}${bindir}/scp ${D}${bindir}/scp.${PN}