From nobody Wed Feb 26 16:43:53 2025 X-Original-To: dev-commits-src-branches@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 4Z30ff2gyZz52fHF; Wed, 26 Feb 2025 16:43:54 +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 4Z30fd1w1Fz47nq; Wed, 26 Feb 2025 16:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740588233; 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=RhhrbLNDI3Q/97A4XnE6NFyWDvvFShd7TiXve1sNSLk=; b=e0xW3xdzeQmNsHMc5LnJ4CdPBK7TU1ppdwlt1zY3CZT1V8JaKIvPfPEPNQozQDhJxMhVvs q3KkMAsZw9rsFSNAnDtjSZj1WbdRqqNjYd01s280rqIcftGyaMjaGOvp/ZerRS2fe2C7gL L3GUNnFa1d8ugOWxhHdxyWhygiYmj8RMCxZs0zf4TqoQ2/LfAKElOIrsWPVZlHuMwNcs81 lQd8OqPm6F438B1y7uS51kLq1Fb4fvdI0Kshn0bVMpzH6mECPG0gGZbFi7R2gb6inY1IMn 0EVMCXRpyLMNVKXccbw43z4Exn5CLwjnl/vTu4Yfq73Ui/O70NtEYh02PW+izA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740588233; a=rsa-sha256; cv=none; b=d9ZU+fcVHACtwJeqg6KzXXNIZiF/IyhMiYTW+GVkE6wDLSGciKzJVN6VT/JFcGWXCb9j9u N8zuPLyGvp8aH1OfNX9Wh5sU96ekFGZdNkE5mnxSWzBFdihB5htv3hO22pksnwyQ2aH7RX 2MIu48zXGZJQ6/QpUiYFwEAyRro1zRH70ROUkwySpmH1McHpYB1P4DeUxnlPq5O1RGqJBg jPVbci6x/qnrl/wYGtR6LDgEMWSRoOwRY0vdbeCWbKC1dGB2wEuxOkG1Nap5V2kLqKtM9p QKKit/cwkTLVU2EvfWfiZTzTGZkbAJtS7C+tz+Eq2SxsEf2PD7IUgV9/qi4eqw== 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=1740588233; 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=RhhrbLNDI3Q/97A4XnE6NFyWDvvFShd7TiXve1sNSLk=; b=FIF3OhoSZNUESRqWbRqZQ6R1SkP+REvsS/IHOu7orz9d0CqXF0Hd2I7W+5p+WmPsN06Mt1 PY2frp29QH4NhphplzKpOKVoGj7uw6lPBlbLqdJ9mNXBPFybn0Tvj1VrykGBqA6UmSUORz XcjM6T3R9NBsN7I6mC4yXYnhoyLtG2xJx5JEc9jKF9qlj0EqmFOosmILzkle8yiDaZrSih 5Gecv2vj7pgqFC2ww5RulpOzzUhkT7D0iVEltP8On9htuurXTXpTRkw0QT85rd2UWBd6dk b9CxrTC//WNXiwB4fruPlx2S0yssznxOzPRCev5VoJcYiHYHn1y67NkNl6tHKw== 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 4Z30fd1FMJz1KFh; Wed, 26 Feb 2025 16:43:53 +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 51QGhrTR001509; Wed, 26 Feb 2025 16:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QGhrBq001506; Wed, 26 Feb 2025 16:43:53 GMT (envelope-from git) Date: Wed, 26 Feb 2025 16:43:53 GMT Message-Id: <202502261643.51QGhrBq001506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f931a32bcaf3 - stable/13 - openssh: Fix blacklistd sshd-session integration List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f931a32bcaf3f86581d2dbe46f7809eb47d1b167 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f931a32bcaf3f86581d2dbe46f7809eb47d1b167 commit f931a32bcaf3f86581d2dbe46f7809eb47d1b167 Author: Jose Luis Duran AuthorDate: 2025-02-24 14:38:52 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-26 16:42:45 +0000 openssh: Fix blacklistd sshd-session integration In version 9.8, the server was split into a listener binary, sshd(8), and a per-session binary "sshd-session". Our blacklistd changes also have to be moved from sshd.c to sshd-session.c. Reviewed by: emaste Approved by: emaste (mentor) Fixes: 0fdf8fae8b56 ("openssh: Update to 9.8p1") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49116 (cherry picked from commit 61d8af38bf1c5328c27ccfcd8a3b73e9e8604d16) (cherry picked from commit 707ac59c2b31bdf3a593bc545d2fe233598cb97c) --- crypto/openssh/sshd-session.c | 3 +++ crypto/openssh/sshd.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crypto/openssh/sshd-session.c b/crypto/openssh/sshd-session.c index 3092cd91242e..ee983176d3aa 100644 --- a/crypto/openssh/sshd-session.c +++ b/crypto/openssh/sshd-session.c @@ -109,6 +109,7 @@ #include "sk-api.h" #include "srclimit.h" #include "dh.h" +#include "blacklist_client.h" /* Re-exec fds */ #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) @@ -1316,6 +1317,8 @@ main(int ac, char **av) fatal("sshbuf_new loginmsg failed"); auth_debug_reset(); + BLACKLIST_INIT(); + if (privsep_preauth(ssh) == 1) goto authenticated; diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 68e48d75369a..fd48835ebd2a 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -101,7 +101,6 @@ #include "sk-api.h" #include "addr.h" #include "srclimit.h" -#include "blacklist_client.h" #ifdef LIBWRAP #include @@ -1876,9 +1875,6 @@ main(int ac, char **av) } #endif #endif - - - BLACKLIST_INIT(); } /* server specific fatal cleanup */