diff options
| author | Kai Kang <kai.kang@windriver.com> | 2015-10-27 18:00:18 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:28:48 +0000 |
| commit | 0dc68d745f97753fc9fde896f6ee1943c1e071b3 (patch) | |
| tree | 1574d4354a8e68ea83c166ff54c16b4570bbdad0 /meta/recipes-connectivity/openssh | |
| parent | 444c5921725f74cd17ad460e9a7879c4f16905ce (diff) | |
| download | openembedded-core-0dc68d745f97753fc9fde896f6ee1943c1e071b3.tar.gz openembedded-core-0dc68d745f97753fc9fde896f6ee1943c1e071b3.tar.bz2 openembedded-core-0dc68d745f97753fc9fde896f6ee1943c1e071b3.zip | |
openssh: enable X11Forwarding if distro feature x11 is set
When distro feature x11 is set, it is better enable X11Forwarding for
ssh daemon. For contrast, dropbear enable X11 forward by default.
It does NOT need to modify ${WORKDIR}/sshd_config, so drop the modification.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.1p1.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb index 40938cc08c..d81127cdcd 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb @@ -88,7 +88,11 @@ do_compile_ptest() { do_install_append () { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd - sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config + sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config + fi + + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then + sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config fi install -d ${D}${sysconfdir}/init.d |