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
diff --git a/servconf.c b/servconf.c index 748db5dec..ae45099ab 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.361 2020/03/06 18:29:54 markus Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.362 2020/04/17 03:23:13 djm Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -626,7 +626,7 @@ static struct { | |||
626 | #else | 626 | #else |
627 | { "printlastlog", sPrintLastLog, SSHCFG_GLOBAL }, | 627 | { "printlastlog", sPrintLastLog, SSHCFG_GLOBAL }, |
628 | #endif | 628 | #endif |
629 | { "ignorerhosts", sIgnoreRhosts, SSHCFG_GLOBAL }, | 629 | { "ignorerhosts", sIgnoreRhosts, SSHCFG_ALL }, |
630 | { "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL }, | 630 | { "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL }, |
631 | { "x11forwarding", sX11Forwarding, SSHCFG_ALL }, | 631 | { "x11forwarding", sX11Forwarding, SSHCFG_ALL }, |
632 | { "x11displayoffset", sX11DisplayOffset, SSHCFG_ALL }, | 632 | { "x11displayoffset", sX11DisplayOffset, SSHCFG_ALL }, |
@@ -2473,6 +2473,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) | |||
2473 | M_CP_INTOPT(kbd_interactive_authentication); | 2473 | M_CP_INTOPT(kbd_interactive_authentication); |
2474 | M_CP_INTOPT(permit_root_login); | 2474 | M_CP_INTOPT(permit_root_login); |
2475 | M_CP_INTOPT(permit_empty_passwd); | 2475 | M_CP_INTOPT(permit_empty_passwd); |
2476 | M_CP_INTOPT(ignore_rhosts); | ||
2476 | 2477 | ||
2477 | M_CP_INTOPT(allow_tcp_forwarding); | 2478 | M_CP_INTOPT(allow_tcp_forwarding); |
2478 | M_CP_INTOPT(allow_streamlocal_forwarding); | 2479 | M_CP_INTOPT(allow_streamlocal_forwarding); |