summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-07-05 23:59:45 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:07:42 +1000
commit6d755706a0059eb9e2d63517f288b75cbc3b4701 (patch)
treeadb003b1adcea270f4480baa4ff83d495b3478f3 /kex.c
parentb0c1e8384d5e136ebdf895d1434aea7dd8661a1c (diff)
upstream: some language improvements; ok markus
OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kex.c b/kex.c
index 09c7258e0..aecb9394d 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.158 2020/03/13 04:01:56 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.159 2020/07/05 23:59:45 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -247,7 +247,7 @@ kex_assemble_names(char **listp, const char *def, const char *all)
247 list = tmp; 247 list = tmp;
248 } else if (*list == '-') { 248 } else if (*list == '-') {
249 /* Remove names from default list */ 249 /* Remove names from default list */
250 if ((*listp = match_filter_blacklist(def, list + 1)) == NULL) { 250 if ((*listp = match_filter_denylist(def, list + 1)) == NULL) {
251 r = SSH_ERR_ALLOC_FAIL; 251 r = SSH_ERR_ALLOC_FAIL;
252 goto fail; 252 goto fail;
253 } 253 }
@@ -284,7 +284,7 @@ kex_assemble_names(char **listp, const char *def, const char *all)
284 goto fail; 284 goto fail;
285 } 285 }
286 free(matching); 286 free(matching);
287 if ((matching = match_filter_whitelist(all, cp)) == NULL) { 287 if ((matching = match_filter_allowlist(all, cp)) == NULL) {
288 r = SSH_ERR_ALLOC_FAIL; 288 r = SSH_ERR_ALLOC_FAIL;
289 goto fail; 289 goto fail;
290 } 290 }