diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-10-08 01:15:16 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-10-09 18:39:17 +1100 |
| commit | 6247812c76f70b2245f3c23f5074665b3d436cae (patch) | |
| tree | d5a83612b0e910e50fc17f07c8f7df74d44c3219 /clientloop.c | |
| parent | 67146c7d022a170be3cdad2f5f40259a663fb266 (diff) | |
| download | openssh-git-6247812c76f70b2245f3c23f5074665b3d436cae.tar.gz | |
upstream: don't misdetect comma-separated hostkey names as wildcards;
spotted by naddy@
OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index 975a85ef..f3014b8d 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; } |