From 892a9b3c67f5e3d98920a9859edbea145dc03d82 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Wed, 29 Jul 2020 00:34:24 +0000 Subject: [PATCH] sshd: allow UseBlocklist alias for UseBlacklist blacklistd has been renamed to blocklistd upstream, and a future import into FreeBSD will follow that change. Support the new name as an alias in config files. Reviewed by: bz, delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25865 (cherry picked from commit e426c74375ef7cb3afda3c8e3010a7ea2dbd69d0) --- crypto/openssh/servconf.c | 1 + crypto/openssh/sshd_config.5 | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 5032fa6556d..8b07e4b923a 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -660,6 +660,7 @@ static struct { { "rdomain", sRDomain, SSHCFG_ALL }, { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL }, { "useblacklist", sUseBlacklist, SSHCFG_GLOBAL }, + { "useblocklist", sUseBlacklist, SSHCFG_GLOBAL }, /* alias */ { "noneenabled", sUnsupported, SSHCFG_ALL }, { "hpndisabled", sDeprecated, SSHCFG_ALL }, { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 8176078319d..d3e0c43853c 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: sshd_config.5,v 1.282 2018/09/20 03:28:06 djm Exp $ .\" $FreeBSD$ -.Dd $Mdocdate: September 20 2018 $ +.Dd $Mdocdate: July 28 2020 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -1603,6 +1603,11 @@ to the daemon. The default is .Cm no . +For forward compatibility with an upcoming +.Xr blacklistd +rename, the +.Cm UseBlocklist +alias can be used instead. .It Cm UseDNS Specifies whether .Xr sshd 8 -- 2.45.0