View | Details | Raw Unified | Return to bug 3148 | Differences between
and this patch

Collapse All | Expand All

(-)a/servconf.c (-1 / +2 lines)
Lines 626-632 static struct { Link Here
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 },
Lines 2473-2478 copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) Link Here
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);
(-)a/sshd_config.5 (+1 lines)
Lines 1162-1167 Available keywords are Link Here
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 ,

Return to bug 3148