dilim/openssh-portable
1
0 Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-11-06 05:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: only replace prior auth_opts if merging later ones

Browse Source 
succeeds.

Part of fix for server fatal() with inconsistent log message when
`AuthenticationMethods publickey,publickey` fails on the second key because
of inconsistent authentication options.

Anthropic ANT-2026-UES5TKX0

OpenBSD-Commit-ID: cb2818d6209c227c79a785544ee964384471ddfe
This commit is contained in:
djm@openbsd.org authored and Damien Miller committed 2026-10-30 20:14:07 +11:00
1 parent f7a2c31dbf
commit d373555d64
1 file changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files
auth.c
+4 -3
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: auth.c,v 1.165 2026/07/21 06:17:42 djm Exp $ */
/* $OpenBSD: auth.c,v 1.166 2026/10/30 04:39:16 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -755,14 +755,15 @@ auth_log_authopts(const char *loc, const struct sshauthopt *opts, int do_remote)
int
auth_activate_options(struct ssh *ssh, struct sshauthopt *opts)
{
struct sshauthopt *old = auth_opts;
struct sshauthopt *old = auth_opts, *merged;
const char *emsg = NULL;
debug_f("setting new authentication options");
if ((auth_opts = sshauthopt_merge(old, opts, &emsg)) == NULL) {
if ((merged = sshauthopt_merge(old, opts, &emsg)) == NULL) {
error("Inconsistent authentication options: %s", emsg);
return -1;
}
auth_opts = merged;
sshauthopt_free(old);
return 0;
}