RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/02/22 22:09:01 

[ssh.c]
     Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
     version)
This commit is contained in:
Darren Tucker 2013-04-05 11:22:26 +11:00
parent 5d1d9541a7
commit 15fd19c4c9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -15,6 +15,10 @@
- markus@cvs.openbsd.org 2013/02/22 19:13:56 - markus@cvs.openbsd.org 2013/02/22 19:13:56
[sshconnect.c] [sshconnect.c]
support ProxyCommand=- (stdin/out already point to the proxy); ok djm@ support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
- djm@cvs.openbsd.org 2013/02/22 22:09:01
[ssh.c]
Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
version)
20130401 20130401
- (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h

5
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */ /* $OpenBSD: ssh.c,v 1.373 2013/02/22 22:09:01 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1536,7 +1536,8 @@ load_public_identity_files(void)
fatal("load_public_identity_files: gethostname: %s", fatal("load_public_identity_files: gethostname: %s",
strerror(errno)); strerror(errno));
for (i = 0; i < options.num_identity_files; i++) { for (i = 0; i < options.num_identity_files; i++) {
if (n_ids >= SSH_MAX_IDENTITY_FILES) { if (n_ids >= SSH_MAX_IDENTITY_FILES ||
strcasecmp(options.identity_files[i], "none") == 0) {
xfree(options.identity_files[i]); xfree(options.identity_files[i]);
continue; continue;
} }