summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh/ssh_config
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2015-01-15 15:11:00 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:54 +0000
commite4dc8fe86c6b503cc3e55a2a466a65a1313501a1 (patch)
treebbbccb8d7332ded9a47cab38fd72677a7766aa5e /meta/recipes-connectivity/openssh/openssh/ssh_config
parent93842f0ec96b6e0f7863441f6ae02febe8a24a62 (diff)
downloadpoky-e4dc8fe86c6b503cc3e55a2a466a65a1313501a1.tar.gz
openssh: configuration updates
Rebase sshd_config and ssh_config with openssh upstream. Check for the ed25519 key in the systemd keygen service. (From OE-Core rev: 046dd5567d9de0596023846e7f0c6df7f01a9f5b) Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/ssh_config')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/ssh_config4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/ssh_config b/meta/recipes-connectivity/openssh/openssh/ssh_config
index 4a4a649ba8..9e919156d3 100644
--- a/meta/recipes-connectivity/openssh/openssh/ssh_config
+++ b/meta/recipes-connectivity/openssh/openssh/ssh_config
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $ 1# $OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen Exp $
2 2
3# This is the ssh client system-wide configuration file. See 3# This is the ssh client system-wide configuration file. See
4# ssh_config(5) for more information. This file provides defaults for 4# ssh_config(5) for more information. This file provides defaults for
@@ -44,3 +44,5 @@ Host *
44# TunnelDevice any:any 44# TunnelDevice any:any
45# PermitLocalCommand no 45# PermitLocalCommand no
46# VisualHostKey no 46# VisualHostKey no
47# ProxyCommand ssh -q -W %h:%p gateway.example.com
48# RekeyLimit 1G 1h