tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2001/02/24 10:37:55 

[readconf.c]
     look for id_rsa by default, before id_dsa
This commit is contained in:
Ben Lindstrom 2001-03-05 06:03:03 +00:00
parent eb648a749b
commit b00d4fb142
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -46,6 +46,9 @@
fake_session_key = dig1|dig2; fake_session_key = dig1|dig2;
this change is caused by a mail from anakin@pobox.com this change is caused by a mail from anakin@pobox.com
patch based on discussions with my german advisor niels@openbsd.org patch based on discussions with my german advisor niels@openbsd.org
- deraadt@cvs.openbsd.org 2001/02/24 10:37:55
[readconf.c]
look for id_rsa by default, before id_dsa
20010304 20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@ -4238,4 +4241,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.864 2001/03/05 06:00:29 mouring Exp $ $Id: ChangeLog,v 1.865 2001/03/05 06:03:03 mouring Exp $

8
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readconf.c,v 1.62 2001/02/11 12:59:25 markus Exp $"); RCSID("$OpenBSD: readconf.c,v 1.63 2001/02/24 10:37:55 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -808,6 +808,12 @@ fill_default_options(Options * options)
len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY); len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
} }
if (options->protocol & SSH_PROTO_2) { if (options->protocol & SSH_PROTO_2) {
len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1;
options->identity_files[options->num_identity_files] =
xmalloc(len);
snprintf(options->identity_files[options->num_identity_files++],
len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA);
len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1; len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
options->identity_files[options->num_identity_files] = options->identity_files[options->num_identity_files] =
xmalloc(len); xmalloc(len);