From nobody Wed Feb 26 17:52:18 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 4Z329b1tg2z52mpl; Wed, 26 Feb 2025 17:52:19 +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 4Z329b1F2vz3mNv; Wed, 26 Feb 2025 17:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740592339; 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=phmDoqWI/VEBeVZO3CddIflEx+mz1V4Mt9dWBoh3c4c=; b=feT8rVnU3AfGEtyOS1pZ7vYmWamt8htvgG9a/70OSPbSoawvxr1nCPAqfmgGO+i1Kz8QMD sPrx3nIQ/NszexEKalgInO1Dg0+lKeLlJRxI5xlEHBD751FsxW8Kz8v0y6aKtxjP2UL7vH MJZSUsqUinDwgHc2H3qwlDKTigqg4dZv8bPnedr6VcxNVbm3EsWonyBQWK0chB5IDEh0vk zaD6ZjiknPUz/k2m0wBfOChnDQBUL/LG1pihbu5+wAFmTu+/ZQmkLe3KS22wzRuXl81xFf 5i4XhsIUFq4uY9sVTGX8T/32W7HvdLdNUHr/N7pjzNc4bM/g4DIYdh0vh5ZZRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740592339; a=rsa-sha256; cv=none; b=Qa8tv8FXI/w/VgpU3B/TUodeIzKxl2b5gn784pqSDlhSnp6lhzvOSItyzfsWUYVvfuV6TP odrj9hA2fG6LVBUcKrKlM62X8OJAXCSj9WG/lHtL/zT7dOMnpuF+iugT3aOwhesQ48xvl5 jDWP7yRBXS3/I2OPp0eNVW6M+EWKA4opx1Cb0SEAhFb7vzuvKNycEimeH8DWVjEPkkSAPU Bq+F/BlOyKQY7ptqQrgLlRLI7/g5qxRtpdIEFtj5ClBHXH+h7DYkeOIaN848BE5O4kjs49 PFdHXS6NXNqraoDfbjI+hkXVYnW32ZbHFssygkQ+HazUvXgBa8LZ0cot1DzABg== 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=1740592339; 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=phmDoqWI/VEBeVZO3CddIflEx+mz1V4Mt9dWBoh3c4c=; b=Ro6Leu6nGPKfmFq3M6Qe01+pjodMETatzvBDy/xwfaWy66vEiEN2R4AU6u476aI5h0wb6x BCzkAHP6HxM417HKdhhKd+BemQ3sGpCTWFMfgibMb0WOwhYDIFXHfHXNfAgqC/NmpNCYYH rJ0zZC2ZlkfzEfzG7Yu5T1jopoOgvabEOk9j480V1TIp0RVgQayGBNLBr7CHnU5rhaHyCm pNOuz4fxIJnXwcNGyZXpsxfOqLbTAKu4Oddij3eOnZPqaYkwwBXUun9Dme0d9wG+UnjIX8 XTx79dPutv0JKYyXm62Uh/mB6KsmG8PNQ/eHvCCXAasNFyMMGHFfOEpcDy6OSQ== 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 4Z329b0bWSz1M21; Wed, 26 Feb 2025 17:52:19 +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 51QHqI98031052; Wed, 26 Feb 2025 17:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QHqIli031049; Wed, 26 Feb 2025 17:52:18 GMT (envelope-from git) Date: Wed, 26 Feb 2025 17:52:18 GMT Message-Id: <202502261752.51QHqIli031049@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: e8043c76e378 - releng/13.5 - 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: e8043c76e3788c555f633a0de6395a4d10ea375b Auto-Submitted: auto-generated The branch releng/13.5 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e8043c76e3788c555f633a0de6395a4d10ea375b commit e8043c76e3788c555f633a0de6395a4d10ea375b Author: Jose Luis Duran AuthorDate: 2025-02-24 14:38:52 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-26 17:16:16 +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) (cherry picked from commit f931a32bcaf3f86581d2dbe46f7809eb47d1b167) Approved by: re (cperciva) --- 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 */