diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-04-17 03:23:13 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-04-17 14:03:36 +1000 |
commit | 321c7147079270f3a154f91b59e66219aac3d514 (patch) | |
tree | ec34ca85a74b70b5da57a749fe9a9e351c3175e4 /sshd_config.5 | |
parent | ca5403b085a735055ec7b7cdcd5b91f2662df94c (diff) |
upstream: allow the IgnoreRhosts directive to appear anywhere in a
sshd_config, not just before any Match blocks; bz3148, ok dtucker@
OpenBSD-Commit-ID: e042467d703bce640b1f42c5d1a62bf3825736e8
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 70ccea449..a60be383d 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.307 2020/02/07 03:54:44 dtucker Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.308 2020/04/17 03:23:13 djm Exp $ |
37 | .Dd $Mdocdate: February 7 2020 $ | 37 | .Dd $Mdocdate: April 17 2020 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1162,6 +1162,7 @@ Available keywords are | |||
1162 | .Cm HostbasedAcceptedKeyTypes , | 1162 | .Cm HostbasedAcceptedKeyTypes , |
1163 | .Cm HostbasedAuthentication , | 1163 | .Cm HostbasedAuthentication , |
1164 | .Cm HostbasedUsesNameFromPacketOnly , | 1164 | .Cm HostbasedUsesNameFromPacketOnly , |
1165 | .Cm IgnoreRhosts , | ||
1165 | .Cm Include , | 1166 | .Cm Include , |
1166 | .Cm IPQoS , | 1167 | .Cm IPQoS , |
1167 | .Cm KbdInteractiveAuthentication , | 1168 | .Cm KbdInteractiveAuthentication , |