From nobody Sun Aug 10 15:37:15 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 4c0MMd0Z50z649fn; Sun, 10 Aug 2025 15:37:17 +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 4c0MMc3CFrz3f3c; Sun, 10 Aug 2025 15:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840236; 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=jxGJXrte0SOEn13dIvk2v69wDAJCJd7pRf3qxqeGp7s=; b=BlljWz7xnZGP/j+tWaY7HR76uIDyeL+cqAYp1HPZdJ8tWT3evnjJpTVXUbuGsNz3acaUoA dTXF8+uXm0gIuiTMc2mNhDuKUjd0/iXSqSlji74JsKgCx//Aw/GGmVmBmhTFxYePJ7elyv dtkWUQQPuP1ahZ1FvTBpr4yPyM033SD4LNiLziVYkFUkQ3dH9f8LVhvW4DIzShyKvZ2enn 8hswf8zz5AMIf2do8WsHevEl43SDHKRDiTC6h8z8UN24vhpNRWyFufCLnqp61u3KZ5x2cE 9qsnUHGayjIvkhGt7a1fX2pBQdEPZl9qVUxziKfkws1Y6LWYOnfL6flVXomBFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840236; 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=jxGJXrte0SOEn13dIvk2v69wDAJCJd7pRf3qxqeGp7s=; b=t3XI2fnieKpp+RasSes1EKTvDSZVAjgxQHIj7eBwzFD1+yQqZ6cOKmrQX8uuNvKDJxH/X3 sQf2unUcpZlgeT+fLuPiq2lX9vQ5HIL+yCa3rEgaIAzyXWJVk5ERrtU5y80oWOVohnQ/Ee 2qSV6M8qcwYRHt1BkIn0KcoFB8Rzqzc1FazMJItzPsco+0R808fCxF0fVC1ch9RAAACTAT JLuPopng9dLtZT4HhDVxKhhIUrlwQDA0UO0VZ1leciAilfUuIMU0s58yuE6PuNSLvwLKOa zkvIrH8IqNOMDqWVQnGRyuEBQ8Hpr2BNhqn1OKt5WW9v/T1HJKuPFjVRmb8J/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754840236; a=rsa-sha256; cv=none; b=GoqyopWJzUktdhH/COFIEcEvXuSkaWodsPiMlz+L9P0O2xNeNAxX9xlMdVOLgn9hZCEvy2 WP9HrOACopC2Xz4p7FqAlar/V5OABjSWLR05qZHCI1AphuXXuW/pZ0ySbqZXtlfC6qR4B4 o1pOV0Mk72ccmx94tZ9Ceth2MOwc2qOBO2DS5vwfwI/7VqOTAOvjuI3l57aUgDV7SO3egd t4GmEpPiOPFslAWE+VAJvRpqEu5dvXnP/XwR48OnbV/Rqj5QKv5qrc1DKRhtDDn9ERAQSg C8hQ4xwogDTpzGOiB7wuNoFIa79fIMMKgSdk97nqg9AxlrW7tnlHDQZGArt3NQ== 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 4c0MMc0ZMFz1BSw; Sun, 10 Aug 2025 15:37:16 +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 57AFbFdG067186; Sun, 10 Aug 2025 15:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57AFbFX5067183; Sun, 10 Aug 2025 15:37:15 GMT (envelope-from git) Date: Sun, 10 Aug 2025 15:37:15 GMT Message-Id: <202508101537.57AFbFX5067183@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: 992d2f928452 - main - rc.d: Fix Kerberos rc scripts 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: 992d2f928452519877c7d4377d8e5ae124d68dba Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=992d2f928452519877c7d4377d8e5ae124d68dba commit 992d2f928452519877c7d4377d8e5ae124d68dba Author: Lexi Winter AuthorDate: 2025-08-10 12:26:44 +0000 Commit: Lexi Winter CommitDate: 2025-08-10 15:36:39 +0000 rc.d: Fix Kerberos rc scripts Split the Kerberos rc scripts into two sections, one for MIT Kerberos and one for Heimdal. Don't install Heimdal-specific rc scripts (e.g., kfd) for the MIT case. This does not include an OptionalObsoleteFiles change (even though one is needed) because that will be fixed later in a different way. Reviewed by: des (previous version) Differential Revision: https://reviews.freebsd.org/D51830 --- libexec/rc/rc.d/Makefile | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 62285018cbef..d0c6fc1dee46 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -29,12 +29,8 @@ CONFS= DAEMON \ iovctl \ ip6addrctl \ ipsec \ - ${_kadmind} \ - ${_kdc} \ - ${_kfd} \ kld \ kldxref \ - ${_kpasswdd} \ ldconfig \ linux \ local \ @@ -288,17 +284,32 @@ LPPACKAGE= lp .endif .if ${MK_KERBEROS} != "no" -CONFS+= ipropd_master -CONFS+= ipropd_slave -_kadmind= kadmind -_kdc= kdc -_kfd= kfd -_kpasswdd= kpasswdd - -DIRS+= VAR_HEMIDAL +.if ${MK_MITKRB5} == "no" + +# Heimdal rc scripts +CONFGROUPS+= HEIMDAL +HEIMDAL= ipropd_master \ + ipropd_slave \ + kadmind \ + kdc \ + kfd \ + kpasswdd +HEIMDALPACKAGE= kerberos + +DIRS+= VAR_HEMIDAL VAR_HEMIDAL= /var/heimdal VAR_HEMIDAL_MODE= 700 -.endif + +.else # ${MK_MITKRB5} != "no" + +# MIT KRB5 rc scripts +CONFGROUPS+= KRB5 +KRB5= kadmind \ + kdc +KRB5PACKAGE= kerberos-kdc + +.endif # ${MK_MITKRB5} +.endif # ${MK_KERBEROS} .if ${MK_NIS} != "no" CONFGROUPS+= YP