From nobody Mon Feb 24 14:40:46 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 4Z1k1V5wMgz5pFZg; Mon, 24 Feb 2025 14:40:46 +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 4Z1k1V3s0Nz4QM7; Mon, 24 Feb 2025 14:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740408046; 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=oPbZLct5Te+E5l7xxjFgn9LprtfeIVaC3n+PcjNq4/w=; b=vkLWOs8CQFl0ztWbDkcCaxjC0KqKZ8FRwFoAGLh1doK3I848Se56rgbGfO5D2o/r90fygU ulFcprbkN6wg9LeqdNBNm0UZSWkZx4arbioA98j/KXcmcElT+5qQAf2MYwIYepIoIo6C9n Nxm+l1FzaXDde2XzW+w9PcI8lanDgWD1HiLcAZaYAlgf+EqViCy1q6Pdr45BqAh4aJ47cA 1/Fpc/bD92kyOCG5srhi2HHz8Y1vlICCBt9YJA0ZL8OsrMYb0lhj6DgppWfapno/51T871 aHzNRSZcn9MJqVVR1D7jn3VChrajg6sGLtb4Qi82Hxaa+QocqxRaqCmMt8oq+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740408046; a=rsa-sha256; cv=none; b=NsOZ13Ooauk2P050ovdFEnTWsTVe9Omy31pXdnChzAil2tpoDY6x/0k/VQTrCYmaM8Vm3e OsFk381k0tO/h4adycXToxWlqTZaFqfhcnzjlKVnVuolMFwTRnMg+jRlgI/htWjy7Bko0A Jr7oQoGQGdh6gVuEfyQ7Ilzvmk3TDK5YuF/ITbaZldEusei8oXjmchLXKINd5/qbC9VMZj ssV1XcvzDUtEaQcHFdVVXNV0Y9PxWdzrXAZQ4ppPK66ITyaMmkGyNEK0IVLAkYEDsjMPaI 9eBjLaMmPKgg/Bbll/mQyVmnIjRPvu9bxJsdyN+J2eEiI0PD4mxQjYBgRgp9Xw== 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=1740408046; 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=oPbZLct5Te+E5l7xxjFgn9LprtfeIVaC3n+PcjNq4/w=; b=y1sVzDgthdbD0uKeq5vBhfJ5YG3WUF7Gj37+ZsWuX9KQGDr0/y0SkHWTo4LUtrd5Om81dx EEX5T7SRDfnwxQyKK1bBi7gGAGQFpol/JBK3aqnf7YJov/dZuVmBxY38VHPxwKG0nu9ScH Z6qVbhkNCny3hpDMPuw6WDMJPbrCtx4VWGg98HA7cQzhQ1rajn6aYOL8Jl2thvPoX4nFnw pBRTyys4Igsbt41EfqQ6LNQ1KmQM2vQfWCwJyNdtboIsiqUVGSNTBZ5E/n6Sgpb8oVXVCV DAX6GXzp9ttgr/WZFRGDu4IO7Jn1oRps5nMYI2mRUZY9BZYwRTqHLmJVZTXGAA== 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 4Z1k1V3CmdzlSH; Mon, 24 Feb 2025 14:40:46 +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 51OEekol082041; Mon, 24 Feb 2025 14:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OEekwk082038; Mon, 24 Feb 2025 14:40:46 GMT (envelope-from git) Date: Mon, 24 Feb 2025 14:40:46 GMT Message-Id: <202502241440.51OEekwk082038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 61d8af38bf1c - main - openssh: Fix blacklistd sshd-session integration 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61d8af38bf1c5328c27ccfcd8a3b73e9e8604d16 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=61d8af38bf1c5328c27ccfcd8a3b73e9e8604d16 commit 61d8af38bf1c5328c27ccfcd8a3b73e9e8604d16 Author: Jose Luis Duran AuthorDate: 2025-02-24 14:38:52 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-24 14:38:52 +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 --- 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 */