diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-07-03 13:07:58 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-03 23:26:47 +1000 |
| commit | d78b75df4a57e0f92295f24298e5f2930e71c172 (patch) | |
| tree | 72ca05577c7a0cd098b85ce372a2a41f269fed80 | |
| parent | 2f30300c5e15929d0e34013f38d73e857f445e12 (diff) | |
| download | openssh-git-d78b75df4a57e0f92295f24298e5f2930e71c172.tar.gz | |
upstream: check correct variable; unbreak agent keys
OpenBSD-Commit-ID: c36981fdf1f3ce04966d3310826a3e1e6233d93e
| -rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 92037640..ff3b0bed 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.272 2018/07/03 11:39:54 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.273 2018/07/03 13:07:58 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1507,7 +1507,7 @@ pubkey_prepare(Authctxt *authctxt) } /* finally, filter by PubkeyAcceptedKeyTypes */ TAILQ_FOREACH_SAFE(id, preferred, next, id2) { - if (id->key != NULL && !key_type_allowed_by_config(key)) { + if (id->key != NULL && !key_type_allowed_by_config(id->key)) { debug("Skipping %s key %s - " "not in PubkeyAcceptedKeyTypes", sshkey_ssh_name(id->key), id->filename); |