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/sshconnect2.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/sshconnect2.c')
| -rw-r--r-- | crypto/openssh/sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/sshconnect2.c b/crypto/openssh/sshconnect2.c index b3e9290..ad86df7 100644 --- a/crypto/openssh/sshconnect2.c +++ b/crypto/openssh/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 $ */ /* $FreeBSD$ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -1418,7 +1418,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 */ |
