Skip to content

Commit

Permalink
upstream: don't misdetect comma-separated hostkey names as wildcards;
Browse files Browse the repository at this point in the history
spotted by naddy@

OpenBSD-Commit-ID: 4b874edfec7fc324a21b130bdb42f912177739ce
  • Loading branch information
djmdjm committed Oct 9, 2020
1 parent 67146c7 commit 6247812
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions clientloop.c
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
* Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 6247812

Please sign in to comment.