diff options
-rw-r--r-- | servconf.c | 5 | ||||
-rw-r--r-- | sshd_config.5 | 5 |
2 files changed, 6 insertions, 4 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); |
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 , |