Date: Wed, 29 Jul 2020 11:43:22 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@FreeBSD.org> To: Ed Maste <emaste@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r363657 - head/crypto/openssh Message-ID: <20200729114322.4ff17fde@FreeBSD.org> In-Reply-To: <202007290034.06T0YOPQ044582@repo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
On Wed, 29 Jul 2020 00:34:24 +0000 (UTC) Ed Maste <emaste@FreeBSD.org> wrote: > Author: emaste > Date: Wed Jul 29 00:34:24 2020 > New Revision: 363657 > URL: https://svnweb.freebsd.org/changeset/base/363657 > > Log: > 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 > MFC after: 1 week > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D25865 > > Modified: > head/crypto/openssh/servconf.c > head/crypto/openssh/sshd_config.5 > > Modified: head/crypto/openssh/servconf.c > ============================================================================== > --- head/crypto/openssh/servconf.c Tue Jul 28 22:32:50 2020 (r363656) > +++ head/crypto/openssh/servconf.c Wed Jul 29 00:34:24 2020 (r363657) > @@ -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 }, > > Modified: head/crypto/openssh/sshd_config.5 > ============================================================================== > --- head/crypto/openssh/sshd_config.5 Tue Jul 28 22:32:50 2020 (r363656) > +++ head/crypto/openssh/sshd_config.5 Wed Jul 29 00:34:24 2020 (r363657) > @@ -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 > @@ -1602,6 +1602,11 @@ to the > daemon. > The default is > .Cm no . > +For forward compatibility with an upcoming > +.Xr blacklistd > +rename, the > +.Cm UseBlocklist I realise this is very pedantic, but my spell checker says it's "block list", two words, so if you're using camel case it should be UseBlockList.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200729114322.4ff17fde>