summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-06-20 21:52:38 +1000
committerDamien Miller <djm@mindrot.org>2012-06-20 21:52:38 +1000
commit7192433633b8d4fa4315bc42eb50493c3a1125c8 (patch)
tree3732daeb7459b22d0fbc5423011e86ba90e80a1b
parent276dcfd7f768300fb1d72abcd097d718ad72475a (diff)
- dtucker@cvs.openbsd.org 2012/06/18 11:49:58
[ssh_config.5] RSA instead of DSA twice. From Steve.McClellan at radisys com
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.56
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 32eb1dfce..47b1c1652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@
31 - dtucker@cvs.openbsd.org 2012/06/18 11:43:53 31 - dtucker@cvs.openbsd.org 2012/06/18 11:43:53
32 [jpake.c] 32 [jpake.c]
33 correct sizeof usage. patch from saw at online.de, ok deraadt 33 correct sizeof usage. patch from saw at online.de, ok deraadt
34 - dtucker@cvs.openbsd.org 2012/06/18 11:49:58
35 [ssh_config.5]
36 RSA instead of DSA twice. From Steve.McClellan at radisys com
34 37
3520120519 3820120519
36 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch 39 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
diff --git a/ssh_config.5 b/ssh_config.5
index 78a542dc0..c9917d25b 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.155 2012/06/18 11:49:58 dtucker Exp $
37.Dd $Mdocdate: September 9 2011 $ 37.Dd $Mdocdate: June 18 2012 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -612,7 +612,7 @@ offers many different identities.
612The default is 612The default is
613.Dq no . 613.Dq no .
614.It Cm IdentityFile 614.It Cm IdentityFile
615Specifies a file from which the user's DSA, ECDSA or DSA authentication 615Specifies a file from which the user's DSA, ECDSA or RSA authentication
616identity is read. 616identity is read.
617The default is 617The default is
618.Pa ~/.ssh/identity 618.Pa ~/.ssh/identity