From: Kai Kang Date: Tue, 27 Oct 2015 10:00:18 +0000 (+0800) Subject: openssh: enable X11Forwarding if distro feature x11 is set X-Git-Tag: 2016-4~2358 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0dc68d745f97753fc9fde896f6ee1943c1e071b3;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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