diff options
| author | des <des@FreeBSD.org> | 2013-04-02 11:44:55 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-04-02 11:44:55 +0000 |
| commit | f1c9eb38e7f5d932f6f246353a1f646f551ffa55 (patch) | |
| tree | c0624291b85cc0b3f2926f679e578a6b59ebcd50 /crypto/openssh/ssh.c | |
| parent | 3325697f0c9f5298d7313d56bd4bb35e4fb47589 (diff) | |
| download | FreeBSD-src-f1c9eb38e7f5d932f6f246353a1f646f551ffa55.zip FreeBSD-src-f1c9eb38e7f5d932f6f246353a1f646f551ffa55.tar.gz | |
Merge upstream patch to silence spurious "no such identity file" warnings.
Diffstat (limited to 'crypto/openssh/ssh.c')
| -rw-r--r-- | crypto/openssh/ssh.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index c77491b..2402457 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.371 2013/02/17 23:16:57 dtucker Exp $ */ /* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -407,12 +407,7 @@ main(int ac, char **av) strerror(errno)); break; } - if (options.num_identity_files >= - SSH_MAX_IDENTITY_FILES) - fatal("Too many identity files specified " - "(max %d)", SSH_MAX_IDENTITY_FILES); - options.identity_files[options.num_identity_files++] = - xstrdup(optarg); + add_identity_file(&options, NULL, optarg, 1); break; case 'I': #ifdef ENABLE_PKCS11 |
