aboutsummaryrefslogtreecommitdiffstats
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:42 +0000
commit046dd5567d9de0596023846e7f0c6df7f01a9f5b (patch)
treec5c52f6cde0b99b6f122c54105305123aa016b86 /meta/recipes-connectivity/openssh/openssh/ssh_config
parentc939b9cc5bd046261981dcaae6cae9d358ed7671 (diff)
downloadopenembedded-core-contrib-046dd5567d9de0596023846e7f0c6df7f01a9f5b.tar.gz
openembedded-core-contrib-046dd5567d9de0596023846e7f0c6df7f01a9f5b.tar.bz2
openembedded-core-contrib-046dd5567d9de0596023846e7f0c6df7f01a9f5b.zip
openssh: configuration updates
Rebase sshd_config and ssh_config with openssh upstream. Check for the ed25519 key in the systemd keygen service. Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@
-# $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $
+# $OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen Exp $
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
@@ -44,3 +44,5 @@ Host *
# TunnelDevice any:any
# PermitLocalCommand no
# VisualHostKey no
+# ProxyCommand ssh -q -W %h:%p gateway.example.com
+# RekeyLimit 1G 1h