Attachment 3380 Details for Bug 3148 – allow IgnoreRhosts to appear in a Match block

[patch] allow IgnoreRhosts to appear in a Match block

bz3148.diff (text/plain), 1.14 KB, created by Damien Miller on 2020-04-14 21:35:59 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2020-04-14 21:35:59 AEST

Size: 1.14 KB

patch

obsolete

>diff --git a/servconf.c b/servconf.c
>index 748db5dec..0e225ab7e 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -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);
>diff --git a/sshd_config.5 b/sshd_config.5
>index 70ccea449..1dfdbe548 100644
>--- a/sshd_config.5
>+++ b/sshd_config.5
>@@ -1162,6 +1162,7 @@ Available keywords are
> .Cm HostbasedAcceptedKeyTypes ,
> .Cm HostbasedAuthentication ,
> .Cm HostbasedUsesNameFromPacketOnly ,
>+.Cm IgnoreRhosts ,
> .Cm Include ,
> .Cm IPQoS ,
> .Cm KbdInteractiveAuthentication ,

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 3148: 3376 | 3377 | 3378 | 3379 | 3380 | 3381