D25865.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D25865.diff
View Options

	Index: head/crypto/openssh/servconf.c
	===================================================================
	--- head/crypto/openssh/servconf.c
	+++ head/crypto/openssh/servconf.c
	@@ -660,6 +660,7 @@
	{ "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 },
	Index: head/crypto/openssh/sshd_config.5
	===================================================================
	--- head/crypto/openssh/sshd_config.5
	+++ head/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
	@@ -1602,6 +1602,11 @@
	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