diff options
| author |   djm <djm@openbsd.org> | 2013-02-22 22:09:01 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-02-22 22:09:01 +0000 |
| commit | 07ced1579fc796e79cfb56dbad109d5c9c45157d (patch) | |
| tree | 4bdd31dc59d8e25179c388876586af7dad79032f /usr.bin/ssh/ssh.c | |
| parent | support ProxyCommand=- (stdin/out already point to the proxy); ok djm@ (diff) | |
| download | wireguard-openbsd-07ced1579fc796e79cfb56dbad109d5c9c45157d.tar.xz wireguard-openbsd-07ced1579fc796e79cfb56dbad109d5c9c45157d.zip | |
Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
version)
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 264d9f8b9db..e99fc037b62 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1485,7 +1485,8 @@ load_public_identity_files(void) fatal("load_public_identity_files: gethostname: %s", strerror(errno)); 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]); continue; } |