[PATCH 0/1] Enable openssh X11Forwarding if distro feature x11 is set

[PATCH 0/1] Enable openssh X11Forwarding if distro feature x11 is set

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

The following changes since commit 505a82673ac2487df5ea343a6422c2fc47018831:

  build-appliance-image: Update to jethro head revision (2015-10-21 23:13:11 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib kangkai/ssh
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/ssh

Kai Kang (1):
  openssh: enable X11Forwarding if distro feature x11 is set

 meta/recipes-connectivity/openssh/openssh_7.1p1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.6.1

[PATCH 1/1] openssh: enable X11Forwarding if distro feature x11 is set

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

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>
---
 meta/recipes-connectivity/openssh/openssh_7.1p1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb
index 40938cc..d81127c 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
-- 
2.6.1