From nobody Mon Apr 29 12:50:51 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 4VSjqb6jBTz5JG4q; Mon, 29 Apr 2024 12:50: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 4VSjqb3xLBz442l; Mon, 29 Apr 2024 12:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714395051; 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=I8j0XAk4bPlkyik3o/ThOXzmadWFVEVqCPYbDoneWik=; b=nSpJ7WOrHMw/IxyW7fflL5vfnrjIcMtVWIPnIYUa2eqMM0H8URi1rIhszXawzGtWURdgmV Cya2jN3kAU35wstPygOE2E7lSwbqIEmzYj4jkZrtlkvPM6JisTWUzirztW+4MSk0UTBWuk JtB75FVxsh+tT/Nv9zybtiUdSeM+6+Au3Y/tScALdeul0Zoloat0J3oP74U4RA8ntjDcBw p3Tf+Uze+UNDdOrBUH5Gwq1DZYeKnBmN6gE3PJGQddG485duIIApsKkT0tYfEWJ3vlXmBl /pEjQSc9ak0rV+bs8v0Up6b9VehWKm6T8eqvQNCoapu/AqDBFp45kXSalVcjbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714395051; a=rsa-sha256; cv=none; b=FnQ13YWQkBiQJEUNzQO/L/MWbXTpJ45L2BCKWOGn/hfSjerLjWsWaFR1fY9Lr34BqTY2sO Yjq7vb5Uvh2qr1tsdRv/FxZGEtCitlOZq/aM10+KDPaZ8Fg61Z9N7Iu+ew1WKj4hS2Dr1p pPQkq7W8CKZvHis67dVCYWu71DxlWa3qw+yWtrE7+kz8RkB8/ILVvR2TpSXFi71Q1MaujY 52f040AyBc7KfSBZ4x27Q1r1am7JESMvJsZ/csM1Q0ftf0qNL/GqOwzgiG3kaqK4gGmNvV 0WNjV+Cq3RD4vyhFLWQI82EdwT/cwnpOHTkXSo8vlY+afhUVhu+2+5pAwucnSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714395051; 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=I8j0XAk4bPlkyik3o/ThOXzmadWFVEVqCPYbDoneWik=; b=Dd+aoLG2YZXXQV2KuLFWZUZSpjZ9Y6gfJVb/Yrcjf5KH1rOaidWVqBApgNVionbZf160a1 9imH5SYOk/yvb1sWOjnoyK01yb7TSjJnwPtwGjGFD2gEmEvdw2ARTnA2EL/3TJ0JddOpIX UPtksJb5f+eNHD5xvM8ipCFbHvCfawVbH6Ny4JF5ZAt/jAwrW2z/1c+xv7yPzqKYsFDDVp Ku3vSb75Z8RbxuilqtUTTfwCms0907csGtOQSobuZu27cKAGXO5EEVXqs3IEKUrKMW+RHF zOXKvNYV/7YnnAtQ5uAg4N1TmngGUkGINlB2cUPkAokH54Fl3TFWluy/SyUGoQ== 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 4VSjqb3XdBz18ht; Mon, 29 Apr 2024 12:50: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 43TCopiK001170; Mon, 29 Apr 2024 12:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TCopWc001167; Mon, 29 Apr 2024 12:50:51 GMT (envelope-from git) Date: Mon, 29 Apr 2024 12:50:51 GMT Message-Id: <202404291250.43TCopWc001167@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: abc4b3088941 - stable/14 - kdc: Add restart option 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: abc4b3088941d772728c28146d466010f816ea66 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=abc4b3088941d772728c28146d466010f816ea66 commit abc4b3088941d772728c28146d466010f816ea66 Author: Cy Schubert AuthorDate: 2024-04-18 18:56:54 +0000 Commit: Cy Schubert CommitDate: 2024-04-29 12:50:19 +0000 kdc: Add restart option Add a new kdc_restart rc variable that manages kdc (or krb5kdc) under daemon(8). This automatically restarts the kdc should it fail, i.e. when it's configured to use LDAP as a backend and cannot connect to its LDAP directory. Set kdc_restart="YES" to auto restart kdc on abnormal termination. Set kdc_restart_delay="N" to the number of seconds to delay before restarting the kdc. The daemon(8) default seconds applies when not set. Reported by: Lexi Winter PR: 278395 Differential Revision: https://reviews.freebsd.org/D44898 (cherry picked from commit 9e248b7f645cdf05615a49cc15295df49b54d659) --- libexec/rc/rc.conf | 2 ++ libexec/rc/rc.d/kdc | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index f31efb4e2052..831ef202219c 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -329,6 +329,8 @@ resolv_enable="YES" # Enable resolv / resolvconf kdc_enable="NO" # Run a kerberos 5 KDC (or NO). kdc_program="/usr/libexec/kdc" # 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 kadmind_enable="NO" # Run kadmind (or NO) kadmind_program="/usr/libexec/kadmind" # path to kadmind kpasswdd_enable="NO" # Run kpasswdd (or NO) diff --git a/libexec/rc/rc.d/kdc b/libexec/rc/rc.d/kdc index c3059f261e09..a2d9f87f8e20 100755 --- a/libexec/rc/rc.d/kdc +++ b/libexec/rc/rc.d/kdc @@ -12,15 +12,40 @@ name=kdc desc="Kerberos 5 server" rcvar=${name}_enable +: ${kdc_restart:="NO"} +: ${kdc_restart_delay:=""} set_rcvar_obsolete kerberos5_server_enable kdc_enable set_rcvar_obsolete kerberos5_server kdc_program set_rcvar_obsolete kerberos5_server_flags kdc_flags - load_rc_config $name if [ "${kdc_program}" = /usr/libexec/kdc -o \ "${kdc_program}" = /usr/local/libexec/kdc ]; then - command_args="$command_args --detach" + detach="--detach" + flavor=heimdal +else + flavor=mit + unset detach fi + +case ${kdc_restart} in +[Yy][Ee][Ss]) + if [ "$flavor" = mit ]; then + detach=-n + else + unset detach + fi + case ${kdc_restart_delay} in + "") unset daemon_restart_delay;; + *) daemon_restart_delay="-R ${kdc_restart_delay}";; + esac + command_args="-r ${daemon_restart_delay} ${kdc_program} ${detach} ${command_args}" + kdc_program=/usr/sbin/daemon + ;; +*) + command_args="${detach} ${command_args}" + ;; +esac + run_rc_command "$1"