kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

OpenSSH: Fix logic error in DisableForwarding option

Browse source 
This option was documented as disabling X11 and agent forwarding but it
failed to do so.  Spotted by Tim Rice.

Obtained from:	OpenBSD d31ec64016fc
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 3620d70511)
This commit is contained in:
Ed Maste 2025-04-09 10:54:46 -04:00
parent 43933d89a3
commit fcda475ccf
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crypto/openssh/session.c
View file

@ -2194,7 +2194,8 @@ session_auth_agent_req(struct ssh *ssh, Session *s)
if ((r = sshpkt_get_end(ssh)) != 0)
sshpkt_fatal(ssh, r, "%s: parse packet", __func__);
if (!auth_opts->permit_agent_forwarding_flag ||
!options.allow_agent_forwarding) {
!options.allow_agent_forwarding ||
options.disable_forwarding) {
debug_f("agent forwarding disabled");
return 0;
}
@ -2589,7 +2590,7 @@ session_setup_x11fwd(struct ssh *ssh, Session *s)
ssh_packet_send_debug(ssh, "X11 forwarding disabled by key options.");
return 0;
}
if (!options.x11_forwarding) {
if (!options.x11_forwarding || options.disable_forwarding) {
debug("X11 forwarding disabled in server configuration file.");
return 0;
}