From nobody Wed Apr 09 15:05:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZXmTM4xBFz5rvyB; Wed, 09 Apr 2025 15:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZXmTM34j6z3VP4; Wed, 09 Apr 2025 15:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744211111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Oszsd347OV9fTtS6vdnUA+S28Xwb1fvfubwJ9rTJ9k=; b=m1okz6/5rSZNyHvCMAGIn2mDG861ICQMeBCcqsseX5nK7uYSqPulkI1ZTwu/tm0C6g93kA jbOeD7GGSPadEm9AVl+fuKUQKZT2/bIMmNObaU/+ZVdpgu9rSYxu/7tnD8q04yTLPjVuny ccSH9bpQik7KC0DvsTgTmCIR3XtqfSHGulnYGUb+o7f5dn1sj+SKPx2omsfHqn15xEwdjx ntEkKuOI7Xbvk0M5TtYcLCKklCMQxfw/Ui70fnAjMvyqcDYi5/hYhQeS9TOpxLypYNaFMl co16uPznuik9s1QVcLBWj0GBb0q+dZyLqP4YR2f4EwXsSeMS9Ww9rdtALApseQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744211111; a=rsa-sha256; cv=none; b=wKNExN+yf6iJdJxDVjqWgm3dwZmJj6J9KMLRtERF+fsNV6kaPiPtdo3Twyb/kQfyJlYsOJ MsrpRFZE6QdMXLJ5RAr8mTBpTp8WtiIR1FvKIOYTlPXsiZ+1SiHA95AfYdUdEJ/U14yqVq o2V+Rum3UvTtf3Hzkr0ILlnO6rE4hH/Z1zlvMhcEdcUUof5weDJ2Qzq8vBwDT42DBaEfHl hkngwfQeDADe61DBFKCv/DMHfk8W3k9zTcfJZip4WRt5g32KbnHWsl4kClj3GpFJI6QxkD GyZmfnoXQUVCvnZOY9j8LyWsPuLV26yhRF6e8vv251UrnMIIGqpeKBJ9zWfHcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744211111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Oszsd347OV9fTtS6vdnUA+S28Xwb1fvfubwJ9rTJ9k=; b=VVQcrs21cKysINByj3EHSCl6aQ6oFejpN8hEYQ4FvSl1x6GFJcbNW1+OB8GnpwN0BYOqV4 53JApcWNT0HRaGEXavhmJHTuoHIbGfQxMf1hX3cEVKuoovaXQdaAyVr3iW5FNnbBvhnznT vYXV/rYTuKFciDv3v5pCdcXOvTm63gEIs190aTJwDzQJKfv92mtHOvMoSDu/5SO3VI9xm6 LhNsXGlTd/NWmQHmCMgs75XUTmxnuP+EAB/tL+XcrnIq7RQRLwQJq2qAmzLmRnbmv7UOw/ BtcaRDSWqefq6+OaHwYwqeiBc2ARaE+JpYBzAa50q1oW0wlN+xzCUceOcryWbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZXmTM2RRRz5rf; Wed, 09 Apr 2025 15:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 539F5B8g082617; Wed, 9 Apr 2025 15:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 539F5Blm082614; Wed, 9 Apr 2025 15:05:11 GMT (envelope-from git) Date: Wed, 9 Apr 2025 15:05:11 GMT Message-Id: <202504091505.539F5Blm082614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3620d70511dc - main - OpenSSH: Fix logic error in DisableForwarding option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3620d70511dc8bf45752028dac0af6f157ec6146 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3620d70511dc8bf45752028dac0af6f157ec6146 commit 3620d70511dc8bf45752028dac0af6f157ec6146 Author: Ed Maste AuthorDate: 2025-04-09 14:54:46 +0000 Commit: Ed Maste CommitDate: 2025-04-09 15:03:29 +0000 OpenSSH: Fix logic error in DisableForwarding option 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 --- crypto/openssh/session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 591f1e329a8d..03a20f9d9648 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -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; }