summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2018-07-03 13:07:58 +0000
committerdjm <djm@openbsd.org>2018-07-03 13:07:58 +0000
commit8b2dd1710ac87be886c4672924c8d6391a8bb36c (patch)
treeef60c28ab408d20e48728f366d0a6bdc45a485c5 /usr.bin/ssh/sshconnect2.c
parentAvoid NULL pointer deref in vn_writechk() when calling ftruncate() on a file (diff)
downloadwireguard-openbsd-8b2dd1710ac87be886c4672924c8d6391a8bb36c.tar.xz
wireguard-openbsd-8b2dd1710ac87be886c4672924c8d6391a8bb36c.zip
check correct variable; unbreak agent keys
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index da326ea8e0b..4593494cea2 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/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.
@@ -1499,7 +1499,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);