diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:55:54 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-08-29 15:55:54 +0000 |
| commit | 925f1fb7e466dbf645650dc4ea9d2a34e728ef9c (patch) | |
| tree | 0fb8acbff73fddb3a95e864c5ddd6370367153a9 /ssh_config.5 | |
| parent | 2e97a36905ba9936cb9972e37c5e56deb288e442 (diff) | |
| download | src-925f1fb7e466dbf645650dc4ea9d2a34e728ef9c.tar.gz src-925f1fb7e466dbf645650dc4ea9d2a34e728ef9c.zip | |
Vendor import of OpenSSH 6.1p1.vendor/openssh/6.1p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=239849
svn path=/vendor-crypto/openssh/6.1p1/; revision=239851; tag=vendor/openssh/6.1p1
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 78a542dc0b1d..36b1af195d62 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $ -.Dd $Mdocdate: September 9 2011 $ +.\" $OpenBSD: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $ +.Dd $Mdocdate: June 29 2012 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -612,7 +612,7 @@ offers many different identities. The default is .Dq no . .It Cm IdentityFile -Specifies a file from which the user's DSA, ECDSA or DSA authentication +Specifies a file from which the user's DSA, ECDSA or RSA authentication identity is read. The default is .Pa ~/.ssh/identity @@ -793,9 +793,8 @@ Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent hmac-md5,hmac-sha1,umac-64@openssh.com, -hmac-ripemd160,hmac-sha1-96,hmac-md5-96, -hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512, -hmac-sha2-512-96 +hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, +hmac-sha1-96,hmac-md5-96 .Ed .It Cm NoHostAuthenticationForLocalhost This option can be used if the home directory is shared across machines. |