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 /servconf.c | |
| 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 'servconf.c')
| -rw-r--r-- | servconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.361 2020/03/06 18:29:54 markus Exp $ */ +/* $OpenBSD: servconf.c,v 1.362 2020/04/17 03:23:13 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -626,7 +626,7 @@ static struct { #else { "printlastlog", sPrintLastLog, SSHCFG_GLOBAL }, #endif - { "ignorerhosts", sIgnoreRhosts, SSHCFG_GLOBAL }, + { "ignorerhosts", sIgnoreRhosts, SSHCFG_ALL }, { "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL }, { "x11forwarding", sX11Forwarding, SSHCFG_ALL }, { "x11displayoffset", sX11DisplayOffset, SSHCFG_ALL }, @@ -2473,6 +2473,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) M_CP_INTOPT(kbd_interactive_authentication); M_CP_INTOPT(permit_root_login); M_CP_INTOPT(permit_empty_passwd); + M_CP_INTOPT(ignore_rhosts); M_CP_INTOPT(allow_tcp_forwarding); M_CP_INTOPT(allow_streamlocal_forwarding); |