tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: check correct variable; unbreak agent keys

Browse Source 
OpenBSD-Commit-ID: c36981fdf1f3ce04966d3310826a3e1e6233d93e
This commit is contained in:
djm@openbsd.org 2018-07-03 13:07:58 +00:00 committed by Damien Miller
parent 2f30300c5e
commit d78b75df4a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshconnect2.c
View File

@ -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) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -1507,7 +1507,7 @@ pubkey_prepare(Authctxt *authctxt)
} }
/* finally, filter by PubkeyAcceptedKeyTypes */ /* finally, filter by PubkeyAcceptedKeyTypes */
TAILQ_FOREACH_SAFE(id, preferred, next, id2) { 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 - " debug("Skipping %s key %s - "
"not in PubkeyAcceptedKeyTypes", "not in PubkeyAcceptedKeyTypes",
sshkey_ssh_name(id->key), id->filename); sshkey_ssh_name(id->key), id->filename);