From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 8 Oct 2020 01:15:16 +0000 (+0000)
Subject: upstream: don't misdetect comma-separated hostkey names as wildcards;
X-Git-Tag: V_8_5_P1~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6247812c76f70b2245f3c23f5074665b3d436cae;p=thirdparty%2Fopenssh-portable.git

upstream: don't misdetect comma-separated hostkey names as wildcards;

spotted by naddy@

OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce
---

diff --git a/clientloop.c b/clientloop.c
index 975a85ef9..f3014b8d5 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.348 2020/10/07 02:22:23 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.349 2020/10/08 01:15:16 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1872,9 +1872,9 @@ hostkeys_find(struct hostkey_foreach_line *l, void *_ctx)
 
 	/* UpdateHostkeys is skipped for wildcard host names */
 	if (strchr(l->hosts, '*') != NULL ||
-	    strchr(l->hosts, ',') != NULL) {
-		debug3("%s: hostkeys file %s:%ld contains wildcard or pattern",
-		     __func__, l->path, l->linenum);
+	    strchr(l->hosts, '?') != NULL) {
+		debug3("%s: hostkeys file %s:%ld contains wildcard", __func__,
+		    l->path, l->linenum);
 		ctx->wildcard_hostspec = 1;
 	}