From owner-svn-src-all@freebsd.org Wed Jul 29 09:43:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 40CEF3A5A4F; Wed, 29 Jul 2020 09:43:58 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay104.isp.belgacom.be (mailrelay104.isp.belgacom.be [195.238.20.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign RSA OV SSL CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BGpXD42sFz4Z02; Wed, 29 Jul 2020 09:43:56 +0000 (UTC) (envelope-from tijl@freebsd.org) IronPort-SDR: 6RqUIZCjavrFaRBhDCZcoUjwjOoW5c/x3CF1MWd4ZsZiVN5+faOFlQDo1wgBzqIi9O/yYVk18O 9wVPz6tO7KtH6ZU12y/HFuw5VPRxlb74+//keOv5r4bOxj20ZGZeKtyeoIH7Ku5xb2TmoWkNzG fSGEPH3pYzWx1E2bDoguDIr6XExVJkVw+OBZ4DcPbgE8VPijEZ9GKHXofc4EoU32VJ1wLa9y/k dmHA3E36ZlK0Ull5nTE8DG+9wJ9+y9Cnkp83gBfvAcBkNG5eWJQEby7Kfs0lOi8x+/MEd/EUFj sRc= X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AkR7oVxZrku5dhaTBdDY31Kj/LSx+4OfEezUN45?= =?us-ascii?q?9isYplN5qZpsyyYh7h7PlgxGXEQZ/co6odzbaP7ea+BSdZvt6oizMrSNR0TR?= =?us-ascii?q?gLiMEbzUQLIfWuLgnFFsPsdDEwB89YVVVorDmROElRH9viNRWJ+iXhpTEdFQ?= =?us-ascii?q?/iOgVrO+/7BpDdj9it1+C15pbffxhEiCCybL9vLRi6twTcu8YZjYd/KKs61w?= =?us-ascii?q?fErGZPd+lK321jOEidnwz75se+/Z5j9zpftvc8/MNeUqv0Yro1Q6VAADspL2?= =?us-ascii?q?466svrtQLeTQSU/XsTTn8WkhtTDAfb6hzxQ4r8vTH7tup53ymaINH2QLUpUj?= =?us-ascii?q?ms86tnVBnlgzocOjUn7G/YlNB/jKNDoBKguRN/xZLUYJqIP/Z6Z6/RYM8WSX?= =?us-ascii?q?ZEUstXSidPAJ6zb5EXAuQPPehWsZTzqVgMohuwCgajGOzhxyRUhnL0x6A2z/?= =?us-ascii?q?gtHR3Y0AEmAtkAsG7UrNLwNKoKT+63ya3IxijdYvNR3jf985bHchU7rvGKRr?= =?us-ascii?q?J7bM3cyVUuFwPHilWdsozrPymL2esTrmWV8uRuWfioi249pAF8uz6izdojhY?= =?us-ascii?q?fVnIwa0EzE9Tlnz4YvI921UFB2bNq5HZZesyyXK4h7T80+Tm12pis3yaALtY?= =?us-ascii?q?C/cSUOyZkq2gPSZuKJfYWH7B/uUOmfLCpkiHxqeb+ymhe//0amx+bhWMe011?= =?us-ascii?q?NKoTBEktnKrn0N2QbT5daZRfRm5UeuxCyD1wfJ6uFLJ00/iKnVK4Y5z7Mzi5?= =?us-ascii?q?Yfq1rPEyDqlEnsg6KbdF8o9vWs5unjZLjtu4WSOJVuig7kN6Qjgsm/AeMlPQ?= =?us-ascii?q?cQR2Wb4uG81KH7/U3+XbVKkuU6kqnHv5DeIsQWvq25DBVR0oYi7hawES2m0N?= =?us-ascii?q?MCkXkbLVJFehaHg5L1NFHJJ/D4Fumwg1G2nzdt3PDKJLrhAo/CLnTbkbfhe6?= =?us-ascii?q?hy61JExQcw0NxT/YxYB74dLP7pVUL8tsbUAgI9PgGw2+rnDc9y1oIaWWKBGK?= =?us-ascii?q?+ZN6bSvEeU5uIuIemMYJQYuDjnK/c7+fHhlmQ5lkIHcamux5sXZ2i0Hu56LE?= =?us-ascii?q?WBfXrsntABHH8RvgogSuzmkUaCUSRPaHqrX6Iz+Cs0B5+9AIfNXICinqKO0z?= =?us-ascii?q?ygHpJLfGxGDUqMEXjwfYWeR/gMcD6SItNmkjEcTrihVYkh2Qi1tA/g17VrN/?= =?us-ascii?q?Db+ikctZ/42th1/fPcmg8p+jxvEsuRyWaNT3t7nmkQXT85wLh/oVBhyleEya?= =?us-ascii?q?V4mOZYGsBK6/xVVQc6MJvcz+1mC9DuRA3BZMyJRU2oQtW8Hz4+UMk+w8QTbE?= =?us-ascii?q?pnHNWilB/D1TKwA7AJj7yLGIA08qXE0nfvIsZy0W3G1LU/gFQ9TMtPL3Opib?= =?us-ascii?q?Bk+AjIGoHFiUKZl7yldfdU4CmY2WvL6GOVoEwQBAN1WL7ZUFgxfEbbh+/VoE?= =?us-ascii?q?TYQOn9J64gN159LsrKAaxNcdDshFNdDKP/OdbaS0yrlmqaPjrOwamDOtm5M1?= =?us-ascii?q?4B1TnQXRBX2zsY+myLYE1nXn+s?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2BfAACIRCFf/8cv8FFgHAEBAQEBAQc?= =?us-ascii?q?BARIBAQQEAQFAB4ExBQEBCwEBgwMUVAFJFY02hgaCEIhdgiWPDYF9CwEBAQE?= =?us-ascii?q?BAQEBASsMBAEBhEwCgiQlNgcOAgMBAQEDAgUBAQYBAQEBAQEFBAGGDzkMQwE?= =?us-ascii?q?QAYFiKQGDEQEFOhwjEAsOBgQuVwYTgyeDAAuud4E0hDsBCwGBCoQRfwaBOAG?= =?us-ascii?q?GO4UIgV2CAIERgxA+hD2FdgSZb4EYmgtygmmIW5ETMJ90hVCXApZuCoIATTA?= =?us-ascii?q?IO4JpUBkNlyOFRD8DMDcCBggBAQMJiQCHaAEB?= X-IPAS-Result: =?us-ascii?q?A2BfAACIRCFf/8cv8FFgHAEBAQEBAQcBARIBAQQEAQFAB?= =?us-ascii?q?4ExBQEBCwEBgwMUVAFJFY02hgaCEIhdgiWPDYF9CwEBAQEBAQEBASsMBAEBh?= =?us-ascii?q?EwCgiQlNgcOAgMBAQEDAgUBAQYBAQEBAQEFBAGGDzkMQwEQAYFiKQGDEQEFO?= =?us-ascii?q?hwjEAsOBgQuVwYTgyeDAAuud4E0hDsBCwGBCoQRfwaBOAGGO4UIgV2CAIERg?= =?us-ascii?q?xA+hD2FdgSZb4EYmgtygmmIW5ETMJ90hVCXApZuCoIATTAIO4JpUBkNlyOFR?= =?us-ascii?q?D8DMDcCBggBAQMJiQCHaAEB?= Received: from 199.47-240-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.240.47.199]) by relay.skynet.be with ESMTP; 29 Jul 2020 11:43:23 +0200 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.16.1/8.16.1) with ESMTP id 06T9hMAM016702; Wed, 29 Jul 2020 11:43:22 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Wed, 29 Jul 2020 11:43:22 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Ed Maste 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> References: <202007290034.06T0YOPQ044582@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BGpXD42sFz4Z02 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2020 09:43:58 -0000 On Wed, 29 Jul 2020 00:34:24 +0000 (UTC) Ed Maste 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.