From nobody Thu May 15 00:04:14 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 4ZyVnB6r3Jz5w1jK; Thu, 15 May 2025 00:04:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyVnB2BKtz3qWT; Thu, 15 May 2025 00:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267454; 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=YNVYhb+a7++9OK9xmFQ1J2XZ8uZ+xFgeosLvWWf41FY=; b=XGwhl6eC1a7ZRKOEWG+NCaGUNRQ5cRE+O5SzFxZGKL3dZ+mb5PFDUKxLD1E/Kpro9tx0bB hHM+riA28665ENG7tnbOuJFRudRPwSj2zpJO2RKVtkh1qjRRDrn54o/f6BGbrhYgudc/rf qTDNdAP0yJb+gPdUckfveWMRftdb5JmfVnNNTxQvDgAhXiZyG6cBmQV+IymfeTz40rvlxv +zCKneV7IR7BKUCETW+Qi2pjfeJ2FSPURQU4x7cXswj3kcrQAum0bZEvDtmvz9s4l6IlPp a7LcAb1bTkn+sfLVMkqpGIJAYw84kSX2pLGbY2kDQFO9ih3Rz69vbdEttCFRXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267454; 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=YNVYhb+a7++9OK9xmFQ1J2XZ8uZ+xFgeosLvWWf41FY=; b=fo7KkJkTHiIPD8LqQ0LmPFow/+BtZbN2G8B1i2u9xOxlg4ksN5ktYRObNEBSsNveq1xhHT Ln2S2yK2xsl1JDNUOAld6jMYm61DX4lAIHcushmOpLBCIxlwxfUI3uU0Jn4R3sgODGD+gO iiOAAo2XWMmgvCPGRejubCJIkg3XH0j+C0YU1uMWCn6yphtUcwM58JV258A141ZUrWSP4o a4I46u7qEZ5v5tWLaI2BCPm4TzQ9DfcIvglRfKleSUDMku0T/DxQalat06WSa08CoQhDQm W/jqFS743LuFD6fq5c9K93sQM3WuMmogVwh15M7dqJ5VU0YtkqCiAG56gjYmiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747267454; a=rsa-sha256; cv=none; b=EAjvragleYWoTjyJaU40oTavUbtgr2GuZL++CvT8/4NUi+9XZdgRjMbIoZDpihmoqO0Gj7 B7f0hhA3Ey19ZBd8Q86gDdMZrZFt0M+Qipx/XUiQTTE445gUZsyF1+1JvUgfD39BJLSKNH 8CQqls2sPr6n8t1NCgwq9DEPg6UX5PAZUaGkIzUGnxKvYFzdXVUhITMqPNhTaq7Dl5dLR0 jQCZdC0bEc0SBb/5+5vYoNkNsKei9yZsDWHAN8sQAWU9XayDfP/Y+bulU135f7Bpa5gWDr 3khsrYqo65FOg0TRZaSzrz4dB1NRGKvYw6V6YYDz3Hy3KHWXw3iAmW6GZvMHPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZyVnB1l4BzvDm; Thu, 15 May 2025 00:04:14 +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 54F04E9N046863; Thu, 15 May 2025 00:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F04ETi046860; Thu, 15 May 2025 00:04:14 GMT (envelope-from git) Date: Thu, 15 May 2025 00:04:14 GMT Message-Id: <202505150004.54F04ETi046860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 7a8747f53498 - main - libpam: provide a real /etc/pam.d/ftp 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a8747f53498fe2e3ff0f87ce2a184316b115ae5 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7a8747f53498fe2e3ff0f87ce2a184316b115ae5 commit 7a8747f53498fe2e3ff0f87ce2a184316b115ae5 Author: Lexi Winter AuthorDate: 2025-05-14 14:15:46 +0000 Commit: Lexi Winter CommitDate: 2025-05-15 00:02:52 +0000 libpam: provide a real /etc/pam.d/ftp We provide both /etc/pam.d/ftp and /etc/pam.d/ftpd because FTP servers are inconsistent about which service name they use. Previously ftp was a hard link to ftpd; to avoid hard linking config files, replace ftp with a normal config file that includes the ftpd service. Previously /etc/pam.d/ftpd was in the -ftp package, while /etc/pam.d/ftp was in the -runtime package (by accident, not design). Move both of them to the -runtime package, where the rest of the pam.d services live, since FTP servers from ports use it and people using a ports FTP server might not want to to install the -ftp package as well. This also fixes /etc/pam.d/ftp missing the @config tag. Reviewed by: des, bapt Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50339 --- lib/libpam/pam.d/Makefile | 11 ++++------- lib/libpam/pam.d/ftp | 13 +++++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile index 5dccf590ee4e..a58c37b6c223 100644 --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -22,18 +22,15 @@ CRONPACKAGE= cron .if ${MK_AT} != "no" CONFGROUPS+= AT -AT+= atrun +AT+= atrun ATPACKAGE+= at .endif .if ${MK_FTP} != "no" CONFGROUPS+= FTP -FTP+= ftpd -FTPPACKAGE= ftp - -LINKMODE= ${CONFMODE} -afterinstallconfig: - ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd ${DESTDIR}${CONFDIR}/ftp +FTP+= ftp ftpd +# Do not put these in the ftp package, since ports also use them. +FTPPACKAGE= runtime .endif .include diff --git a/lib/libpam/pam.d/ftp b/lib/libpam/pam.d/ftp new file mode 100644 index 000000000000..1c255441dca6 --- /dev/null +++ b/lib/libpam/pam.d/ftp @@ -0,0 +1,13 @@ +# +# PAM configuration for the "ftp" service. This is not used by the FreeBSD +# ftpd(8), but is provided for compatibility with FTP servers from ports. +# + +# auth +auth include ftpd + +# account +account include ftpd + +# session +session include ftpd