From nobody Mon Jun 16 02:51:56 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 4bLDzx0q7dz5yNCT; Mon, 16 Jun 2025 02:51:57 +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 4bLDzw66Lcz3SLQ; Mon, 16 Jun 2025 02:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042316; 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=+5YYLrwO3BDxOjsJvp5NgLxaKoiEGxVZ2pbmUrM4ocM=; b=xilHpKilv/IxqmZt59Xpxju+VUpKZSdFTA9XDyXjYXDAR6jMvWXJtkMBhqSRrntU6j9jB0 BRg5zq1eS3QJp/5l04N38aS9hfwMaIPjNClY6nGqgW9HQutkciwAo8WUM4k2TdoqZazBWN wC4N7T/B9D0EaMMojLR7L3GqmCKBAdxju2l0mpRgL5PI+pk/FbwlVjrlE0zGBPKx/A/nXt 6AKPk97xOt7Qoj53hfEnR/aMV/OOtNfxQGgY+0wW4m4KQ2D4gLuAaJTH0GcXA508XcbHQv E9sUh2lCXRDm6pBg6yqXzFYcXT1B3D5goJB0aBXLdE8Muab662kaMs1ymKmuiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042316; 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=+5YYLrwO3BDxOjsJvp5NgLxaKoiEGxVZ2pbmUrM4ocM=; b=pUPFE52fjkfC/bwWifqJNL2iploA8f7svzRF3CJbxJFpAktAwG1POzTT9Uwfmx9mDwaxWo SXGDAsC6kj4hbdgiRdsr06rvrnkzocmUXE+ADYuthMDrkIlw/352SD3txHn+reqzF6744I BtT+DvI1Syt6+X0SNg8UuRFZC/u/RHys6P/kKq5ZquxA+TMKodVNC4/YYJ662JX1JtV6yT u5w7hFD+bR6t6It8UfbdxHbsvT+tqrLd4O/4akMcDzFsOZ8fR5RTLpiOA9PWACM5cNSnlh /+pMTnNCvfwb4riTpDnJLDBXA6tqCxB24lC8/QGv9rVEwMfrQim+PsNw4zT7Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042316; a=rsa-sha256; cv=none; b=qoDBTbeeue7TD2iDtKjzEjEFxSSz6MYeWDgovmaJQqEqVnG1R5PL01z0XFjoAHdPCL0ZbV nnfRbhrtQJroD/biD3c9V4y6YgNABV2dIPeHfKQFYXFGs7XY7Wf7jYinLvSHXm7g5lzQgJ NFDZqCCXtZShYo964zI/W/j82PGRpGyQaucct2RwLVEHxt1zvIYo5D1EMdQxamMpJtLtCp lIGu2TiOXkCARzcomlBf6pYFQMK9jkAaGt083m5DwcAXvVFVDhHRpS8CNX+zZQDVxUew/J G2vlKqqT6tfV6jywUUDHFClIdBDmiILwInfvYcJCcRmvgSv6U3cFjfhtMPx3CQ== 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 4bLDzw5Tr7zgln; Mon, 16 Jun 2025 02:51:56 +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 55G2puTH063160; Mon, 16 Jun 2025 02:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pupj063157; Mon, 16 Jun 2025 02:51:56 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:56 GMT Message-Id: <202506160251.55G2pupj063157@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: 4103f8dd57b2 - main - rc.d: Add MIT KRB5 krb5kdc support 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4103f8dd57b2a4985ff547c879cc05684932a874 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4103f8dd57b2a4985ff547c879cc05684932a874 commit 4103f8dd57b2a4985ff547c879cc05684932a874 Author: Cy Schubert AuthorDate: 2025-06-11 02:48:06 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:37 +0000 rc.d: Add MIT KRB5 krb5kdc support MIT KRB5 krb5kdc differs from the Heimdal kdc. - The MIT kdc is named krb5kdc while the Heimdal one is named kdc. - krb5kdc -d flag has a different meaning. krb5kdc -d specifies a database name. While the Heimdal kdc uses the -d flag to daemonize it. krb5kdc automaticially daemonizes itself unless the -n flag is specified. We do this by looking at the name of the kdc program to determine if we assume it's a Heimdal kdc or the MIT krb5kdc. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50813 --- libexec/rc/rc.conf | 2 +- libexec/rc/rc.d/kdc | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index f88bd3919f8b..00f4b718bfad 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -326,7 +326,7 @@ resolv_enable="YES" # Enable resolv / resolvconf # kerberos. Do not run the admin daemons on slave servers # kdc_enable="NO" # Run a kerberos 5 KDC (or NO). -kdc_program="/usr/libexec/kdc" # path to kerberos 5 KDC +kdc_program="" # path to kerberos 5 KDC kdc_flags="" # Additional flags to the kerberos 5 KDC kdc_restart="NO" # Auto restart kdc on abnormal termination kdc_restart_delay="" # Auto restart delay seconds diff --git a/libexec/rc/rc.d/kdc b/libexec/rc/rc.d/kdc index 621129b20164..204b08f1e99c 100755 --- a/libexec/rc/rc.d/kdc +++ b/libexec/rc/rc.d/kdc @@ -20,7 +20,22 @@ set_rcvar_obsolete kerberos5_server_enable kdc_enable set_rcvar_obsolete kerberos5_server kdc_program set_rcvar_obsolete kerberos5_server_flags kdc_flags +default_kdc_programs='/usr/libexec/kdc /usr/libexec/kdc /usr/libexec/krb5kdc /usr/local/sbin/krb5kdc' + load_rc_config $name + +# XXX Remove the following block of code when Heimdal is removed +if [ -z "${kdc_program}" ]; then + for i in ${default_kdc_programs}; do + if [ -x "${i}" ]; then + kdc_program=${i} + break + fi + done +fi + +command="${kdc_program}" + if [ "${kdc_program}" = /usr/libexec/kdc -o \ "${kdc_program}" = /usr/local/libexec/kdc ]; then detach="--detach"