diff options
author | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
commit | 7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866 (patch) | |
tree | 5fffd9d1fcec3a05be383fc9aa81e1eb5e7935de /crypto/openssh/ssh_config | |
parent | b5f9e06a6d8d64c8429e25a1bc1ebfad436bf477 (diff) | |
download | FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.zip FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.tar.gz |
Resolve conflicts and remove obsolete files.
Sponsored by: registrar.no
Diffstat (limited to 'crypto/openssh/ssh_config')
-rw-r--r-- | crypto/openssh/ssh_config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index e3f82cf..7eb617b 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $ +# $OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $ # $FreeBSD$ # This is the ssh client system-wide configuration file. See @@ -19,13 +19,14 @@ # Host * # ForwardAgent no # ForwardX11 no -# RhostsAuthentication no # RhostsRSAAuthentication no # RSAAuthentication yes # PasswordAuthentication yes # HostbasedAuthentication no # BatchMode no # CheckHostIP no +# AddressFamily any +# ConnectTimeout 0 # StrictHostKeyChecking ask # IdentityFile ~/.ssh/identity # IdentityFile ~/.ssh/id_rsa @@ -35,4 +36,4 @@ # Cipher 3des # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc # EscapeChar ~ -# VersionAddendum FreeBSD-20030924 +# VersionAddendum FreeBSD-20040106 |