diff options
| author | des <des@FreeBSD.org> | 2013-04-02 08:41:38 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-04-02 08:41:38 +0000 |
| commit | e456ced89d876d7a8f2ee08f47f61c98277d752b (patch) | |
| tree | 1eb360fde56e972baf4ecb1864576e7032bae13d /ssh.c | |
| parent | 5a4dbb83324b0cc6594abbb5fcaa8fe0415febc5 (diff) | |
| download | FreeBSD-src-e456ced89d876d7a8f2ee08f47f61c98277d752b.zip FreeBSD-src-e456ced89d876d7a8f2ee08f47f61c98277d752b.tar.gz | |
Pull in a patchset from upstream to silence spurious "no such identity
file" warnings.
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -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 $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -405,12 +405,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 |
