From nobody Mon Jan 22 00:06:52 2024 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 4TJ9WJ4jccz5833X; Mon, 22 Jan 2024 00:06:52 +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 4TJ9WJ4CPQz4ZLk; Mon, 22 Jan 2024 00:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705882012; 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=QQnGU64uh+sRg+DfP8o3mfsKD0EeOIWLFNDvHh9xSLg=; b=IILGkDpS42WJ1NnaUXQzC8DMaOyprve+o9VhqsLjTNQi2X9urDadLCMPkosoKnW5NLs2b0 hHlyQeabRtHjMsHyzQ4ZBQPEayj+3FyQiKJ1Nqrtj8mDx9uv32D7/bUnHRxgAVTkBvjIoI H5EUFjuRSKZiZ/bBoSUUsYWBQgwHxd0XHMblpIbgWquP7t/mswTli4gE4lT4Bq7tTSoYz0 Xd8+Jc68RSelfstNm5HM39X/ZD7WDIBK4KwTM/c6SKxvl1ovxKnGthgtqhj2kvSr3QdkNH 0ILzcAiAtaixHddbhh9ZqJ4oFTZcAUr2yuC1Z2xR2e03f+klglhmu3UtNyiAOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705882012; 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=QQnGU64uh+sRg+DfP8o3mfsKD0EeOIWLFNDvHh9xSLg=; b=ykXeZ12+xURVwZ6t/HDt64qerhnosVxJfYEP6o4kCT09+yMPrd8ioEvnzM8CxVNAGOS3KR e5Dg/dLJ2uFceoPo3zokyc5fPUIrK3Up2QIU5+xu52JopZLUelylnSLW8awpfFBNuT6HZd aZU4aKXR6MZmID6ChEjtEvNvMXipyMyJ22EqXhlWzMNVeR5o+tZgUyaFQBxznGOecxO+JU RtITq0T+pfv+zPAfrIZ31YXPZ8MZO25fIwF5SKKNEI+j2MKUNpg+3ue79+jEfoYPo0UtTO 3fSlgNnyC/uS6DjgCHBwRhXjWb5WXH//iNf6nYicSD9HdRa66GakzpCINnMK2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705882012; a=rsa-sha256; cv=none; b=BoEw3YQKbHTztLDWQ9om1fRUBnN+a64u8YiQ8amiP5O42WZNWCNe+jpNgo40mxP5E/PYO2 UwrHouzfNFYMTzB1IC48S7mmezj9NJy84ieN04qpQCaui9NgGm5oX2QaTxzu2fMXPmZquy rvWGyADhtE+UTrlgHOuR0LveNNRVOaX0Ae9st+ThReC8L98X8NanoBgkbyhuw6Azrsrz31 qUArdjtmsuWH9qkAye2+wEaZtxkLAYd9Pih6kXvjn0sdLI5sfOiRIun6WD/2xQVtoo5JBs 6G+rbePaleDhDDGkycU0NOKzHD245EDE0lTwpjKC3vFeJH+sbrZH9K+9lc/+Kw== 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 4TJ9WJ3Ggxzg70; Mon, 22 Jan 2024 00:06:52 +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 40M06qlG049886; Mon, 22 Jan 2024 00:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M06qxU049881; Mon, 22 Jan 2024 00:06:52 GMT (envelope-from git) Date: Mon, 22 Jan 2024 00:06:52 GMT Message-Id: <202401220006.40M06qxU049881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 91f78c32befa - main - rc.d/kdc: Support start of MIT krb5kdc 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 91f78c32befa08bf4010db7afd4407277a3e585f Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=91f78c32befa08bf4010db7afd4407277a3e585f commit 91f78c32befa08bf4010db7afd4407277a3e585f Author: Cy Schubert AuthorDate: 2024-01-20 13:52:35 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 00:06:26 +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 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43523 --- 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"