forked from rpms/openssh
23 lines
862 B
Diff
23 lines
862 B
Diff
diff --color -ruNp a/session.c b/session.c
|
|
--- a/session.c 2025-04-29 11:20:59.475107377 +0200
|
|
+++ b/session.c 2025-04-29 11:23:16.638538968 +0200
|
|
@@ -2284,7 +2284,8 @@ session_auth_agent_req(struct ssh *ssh,
|
|
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;
|
|
}
|
|
@@ -2709,7 +2710,7 @@ session_setup_x11fwd(struct ssh *ssh, Se
|
|
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;
|
|
}
|