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 /sshconnect2.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 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index d6af0b9..58015c0 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1384,7 +1384,7 @@ pubkey_prepare(Authctxt *authctxt) id = xcalloc(1, sizeof(*id)); id->key = key; id->filename = xstrdup(options.identity_files[i]); - id->userprovided = 1; + id->userprovided = options.identity_file_userprovided[i]; TAILQ_INSERT_TAIL(&files, id, next); } /* Prefer PKCS11 keys that are explicitly listed */ |
