[openssh-commits] [openssh] 20/87: upstream: make UnusedConnectionTimeout and FingerprintHash

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit ea370e65cf716909108d79ad55f142f8ed7c00d0
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 30 01:55:19 2026 +0000

    upstream: make UnusedConnectionTimeout and FingerprintHash
    
    properly first-match-wins
    
    Anthropic ANT-2026-BNQMERCV
    
    OpenBSD-Commit-ID: 6c15367a03490226d7a22a43fd600f6c2a53e784
---
 servconf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/servconf.c b/servconf.c
index e55a614ae..2ec89ed88 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.459 2026/10/09 10:48:43 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.460 2026/10/30 01:55:19 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2542,7 +2542,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 		if ((value = ssh_digest_alg_by_name(arg)) == -1)
 			fatal("%.200s line %d: Invalid %s algorithm \"%s\".",
 			    filename, linenum, keyword, arg);
-		if (*activep)
+		if (*activep && options->fingerprint_hash == -1)
 			options->fingerprint_hash = value;
 		break;
 
@@ -2608,7 +2608,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 		/* peek at first arg for "none" so we can reuse parse_time */
 		if (av[0] != NULL && strcasecmp(av[0], "none") == 0) {
 			(void)argv_next(&ac, &av); /* consume arg */
-			if (*activep)
+			if (*activep && *intptr == -1)
 				*intptr = 0;
 			break;
 		}

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.