summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-07-03 13:07:58 +0000
committerDamien Miller <djm@mindrot.org>2018-07-03 23:26:47 +1000
commitd78b75df4a57e0f92295f24298e5f2930e71c172 (patch)
tree72ca05577c7a0cd098b85ce372a2a41f269fed80 /sshconnect2.c
parent2f30300c5e15929d0e34013f38d73e857f445e12 (diff)
upstream: check correct variable; unbreak agent keys
OpenBSD-Commit-ID: c36981fdf1f3ce04966d3310826a3e1e6233d93e
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 920376408..ff3b0bede 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.272 2018/07/03 11:39:54 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.273 2018/07/03 13:07:58 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1507,7 +1507,7 @@ pubkey_prepare(Authctxt *authctxt)
1507 } 1507 }
1508 /* finally, filter by PubkeyAcceptedKeyTypes */ 1508 /* finally, filter by PubkeyAcceptedKeyTypes */
1509 TAILQ_FOREACH_SAFE(id, preferred, next, id2) { 1509 TAILQ_FOREACH_SAFE(id, preferred, next, id2) {
1510 if (id->key != NULL && !key_type_allowed_by_config(key)) { 1510 if (id->key != NULL && !key_type_allowed_by_config(id->key)) {
1511 debug("Skipping %s key %s - " 1511 debug("Skipping %s key %s - "
1512 "not in PubkeyAcceptedKeyTypes", 1512 "not in PubkeyAcceptedKeyTypes",
1513 sshkey_ssh_name(id->key), id->filename); 1513 sshkey_ssh_name(id->key), id->filename);