From nobody Mon Jan 29 00:29:50 2024 X-Original-To: dev-commits-src-all@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 4TNThb1wtHz57dkF; Mon, 29 Jan 2024 00:29:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNThb1T2nz4nsX; Mon, 29 Jan 2024 00:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706488191; 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=9c6q+Apcq5twkKbkGD4XsLWRf8F/hPvurdELmCeKMNs=; b=cxWzps3XWQ6V3IvRA1AI5sIR+i9po5+BM1zIxskIv9v5e7NPSRFLwR0wZ70BR96TSQmPYG y9e6oIGRLS+qexBmsk7kFSwRRvPPmpVaL8sG+f6GoXRILZPqYJ9U8FAiI419EnAbazS+Vl 6ps0Ay1dVyd20upJl9XE/0JcWWKkf7kmusnomxubrMdyfru4B52fAH0CH+qJ4zmcsDVy9c mmRT7p/BkfidTsakJVDxSvqDI+uU6DZ5+ScOjpXMonSz9xtRQcVMyeu3ke5/XQkaNfZzxS OwXO1/AciPJ/KfHlu3T3KDZVLMbKA6VNYtBSptlcqNnQ1cUrAqpa4C4DtkK4NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706488191; 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=9c6q+Apcq5twkKbkGD4XsLWRf8F/hPvurdELmCeKMNs=; b=QeZ2MmVUidae3UuJs8JEA25au7krLhNP8bdqwkcXgFfAF56+XdDP8CJUxWfltIcnZspBoA Iir7P5/csfZ3iNkHVYk7sjCBBHUk0wqqqtOxiYO2Id1+/GA1kJXSuycjfOT39vUsULftzc eO1zfa9a81En5UQfqr6OmReVmMW5JZZrcw5EQ9JoVk3x+mLK9eI45avvniGETepKndIhrC BxWxGL88oFfnp2vqrWgD8LXzuxdHbZGxiUDasunVWGc7ufJPRSDFS2ZerbIaNKdaBUfJU1 YSSw3X7svbCtB+O1LtaozPWyaKhRzNEZehBGqOlTDSArKhWxjvTtIf1aLQeIug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706488191; a=rsa-sha256; cv=none; b=hcewIdu51sSHn6GeHBmeHS1P/vA95lW/BWBEeBFttjlSuG+9Jr0ZJW/DFY7bxjXbJc6odU K/gI0mJyI5NGQFPiV1PJu4FYqiMev3M02FBrkQASX2lbB4i9QUnMnVfd2XSSwTar3k1epc DbEjD8Mz4pf0VywvCC0MUEzCylJcko6lmwFnG9FhHWBRstli6WDuCWbd2P0ZuTNt1Yczvj KVXfwFGnE5zsSZ4xbnuDZgvvyKQWgnWUk/8j2hjP/fQXp+DrxMQS9yCWj7+lUxOEH9qxh4 8Eu0Wh+XWGYdXOs5HBZpNOVZ/lp+7yBB+I5LOmDNmotoPaPrU3wueS7YdkhiOw== 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 4TNThb0PWfzVDD; Mon, 29 Jan 2024 00:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40T0TolT072007; Mon, 29 Jan 2024 00:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T0ToTD072004; Mon, 29 Jan 2024 00:29:50 GMT (envelope-from git) Date: Mon, 29 Jan 2024 00:29:50 GMT Message-Id: <202401290029.40T0ToTD072004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 83ab4d6cc58b - stable/14 - rc.d/kdc: Support start of MIT krb5kdc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83ab4d6cc58bd53b84a819d51b032ba17f3f6a8c Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=83ab4d6cc58bd53b84a819d51b032ba17f3f6a8c commit 83ab4d6cc58bd53b84a819d51b032ba17f3f6a8c Author: Cy Schubert AuthorDate: 2024-01-20 13:52:35 +0000 Commit: Cy Schubert CommitDate: 2024-01-29 00:26:05 +0000 rc.d/kdc: Support start of MIT krb5kdc Some users wishing to use the MIT krb5kdc have discovered the kdc script workaround applied to the MIT krb5 ports is insufficient. Let's build into this rc script the smarts to determine whether base or ports Hiemdal kdc is being invoked or the MIT krb5kdc. While at it, remove kdc_start_precmd(). This will simplify a future jail patch. Suggested by: netchild Original patch: netchild Reviewed by: emaste, netchild Differential Revision: https://reviews.freebsd.org/D43523 (cherry picked from commit 91f78c32befa08bf4010db7afd4407277a3e585f) --- libexec/rc/rc.d/kdc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libexec/rc/rc.d/kdc b/libexec/rc/rc.d/kdc index 4b8cf87197e8..c3059f261e09 100755 --- a/libexec/rc/rc.d/kdc +++ b/libexec/rc/rc.d/kdc @@ -12,17 +12,15 @@ name=kdc desc="Kerberos 5 server" rcvar=${name}_enable -start_precmd=${name}_start_precmd set_rcvar_obsolete kerberos5_server_enable kdc_enable set_rcvar_obsolete kerberos5_server kdc_program set_rcvar_obsolete kerberos5_server_flags kdc_flags -kdc_start_precmd() -{ - - command_args="$command_args --detach" -} load_rc_config $name +if [ "${kdc_program}" = /usr/libexec/kdc -o \ + "${kdc_program}" = /usr/local/libexec/kdc ]; then + command_args="$command_args --detach" +fi run_rc_command "$1"