From patchwork Wed Mar 19 16:24:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40433 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1885F27BBE9; Wed, 19 Mar 2025 16:26:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0E4AC27BBE2 for ; Wed, 19 Mar 2025 16:26:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwFO-0005DI-TO; Wed, 19 Mar 2025 12:26:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwF8-0004ta-OL for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwF7-0000Mb-8E for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=180jCHE2qbVE4fSTgDGR2Kec8Dj1ciEwzE+xXe0n5mc=; b=tjpkKe0s91lQ7A5nZQhN8kRSx8Qq6oRc8dF/n8d7QdA/zpGBUZFpxO0emIYMQxAmVyWy48PfRAW5eFKytEee64QRgEBAsoYrWpiTs006X5mIH6GRO8Nb5Y2b4vmGyiAb/hE9wILZtNU5z12i9TR+4Eik9I0A3UFRKvn7bOUZvOQiv+v3qA0vaeqLlFA3bz2ERQcjOg7hnT4O0hKwaOZ3J3a6gvuToKrOFxqm68qURqjsTK3cpPO9OgjOhYyQIdewn7f3SqcUVtZKzubhx+jZeuLp1csHXkMj+/Rp8MjGEswjOxk+vLJzxmscolU++yOqnDoAInSYtJ1JVKXOIbPO8w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwF6-0007MD-0a for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 1/8] services: krb5-realm: Delete trailing whitespace. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:26:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240154028010 (code B ref 77001); Wed, 19 Mar 2025 16:26:07 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:25:40 +0000 Received: from localhost ([127.0.0.1]:52702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwEd-0007Hd-J3 for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:39 -0400 Received: from wolfsden.cz ([37.205.8.62]:48784) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwDz-00075K-61 for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:09 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id AFEF02997A2; Wed, 19 Mar 2025 16:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401496; bh=FEizIFwm0e/ozRgDbkjKjTbB3+H3s50d45/wrM37jys=; h=From:To:Cc:Subject:Date; b=KFzgJFQuyVagHvwRKIgorBi+SulkkX/hEBOCs7X1usQ5cuSCgoJ3AOranPl+oBeMt x9aYewqxTJA2nVHS4z/OajFtAExDtaZisgGKiL85FNqIOTpx8ZyDFThCIPi9HYcTdf IejIObBbs99qD9ZSas1uR5KyJ8ziDA66OEPigZGascpCOlMhdu6dEPnPecufP+BpSQ stx0XwgywDGjvXD8uTHtTPNQJLu2hF7W0BFG8g+KdDMBfiQ+txXoqkoFyRtKGmaf9m yu0HEoM+6ayVRMnW9WdZp603Gf+BYhr/BTjj1sA/6NHHyZdKJaMNmIOA+7NOqzNy2o d7K3SJfH/UgtKaYNHlI1OsP+/ukcWTLKABCKutTnTnp8fu3ERBKdTitctR+lY2jYbf f0Vm2gjTMmquaDFja9AhYcURCvLXuWWAZ9K5aF640M/vafC1D2ag8wMgsMH1ij04uf UlhECFvl2HWrI0SZ21one13zpAhkbpC15nsF+F9fRvUwt7G9cKFfUX7ZsdMHaewjJ3 WojDZrv+GirMnAaRZhYvj6C3RFVEzEVF37/x/vCBWhJ67eUIBkVm5B4XUo5G1J99iw SNcgRzZJPgvcnIguD4j7+aV9HWeLpcBX7eMNl/C4V6bvTaHSHGqnUS/0tMfgqn6Cai QWFo75SBfY3ZCez6rWbRnaFk= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 5794A298F6B; Wed, 19 Mar 2025 16:24:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401495; bh=FEizIFwm0e/ozRgDbkjKjTbB3+H3s50d45/wrM37jys=; h=From:To:Cc:Subject:Date; b=JY7yDZPloQ8aCkm+Selh5Rv6llIOe5bq537wrucIx4Nfaq6TLXkt362C57967HCw1 ArCn9CWgMR5ByVIao5yewK1yI84564ibEGaP1Ov/p+xqMkAx4Oo+fSoA3BnQVNJgmD 47brnZf3qp58kZ/XJYS7Pmg8HimYebGgpsMC890ZxoIHnPWqZ8h0GA/AHs+dwO5Q3A T1oIwyiICEXjG41GOHiOPPGnP8bqaK7x+f9wNOs5HKSVai2++9daiK5ik1kpDLJOKD X3kqKMpwRxK5GtUG8bg9KdkHtIfVI9aP1349KBUKy+CcwryJGDD2TKLQR+dy4pWpMz Ffv2lmNUav4zMjUxDgV8+NAYWbT38u2J4QOioobRmnCrud+vm1eq0sdrxTAeMJw8u5 lcsVd74c+D/TJUyQAXUbWkrSLZV7iZjo2vEvSQmJFGWloE1sJ7vEiM1uNcxqasDP4r 9cR2xDy+HNAAbdl2IB/5QTLp44ndL1LPP7G+Tew+WqZhP0c1g4UEqvaafOWPCkX3Wk fsooR28Oti0phMpFRq+2PYM36gb08lNi/66SE9gDmwdJTdK5ko17OFcsHTYINNQ3J8 krpQfPJzL8P5mzKOCyZ2hitXMd++tLZd+aqGOOa5F/vVDB0FdKtrYrJyw7L/8YsNtk 0zuDBl9fA/P8PwyXLL1ymWSA= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:27 +0100 Message-ID: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/kerberos.scm (krb5-realm): Delete trailing whitespace. Change-Id: I3e92d53b0910660aeed318015841ec0ca8892430 --- v2: Add copyright. gnu/services/kerberos.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.48.1 diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index a6f540a9b6..e93f4bc648 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -191,7 +192,7 @@ (define-configuration krb5-realm (master-kdc (string/unset unset-field) - "If an attempt to get credentials fails because of an invalid password, + "If an attempt to get credentials fails because of an invalid password, the client software will attempt to contact the master KDC.") (kpasswd-server From patchwork Wed Mar 19 16:24:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40432 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AE23827BBEB; Wed, 19 Mar 2025 16:26:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F1C827BBE9 for ; Wed, 19 Mar 2025 16:26:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwFN-00059R-VZ; Wed, 19 Mar 2025 12:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwF5-0004o2-In for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwF4-0000MN-G5 for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=bzFwlAUksERcvpmun5dmy6YrfP+WbXId5P0Rb0jot8s=; b=Q4aewtr3WQjDJueFLxOY+q1P0Y/KLi2CcBfDE542pUwDf9yYZYWmLHm6iItjVy1hO+Fp472ZO4vtqlb7S03NEuTFxI0V3DZ3QCIG0GH/b1A6PXkrsTLXTaNMki3IeqYY1VRKcfUcdYLDR375DYbYzpemclNJCxRbatxiFkl8tOETENGK7/ERNfcnbUkZJkGlkHCuNJmWUMAiqou+YhNXrutAFZ5LCbvZSLTDMndYLhMZHmLVsIdSya7+PpBHKgk9qF+Fo8039L3JXftpfiDbALbFijHLsnEEK57hhnfp4ehH7cMOBziymKrRor3be+pj81fr+IChrgJxxPODOpKpCw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwF3-0007Lh-U6 for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 2/8] services: krb5-realm: Unify style of documentation strings. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:26:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240151927736 (code B ref 77001); Wed, 19 Mar 2025 16:26:05 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:25:19 +0000 Received: from localhost ([127.0.0.1]:52693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwEI-0007DB-1s for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:18 -0400 Received: from wolfsden.cz ([37.205.8.62]:48798) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwDz-00075N-5a for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:01 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 2A6D3299245; Wed, 19 Mar 2025 16:24:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401497; bh=NfuMaR3+0UBwWNFjDKIw5wufrVkLU8GrSADKiQd2tW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EHyTMcBZRzqii/J9rxyARCgqAnusMTRsjhTiAegnrCBqr2tYGAzlYwe5QH9TwobsB eLh2rYxEu9Un29dqwmbNTb41uKqUZgU+BVy+vtS2l6Dg+NPGwtwc7zPMbX9XrMzYfy U4e5eDPmfP7Te4p7q7D+QTgSufnEvLbnYw+xojFftnvFGhhP/mqshmXxhoifnOLrTL IMTB/QD5d+pT1t5fxO39w3zHHMOEtZj5Sfen+9JAFHOqtclW5+gAcf3Rk9i1zX/2FN VWdMwP/cwYjjrJR8ce6Lb3oKz3/Y1sWh/t0cz1Xf8ZPnMdNAEv10Mxe5a3hUd+WhXG Y/iocvCa14oK8lwoJdUKPo0RcUnRdAkTF1nmspYJUXWxMiPsdOpW4WI8I0tvSZhdCj nDz9X6ua/NtdVvMzPPigT07Dr6pLv1EPujhNq8V1RNIrL04Jw9E8dOOi8F/MvV5wZK JG4gGu0358I6MzHlYzo4LpcZpGZLFa5BpradQbkT1rblOh66SjhqkNDAzdg0SWk5Zg lvwDH2NHEwg8ZNvDOFwDX+ZgCT6gmgucvBlMtr53DJ92W88YxIMRSmIceS36XWHWtP Z+4NwZ/hR9bU6Zo7PBdZHTX0L/o9X+2NwpFSMYiRXQFmxw4NI3UBsob6eSH/c9gcix AnZU8DLQfj48co+m3iFboLOA= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id C4215298767; Wed, 19 Mar 2025 16:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401496; bh=NfuMaR3+0UBwWNFjDKIw5wufrVkLU8GrSADKiQd2tW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c6O0XahwV7C3hcfM28I7xXwmk24oNJZVLxdwu41Hjq46F4SNacLqIX+6LQh1HY471 RcHTmwnM7B9V5xbDIiT5ARUSI4ty8MY1HYMQwawvV2/vflZfU6vngB6GxlOQdgWVAp nNoST97IchzdmzBOgPSodwAAa2YQuMJZOe9pZNBPurOa2Ib1VwJaK7kHxqH+nEiRnb seKT8lnD1Xuj6K6xT2PVBQhr3MlOXn6kO7Ht8Zlvi1bad6KCdWveLhmuLFeXG2NAML TrKB6DONc0pSf3h7q8h4PQUQsRW5zPg6SzwX8e6zqZVfzuqiJZVVAeXLchM6TGw3W1 nShwsCkdG+zZb/5fOOakduuolS0SYPg8pE/SH/84+I8u0hyRkQl060P2Ha4OGdbkWI 2Qtb0L+IiHs9gVsvUN9J5CbCsJDAaMf5PO4xxyjh8JLudaapvrjuGITQUvFc7CKQtj YYMSP59KoJ+T2CVuy5OPr1V6MsTk/YBosvGIJKIk/J2FMTkh578KmCzl/ln04Qu4u7 bo/r/qgitI2IWBqVAxBGvI16G4e2h5EJUu3682uWN+ezu1ExVbxUrQvyTpYHXOdaxH WaA2Tb6T2jo7XrEFG3VWBGyrwkM0TdIu55vSzSYQhDP0eUFHAQW9V8F0uscczu6p1o gyenC7XxNn2NCRRa1IjY8HII= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:28 +0100 Message-ID: <485a3d103e71d81c4502053bbe393042a91d4f02.1742401473.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> References: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/kerberos.scm (krb5-realm): Add trailing periods where missing. Remove double space. Change-Id: I5dc47326c598548075f13a5ec48c24a0886a9a69 --- gnu/services/kerberos.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index e93f4bc648..ee0deec2e4 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -215,7 +215,7 @@ (define-configuration krb5-realm (default-domain (string/unset unset-field) "The domain used to expand host names when translating Kerberos 4 service -principals to Kerberos 5 principals") +principals to Kerberos 5 principals.") (v4-instance-convert (free-form-fields '()) @@ -223,8 +223,8 @@ (define-configuration krb5-realm (v4-realm (string/unset unset-field) - "Used when the V4 realm name and the V5 realm name are not the same, but -still share the same principal names and passwords")) + "Used when the V4 realm name and the V5 realm name are not the same, but +still share the same principal names and passwords.")) From patchwork Wed Mar 19 16:24:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40435 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1847527BBEA; Wed, 19 Mar 2025 16:26:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E1E3427BBE2 for ; Wed, 19 Mar 2025 16:26:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwFT-0005Zj-Hn; Wed, 19 Mar 2025 12:26:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwF7-0004r3-JO for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:14 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwF5-0000MO-41 for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=DQAe6kYz7WtuJqrCe0b7bgj0I7sOJCkq5g1zGn5K8eE=; b=veT454XXrdBLiDNs7uJm3JPz7nqh+MeQ6XtrahgmaY5xhH1lujYt+3FhSuJvqZWO08N48lWbBlBy25zuNio0anYzkmxDifujurn/mJHRB0oDWT2z42t1ovRXiFo3IIVoE0tgmBjhmCuUMTYgoyLdpetsJ6LdqVXDrUn/HkQJvooDR96XY7iGJA4FX0VWa6oqq6e/clq5QuMy0xA9g8Q3pyZp58JVLsofg+bhSEiyojUrbRD+vcAUHGJYmF0L1khjqT2qzq/uDtZrehDL/vxdT4XyxL/SGfaWJXVY3XQKaSsmzrqw8MOSZBIwcg1YCXuTJyAl7VG3BfW4g3+LI1GcNw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwF4-0007Lr-S8 for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 3/8] services: krb5-realm: Add default-principal-flags field. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:26:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240153927996 (code B ref 77001); Wed, 19 Mar 2025 16:26:06 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:25:39 +0000 Received: from localhost ([127.0.0.1]:52696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwEZ-0007H3-2M for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:39 -0400 Received: from wolfsden.cz ([37.205.8.62]:48800) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwDz-00075P-FY for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:06 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9CEBF387FE7; Wed, 19 Mar 2025 16:24:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401497; bh=9dsUKkXRGPUcPFkwpov1axZg1+xzg9gyBITE3abNN34=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iamew77XDA61l95FoJZXBaqQdCy8ZnJJMysLvtlBode2X6eyrNAVbxIPRl0H535Ik Vwz+9vDXRl/7y6je6J1pJ3AuxW6+qDq7z5Cxp9YiPgJkwVuC/xmSkPxBVYwnksMA9F o2XPTQJmnqzKCMrShEMoCoGR2qMEe+ktybWGKHSGHlI7Qfs9FTqjfL8uKDOSTp061K i3jcD/uRjaFn10eLzo7UR5/D/DI1KvNb2scLoTsxLATVu9g+EW57/A2lUT8m1/a+aj /2Uv9CuUnpA16YaQu6XsZe1Y83Ju2zZMyHJ4uw7Mn/Gch+g2asVCArjFAZ4h1e0dfP e05Xf1ic60ZuhWM0PrE8WtRCIa7B18YuhU1HIEBJj1Xij19clFXiGettDCo4NabZgV 6RQIhsUFXAHQQC27e+6pDSn3UVA/SEKz1Jdw5x/sif3mrvGAh+32m0mhkiZJqHk0H4 qWmWsvdnqp7QpBk8HV9Zs7pc2Uyl9eQUegezMcyu9HCbJFz/TxE0aGVUe+Dp97bdYM JZTBAotFt9A9/phOX4vlWBV6BYKxfKC3V3mIgwWSBoSus5xkhYz1fmV0kNTpmrRWD4 RkkWtblOAsnE+CXiRwJJm4/2+jTFtdQjyRsxZ/9ZppAgV2+xo4jCdbDD8sEorRo/6q wNbkNFn0hUkUeU1oi8GZvnoE= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 47152387E71; Wed, 19 Mar 2025 16:24:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401497; bh=9dsUKkXRGPUcPFkwpov1axZg1+xzg9gyBITE3abNN34=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iamew77XDA61l95FoJZXBaqQdCy8ZnJJMysLvtlBode2X6eyrNAVbxIPRl0H535Ik Vwz+9vDXRl/7y6je6J1pJ3AuxW6+qDq7z5Cxp9YiPgJkwVuC/xmSkPxBVYwnksMA9F o2XPTQJmnqzKCMrShEMoCoGR2qMEe+ktybWGKHSGHlI7Qfs9FTqjfL8uKDOSTp061K i3jcD/uRjaFn10eLzo7UR5/D/DI1KvNb2scLoTsxLATVu9g+EW57/A2lUT8m1/a+aj /2Uv9CuUnpA16YaQu6XsZe1Y83Ju2zZMyHJ4uw7Mn/Gch+g2asVCArjFAZ4h1e0dfP e05Xf1ic60ZuhWM0PrE8WtRCIa7B18YuhU1HIEBJj1Xij19clFXiGettDCo4NabZgV 6RQIhsUFXAHQQC27e+6pDSn3UVA/SEKz1Jdw5x/sif3mrvGAh+32m0mhkiZJqHk0H4 qWmWsvdnqp7QpBk8HV9Zs7pc2Uyl9eQUegezMcyu9HCbJFz/TxE0aGVUe+Dp97bdYM JZTBAotFt9A9/phOX4vlWBV6BYKxfKC3V3mIgwWSBoSus5xkhYz1fmV0kNTpmrRWD4 RkkWtblOAsnE+CXiRwJJm4/2+jTFtdQjyRsxZ/9ZppAgV2+xo4jCdbDD8sEorRo/6q wNbkNFn0hUkUeU1oi8GZvnoE= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:29 +0100 Message-ID: <369678163bb94b49a39ca88319e3292dd5498626.1742401473.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> References: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/kerberos.scm (krb5-realm): Add default-principal-flags field. (serialize-comma-separated-string-list/unset, comma-separated-string-list?) (comma-separated-string-list/unset?): New procedures. Change-Id: Ie5f787ca0745dd6234ea4577b39a58d71e4fa6d2 --- gnu/services/kerberos.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index ee0deec2e4..1a7cc5774a 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -107,6 +107,19 @@ (define (space-separated-string-list? val) (define space-separated-string-list/unset? (predicate/unset space-separated-string-list?)) +(define (serialize-comma-separated-string-list/unset field-name val) + (unless (eq? val unset-field) + (serialize-field* field-name (string-join val ",")))) + +(define (comma-separated-string-list? val) + (and (list? val) + (and-map (lambda (x) + (and (string? x) (not (string-index x #\,)))) + val))) + +(define comma-separated-string-list/unset? + (predicate/unset comma-separated-string-list?)) + (define comma-separated-integer-list/unset? (predicate/unset (lambda (val) (and (list? val) @@ -199,6 +212,13 @@ (define-configuration krb5-realm (string/unset unset-field) "The server where password changes are performed.") + (default-principal-flags + (comma-separated-string-list/unset unset-field) + "Specifies the default attributes of principals created in this realm. The +format for this string is a list of strings, with '+' before each flag that +should be enabled and '-' before each flag that should be disabled. See the +manual page for details on available flags.") + (auth-to-local (free-form-fields '()) "Rules to map between principals and local users.") From patchwork Wed Mar 19 16:24:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40438 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B545927BBEA; Wed, 19 Mar 2025 16:27:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 080B327BBE2 for ; Wed, 19 Mar 2025 16:27:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwG1-0006cv-Gh; Wed, 19 Mar 2025 12:27:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwFz-0006cQ-Vc for guix-patches@gnu.org; Wed, 19 Mar 2025 12:27:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwFz-0000U9-GH for guix-patches@gnu.org; Wed, 19 Mar 2025 12:27:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=PvgFtekOh31rsCfv8EbLjsloL7PVfqqgkwGubWNxI/U=; b=VPbxN2A+jAnwkQOWyLLkRs5qOnVELB+kt63AQrmi9PUE4lPO13oyxlqUiSVkNtqxnUdyqjCRvg8Su4pSOXCibSrV3AzOvfEO5sZkRBXfX42tnOxiiN5T30/CVoglnlzfPzoacaiW5fhFfOPP/95CxyKlbBFBIooxRXOaLJ5WR+jokml9wkYPogC/O9KBluydrfqW7bzIUzGepPVLxGoPezDHsnkKMs45ukdIM6fGzKyNNPggKCw1JzsdTlkgEJON5F4N4DElSeoxnNHcyFmTOF+l6LBzdMfWoc2cWTZI0525goRSauJyLeEyelSGs56S7c4vQULF4NGdSsqV1XkOmw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwFz-0007VP-7l for guix-patches@gnu.org; Wed, 19 Mar 2025 12:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 4/8] services: krb5-configuration: Fix indentation. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240157128337 (code B ref 77001); Wed, 19 Mar 2025 16:27:03 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:26:11 +0000 Received: from localhost ([127.0.0.1]:52714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwF7-0007MZ-7O for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:26:10 -0400 Received: from wolfsden.cz ([37.205.8.62]:48808) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwDz-00075b-F0 for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:04 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 6A1282990DB; Wed, 19 Mar 2025 16:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401498; bh=RzBVock7RZs7GlggbMRq+94/jXKGSp9OiJ3f7Hy4T6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eV8MzxXVyd6rMFr4FEUiyYcgMWKWUPNXl7XVKcGE5vPDV6QXC4oUl0C1S3RQ5IYVm EvNiUnLYgmwoIjsXPD1/XPzE3v1FtU9Arf7L79sLYUHx+i6RwTy1fhxx6XLk9zHF0s MGnWq7ffkky4gM+/CB82jot72Ws07nGXTWlrFZ2oj/Tz6dCUVVphzZYIrhdF65EODI FkY/niBJ1fT3Au7a4PzDC0ErNLh86FiupNgWMHVRe2BQ1Zf7gcsD4WcrqDDaQMDraM f4TMJpjDCHAEyL+qStOXFftn2ad6ecrmgQvlB/K+DJlODjo1WEKsUaGALuceX1MIAH axAJliF11oW1B9Lq7Pnw4JT7j9uCFn3acUSJ+Gkw0MUt13+KadoibEivXhqmT6X86U pX0FjsCxY8iugoxVmFW8InPXgJAY89elyPOkajMJHTGk9hYoWfCeYrmmG3b+hGN0xl R0SedhlAU3M8ube5In3M4eZEDxNVzKkGNUH3VVFv2Gz+9Ohjg2BnWiDWpHr+y9kCRX pQ91jqbtFcS5u88mj5KXbBhDpKTRidfjw9G7hLkoZYXMvo8XOim45/tmHiaxTLkVTg E1nRmS/mXLWiWCBh37OjPntMC5xqs84uZT0S7mVFEiuJXCBl1/+1axtIK2fwm6+1M/ /n+0jVhtrMBjeD9TDoFzUqyI= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id C33D1386B78; Wed, 19 Mar 2025 16:24:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401497; bh=RzBVock7RZs7GlggbMRq+94/jXKGSp9OiJ3f7Hy4T6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=V2zE6eWj0MTI3vJVLkZcx9ydSE+96A58lI95BiiFPkQzBLNibKpUTRVRXYTZokGD4 6QypRQ0KUkSZU/YccItdaw1N6NBxMajc7y22YXh4kEY52KRiMvDssoiuMv+W+ylDXu rs2kk7wwVvOpY/psNakZNssgYMHc+H9quTAB0VWCSfLa36P/OWIF85Oe+8++aysWX/ bF14WxnoMdRSauLsmnnmH3bpub1nld1/F2S6fmyHD1y9rDja+oliQSLCM4tGNIJgBa bTKfju8HGc+KglxeoOEHSELoHAyT+NnQvhYjjfq3B+Ke27gVcaXnQ7gfxk7XImNSlT b8KRoM9sFAKtBND8vC7RZmlsvxsoJx+FrNptN5vO4b0p/D3hveWVo9UGEbagqeojce 3AX4NmEiKFL0ZQzsBfhVzBkljcVtoaZ5H4zvEQhRpg/fZIFLnj9VeETf221BwJ3kQo g1h1WhCsb5hcviK3MR5giWyUl2CmCE5HGvtDMgQbCz5eQ7U3MBugfnDWWspfxZCv2j Z5TqTdMZ5YPVnkeJO43u4BWYZWUbWZiwPdLYpQZ1dOCO81gWffhKMzNJl0nw/5bW8c AJVDCrGlx6tq8sP9RCEDJ4RfkGM6entKwtjEiOaQQWmuiOO1q4XNtBMAJunbaLG6l5 bZ93x4Y0QWaHNxxtCdEN0ViI= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:30 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> References: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/kerberos.scm (krb5-configuration): Adjust indentation and word wrapping. Change-Id: I629c106867e1d4d935b4bc33ae3489f4b0ee0bf5 --- gnu/services/kerberos.scm | 53 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index 1a7cc5774a..8ebcec3291 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -296,19 +296,19 @@ (define-configuration krb5-configuration (dns-canonicalize-hostname? (boolean/unset unset-field) - "Whether name lookups will be used to canonicalize host names for use in + "Whether name lookups will be used to canonicalize host names for use in service principal names.") (dns-lookup-kdc? (boolean/unset unset-field) - "Should DNS SRV records should be used to locate the KDCs and other servers + "Should DNS SRV records should be used to locate the KDCs and other servers not appearing in the realm specification") (err-fmt (string/unset unset-field) - "Custom error message formatting. If not #f error messages will be formatted -by substituting a normal error message for %M and an error code for %C in the -value.") + "Custom error message formatting. If not #f error messages will be +formatted by substituting a normal error message for %M and an error code for +%C in the value.") (forwardable? (boolean/unset unset-field) @@ -316,9 +316,9 @@ (define-configuration krb5-configuration (ignore-acceptor-hostname? (boolean/unset unset-field) - "When accepting GSSAPI or krb5 security contexts for host-based service -principals, ignore any hostname passed by the calling application, and allow -clients to authenticate to any service principal in the keytab matching the + "When accepting GSSAPI or krb5 security contexts for host-based service +principals, ignore any hostname passed by the calling application, and allow +clients to authenticate to any service principal in the keytab matching the service name and realm name.") (k5login-authoritative? @@ -328,23 +328,23 @@ (define-configuration krb5-configuration (k5login-directory (string/unset unset-field) - "If not #f, the library will look for a local user's @file{k5login} file -within the named directory (instead of the user's home directory), with a -file name corresponding to the local user name.") + "If not #f, the library will look for a local user's @file{k5login} file +within the named directory (instead of the user's home directory), with a file +name corresponding to the local user name.") (kcm-mach-service (string/unset unset-field) - "The name of the bootstrap service used to contact the KCM daemon for the + "The name of the bootstrap service used to contact the KCM daemon for the KCM credential cache type.") (kcm-socket (file-name unset-field) - "Path to the Unix domain socket used to access the KCM daemon for the KCM + "Path to the Unix domain socket used to access the KCM daemon for the KCM credential cache type.") (kdc-default-options (non-negative-integer/unset unset-field) - "Default KDC options (logored for multiple values) when requesting initial + "Default KDC options (logored for multiple values) when requesting initial tickets.") (kdc-timesync @@ -353,17 +353,18 @@ (define-configuration krb5-configuration (kdc-req-checksum-type (non-negative-integer/unset unset-field) - "The type of checksum to use for the KDC requests. Relevant only for DES + "The type of checksum to use for the KDC requests. Relevant only for DES keys") (noaddresses? (boolean/unset unset-field) - "If true, initial ticket requests will not be made with address restrictions. -This enables their use across NATs.") + "If true, initial ticket requests will not be made with address +restrictions. This enables their use across NATs.") (permitted-enctypes (space-separated-string-list/unset unset-field) - "All encryption types that are permitted for use in session key encryption.") + "All encryption types that are permitted for use in session key +encryption.") (plugin-base-dir (file-name unset-field) @@ -371,8 +372,8 @@ (define-configuration krb5-configuration (preferred-preauth-types (comma-separated-integer-list/unset unset-field) - "The preferred pre-authentication types which the client will attempt before -others.") + "The preferred pre-authentication types which the client will attempt +before others.") (proxiable? (boolean/unset unset-field) @@ -380,12 +381,12 @@ (define-configuration krb5-configuration (rdns? (boolean/unset unset-field) - "Should reverse DNS lookup be used in addition to forward name lookup to + "Should reverse DNS lookup be used in addition to forward name lookup to canonicalize host names for use in service principal names.") (realm-try-domains (integer/unset unset-field) - "Should a host's domain components should be used to determine the Kerberos + "Should a host's domain components should be used to determine the Kerberos realm of the host.") (renew-lifetime @@ -402,13 +403,13 @@ (define-configuration krb5-configuration (udp-preference-limit (non-negative-integer/unset unset-field) - "When sending messages to the KDC, the library will try using TCP -before UDP if the size of the message greater than this limit.") + "When sending messages to the KDC, the library will try using TCP before +UDP if the size of the message greater than this limit.") (verify-ap-rereq-nofail? (boolean/unset unset-field) - "If true, then attempts to verify initial credentials will fail if the client -machine does not have a keytab.") + "If true, then attempts to verify initial credentials will fail if the +client machine does not have a keytab.") (realms (realm-list '()) From patchwork Wed Mar 19 16:24:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40434 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3DAF627BBEA; Wed, 19 Mar 2025 16:26:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EDED927BBE2 for ; Wed, 19 Mar 2025 16:26:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwFP-0005Bf-QG; Wed, 19 Mar 2025 12:26:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwF5-0004pO-Sc for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwF5-0000MW-Ir for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=pIor5lkobrfJI7nCqSVygSX1voWvZTHYnowRSkbW4sA=; b=rkcfmMj4+M0NvwsXPyBIO17RjcaiQyzxuKoarm6685gGL6ZO+1wQPfK2/MQ1BtiRkjFirdz5C5QU2MxWRbbsvjr1wa0iLCvg3bI5pLE8gu3qUfcVLHLSBKlA0HZjEQ0pflySZ1dj6F73xgWzN42Zg8oHgJ7+n77Is4WLXTnt+mjHLiJkbuFjiXAyeTwJbl3V9oYDEsbEY7O5YaVuIRn2XTT/n0znblYgYxc2gbG21ym13CfS//QNotbkAeCP6OsIxMUP9g6XApP0iMmg0jl31EPkwWHvP2jhAQpWGF0uD7sCDpOovgpYo/0extkhs21jET62otGvf0i7wsrI/D6OHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwF5-0007M0-CD for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 5/8] services: krb5-configuration: Unify style of documentation strings. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:26:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240153928004 (code B ref 77001); Wed, 19 Mar 2025 16:26:07 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:25:39 +0000 Received: from localhost ([127.0.0.1]:52700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwEd-0007HV-5s for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:39 -0400 Received: from wolfsden.cz ([37.205.8.62]:48812) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwDz-00075g-NW for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:10 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id AD19929A00D; Wed, 19 Mar 2025 16:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401498; bh=nsYk8z1VDhUQ6VCgq5aHxIh6SKOy2nE2vRFqbGI/tDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O19EcxX+VJPW3qJBoTm/PV36QBXcPKZmNolNsec6s650BCaMFW+Ww5Ign9s8kC+ze i6Z7PA0okfbCuqUyxE0rA1K6dBKtxjNkVtOiixt0msfK/hEMQmdV2AmK9KGO7KI846 RLfMwQ6yDz6QZkLhR/KOQOBUZY44QaZ9MhHYgOAYKly/INULv1tAWKMYIjBk/qbBME +K/JlrlT5XCMPE2ds3lDgNOq0Co5h+HAmZlMC1ozyRpO8rE6zbAgdTf1RBYoTqkpvo TgSowHh2Nzk869lG4AFjYMzF/U7TbqiU9pXkr7jE6NuCAc8XOfasJD3Ie4Qo1pyb+5 rqNaVIs5G8Ov1uEse8il9H4eh50Rcwre0ggb8jqitXqRfNdn9zaU4uwfuAx6Ss6muw 2Veom3NDoXAKqvIig2yYFEYXF8DUxDbkj+x1DqFCz1JbJ838OO/Jep+E6AfTpB+/wC 7jV96PfF4QvTDCvaL/tJmVbVNaS74Hs5GfPElBwML3URgVOp1XIpZdWOI7e6jDqwYv LiYGz0EjBbdGs1sezUYgLsSSuHCcjWnaCBiYwRtKfMWWHuIqCw/lV5RM7P+36opSLI CHco2gZ2xN4S0uaTLNGr2bzDI0nX0K+855R5PnQoPimSKCv6DzgUOrr2n5CZ8rEGx4 znIbw1UiLYAFQKkQ6o2jZd5s= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 4CD82299427; Wed, 19 Mar 2025 16:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401498; bh=nsYk8z1VDhUQ6VCgq5aHxIh6SKOy2nE2vRFqbGI/tDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O19EcxX+VJPW3qJBoTm/PV36QBXcPKZmNolNsec6s650BCaMFW+Ww5Ign9s8kC+ze i6Z7PA0okfbCuqUyxE0rA1K6dBKtxjNkVtOiixt0msfK/hEMQmdV2AmK9KGO7KI846 RLfMwQ6yDz6QZkLhR/KOQOBUZY44QaZ9MhHYgOAYKly/INULv1tAWKMYIjBk/qbBME +K/JlrlT5XCMPE2ds3lDgNOq0Co5h+HAmZlMC1ozyRpO8rE6zbAgdTf1RBYoTqkpvo TgSowHh2Nzk869lG4AFjYMzF/U7TbqiU9pXkr7jE6NuCAc8XOfasJD3Ie4Qo1pyb+5 rqNaVIs5G8Ov1uEse8il9H4eh50Rcwre0ggb8jqitXqRfNdn9zaU4uwfuAx6Ss6muw 2Veom3NDoXAKqvIig2yYFEYXF8DUxDbkj+x1DqFCz1JbJ838OO/Jep+E6AfTpB+/wC 7jV96PfF4QvTDCvaL/tJmVbVNaS74Hs5GfPElBwML3URgVOp1XIpZdWOI7e6jDqwYv LiYGz0EjBbdGs1sezUYgLsSSuHCcjWnaCBiYwRtKfMWWHuIqCw/lV5RM7P+36opSLI CHco2gZ2xN4S0uaTLNGr2bzDI0nX0K+855R5PnQoPimSKCv6DzgUOrr2n5CZ8rEGx4 znIbw1UiLYAFQKkQ6o2jZd5s= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:31 +0100 Message-ID: <61be58313ebc960e5aa3f87963668473fa4f1c52.1742401473.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> References: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/kerberos.scm (krb5-configuration): Add trailing periods where missing. Add double space. Add @file. Change-Id: Id2d985df1e55566cb62f7355c2e4f0ca7d9924f2 --- gnu/services/kerberos.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index 8ebcec3291..5ac3cd1830 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -302,11 +302,11 @@ (define-configuration krb5-configuration (dns-lookup-kdc? (boolean/unset unset-field) "Should DNS SRV records should be used to locate the KDCs and other servers -not appearing in the realm specification") +not appearing in the realm specification.") (err-fmt (string/unset unset-field) - "Custom error message formatting. If not #f error messages will be + "Custom error message formatting. If not #f error messages will be formatted by substituting a normal error message for %M and an error code for %C in the value.") @@ -324,7 +324,7 @@ (define-configuration krb5-configuration (k5login-authoritative? (boolean/unset unset-field) "If this flag is true, principals must be listed in a local user's k5login -file to be granted login access, if a ~/.k5login file exists.") +file to be granted login access, if a @file{~/.k5login} file exists.") (k5login-directory (string/unset unset-field) @@ -353,8 +353,8 @@ (define-configuration krb5-configuration (kdc-req-checksum-type (non-negative-integer/unset unset-field) - "The type of checksum to use for the KDC requests. Relevant only for DES -keys") + "The type of checksum to use for the KDC requests. Relevant only for DES +keys.") (noaddresses? (boolean/unset unset-field) From patchwork Wed Mar 19 16:24:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40437 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8B16427BBE9; Wed, 19 Mar 2025 16:26:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CFD8B27BBE2 for ; Wed, 19 Mar 2025 16:26:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwFR-0005QG-As; Wed, 19 Mar 2025 12:26:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwF7-0004r6-7Z for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwF6-0000Mg-Tn for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=M0MRuAp5FqLKT6rzRFz/5DnMuHtrjvhuTuiVJZfELIw=; b=vXJ1FP5TT7MTOGr56a44dq7hBxdXqnVGrUTwg0V+EtlaHHz7RH4e33vB0xHM4XA4xtcWxEuKqovED//O30eOThSREroXrPnvE9S5xFLhM96s6ww6ACv5PVAleVaIarFV+G1cMXTaLBFiOpKWcsDYh3WxfLM2bS4Bv+Bi+GUQbEE02gcT9JSBoEn9Smj8vS0W8s7iHCrkCffUXY/dMAeBVOQdMJ8HbUNhOSRbMPlncikyGw3pdmfPUM5wb+7OfzMip8w5ILeC1kM+f/fo3Tp+DC5sytvmDWhpDtJ5qopcWlkGLfNKTkI4EloSpj2nRbI7njLLSS5hko7fZJSbEP1OjQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwF6-0007MP-Mp for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 6/8] services: krb5-configuration: Add dns-lookup-realm? field. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:26:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240154028019 (code B ref 77001); Wed, 19 Mar 2025 16:26:08 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:25:40 +0000 Received: from localhost ([127.0.0.1]:52705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwEe-0007Hp-5G for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:40 -0400 Received: from wolfsden.cz ([37.205.8.62]:48816) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwE2-00076M-Vb for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:09 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id C17E5298CC9; Wed, 19 Mar 2025 16:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401499; bh=DJY6xLf42+o+Pc05pIjTUu66aYVSMIqHe+ZJzDckpWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kCdbZeZXqoKygih6N0KjGnqSPHWCYpQ/XoZlamMcmHIeXnKyrJ8qfBbqh62XsXMjq Btg018lxWpmckuv7/SoMLO1BtLoywCPk8fFQABQqbvo6pXKKo90QCe0x8sKQGiHZDA 9oXbYFxSzoQ+ljVAQvNRruM3iuE/7/0DDCxenSb3g6LoZtSILlx2cpE8FSQ/jQUPb3 jLuEkrwRXWedRpfXQzaDtdKxyYgaVbpNUhyhz4Xxjf3GqvhevL3APRphgMYfl9QO10 xi2uA5KdpsiTnUtMus/lMj3Yq657OwP6aPelr+mCfICdz8JI70Swr566mNvNfVU4gs 4Z25R3QKy8reDbxNI7ktMNvzZJbRwufU1tlfl4T3fQAUxgzaRt/en43va6VOH1lT+K Ncuwy6YkARB1hLY94IXXcT4Y3ymkkhwCB+oKlPBGy+iFrO14hTYH7ySOncRxN6Gdn8 uYnqh7ibsjTe4P5WntFurSCyWY1FbO4XY+5TxpmYQiz8yRADG68kxdkVCeHVIMkTvu dciWH47GtoTAI4W4zGXxh2yY1lflUkq3O32m8htDDPMjkaApqVqzr1DCjyWtSZHSJV DFLvJLajPl0YcV7LWAU0YkLg0WrxPvce8UcLlfTA00ffG7xdl7w952e/7+xjBrXFZJ dXuP/+eMeBF+zCsWr/Xo9kXI= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id CAB9E29A202; Wed, 19 Mar 2025 16:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401498; bh=DJY6xLf42+o+Pc05pIjTUu66aYVSMIqHe+ZJzDckpWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=th1G3e3nHvQ60SIiyNtuAoWMvImTgDbwcDa3HxpR/vme//vH2ceCqWgL39mjeavYh u/SNjnQUR65bPFDY3Zg5TYqZc4gZXQEVcIm7jpqnBiD/eFS+xhi6cGvkk5nyNiQMxZ WefjvP+dUBg06/P/o4Pldo8y91DGvJYMymrjV0Sr9wnCcaMYzmjO/Z8KSiO/rSYn+J r8DJ322bMggQareGJm/CmKsoZwI0W3T4Nytfhb/J8lZXPXE0pk1oHdkOKGur8J/yJJ AnwAbdUq/NgyEvE4eQx9oTO+4gVacSDFqitBhjXXsjZ281lw6jtcKan0SfOaFJ8Y5x H1iwKiYZRCRp9Tyk+gZpjPPAPkV2LOP5GxoY129//JaMnaq46jRcZBwrzYFzh4Y+iM JlX4Db63A+7e45wLzfGU+NjSz0b9eK+oHluhq79Hucxg3C9xaTGD0vxICxyw5wL3tT 3EyCe6BzgQEZKOSyeShXe76pGtnyN8QKFouzSSiJTB7GsYPwGQzZLFFu7x1vd5PdGd 9bMM08ljiLnwL3Be5rG1SKhgdME/P6vGR1KDKogEWGUuhxINvX8qPUo94eWXhziQX8 ZcWaFExLLmj2vhqKvZFeEcGAAC+6IdA0Cson0PkKpRjt9VR7CiWZnMYfmxlnoP17fF FKbEH+NWSgMZkruIZ/NcAchg= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:32 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> References: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/kerberos.scm (krb5-configuration): Add dns-lookup-realm? field. Change-Id: Ibb92da1d4330b62225bdd9fd2a8573035f15f590 --- gnu/services/kerberos.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index 5ac3cd1830..de85b43223 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -299,6 +299,10 @@ (define-configuration krb5-configuration "Whether name lookups will be used to canonicalize host names for use in service principal names.") + (dns-lookup-realm? + (boolean/unset unset-field) + "Should the Kerberos realm of a host be determined by DNS TXT records?") + (dns-lookup-kdc? (boolean/unset unset-field) "Should DNS SRV records should be used to locate the KDCs and other servers From patchwork Wed Mar 19 16:24:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40436 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CB60227BBEA; Wed, 19 Mar 2025 16:26:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6E53927BBE2 for ; Wed, 19 Mar 2025 16:26:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwFS-0005V1-7t; Wed, 19 Mar 2025 12:26:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwF7-0004rm-P8 for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwF7-0000Ml-CL for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=169A5Vxt19NYqhf409mf3D1nkYCH/LakMK8eeVaTnU0=; b=FhhFcZFqxgDPrhphC44pptSwptvPG/Nrv6wV5Y8EpbMwP4YXgkyNEFijETnd2QTwq2eIb3i4qNsXYWFu50WlaQewJP7/OMF27vJf2MrPjYxNFwdDSve70FsDXDIhHvcO+IB8hhBjXTmyFgkMNGK9LoX4I5q0Q7RsrVD7PpIjAfyR/h1LhGM8EMNA2uyPIgskcDq5rrghdXU/z3pnsoEhNBHQgl1ZOeR/ziEZOiTJS+Z9FP9SWaRXNCwlxFKtbmjuHlH9ea28ko4SB0Jp3NHjjIxu/Nf8N61ZIvEsWVfy3UtnvyboZy6IpTtt2OTUMmgA7k0fSoMbUWBefROgEOpj2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwF7-0007MX-5l for guix-patches@gnu.org; Wed, 19 Mar 2025 12:26:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 7/8] services: kerberos: Fix order of definitions. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:26:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240154128038 (code B ref 77001); Wed, 19 Mar 2025 16:26:09 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:25:41 +0000 Received: from localhost ([127.0.0.1]:52707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwEe-0007Hr-Dz for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:41 -0400 Received: from wolfsden.cz ([37.205.8.62]:48826) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwE2-00076O-Va for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:10 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 00321299892; Wed, 19 Mar 2025 16:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401500; bh=DFfDqs1er3Xivg5lqdjy7KsvstcGp413/HJ7AOR+hoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Fan+tOilvgk+fFCcJ8ntMHk8fI0ni36QwCf0AbfFLlGOGL1Z7ccbQnVdB3ItojYFB Q1dIrFHgpK1v8D8DF9D4cYC0fonD5HUr2to1oDmuOZCLZRwvemtgVo68SdLkYUhah/ xJtUBryDCu2d3Wb907qXywGlNLnLdqPEPFC4/Hqc/O/Ha8kY5IM4BwIltYj/X+xdcJ FNTkvjZVKztWxCpvnYaRauLPi2CX13U3I/KCZi6lrGe8Qp+yaxCaWqLwqZLKZy9o+p A1YiuC0woNUuNVLIhnuUKz9LwgXuv3X13y9h7IMSg1i7BWoJcq/J8BLd9yiTm/jC2o nWNZdEB3LUwNONuyanANdHdZtvpUtf170D2fjjZQwHsUCPBy+6l2uWDVA12cBBdetK odLuLuQd7eFot0bcWhEB86kFhDbrOwBkfZYzGTwUIZyBJciSKrryVnL89nrKVrJLaC LurK/KuIxpnrwL+s0Sz1Bzu7s8apgv0asrN/35wHcTWPwO/JmrBiKhXGYniDW71L0E eLsclkzT8y8Lu0V4QPVIi+eHBr8iNuLIE9pA99VKEe5KRmzmV4wnJTT3vh4CqaAe56 ker/IesQKvy5NWElUT0/V0Hifuxx4+iGyeJ2XyZCxlzRgGDoEzm//EecyBiw4NGTx3 g5I51VDu2/oOviwE56Pzr84Y= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 52E1529876B; Wed, 19 Mar 2025 16:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401499; bh=DFfDqs1er3Xivg5lqdjy7KsvstcGp413/HJ7AOR+hoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IFvRmjOgNfLsTDy+lI1z2B75ZGZVxk/rLrTlQdkm7RO6Fqa0huTYXnpQek0wCNZu4 VL6NWtXOWTqucqDrh/kjEYp5dSbwPUe3ASzI7N5x0Exuym8+uBmu02YuTLVtDa8i0p Iq3XuPfTHzLyxAYd9A/VNBB844PWL9YxobfG8Y2vQvQ23S3cKce4Xv3yYSjdV+2uIX PIU+x193xuZ0gUCPxphwqvEuxwLLEZvaoxdwFBpfD5TWn7ed+LuL1v3Hs+xXEhVtlA LzH6XO4MRLrpWncGwnpjm2RSQDYcBShw8eGiBkuJp7Y90x640KMSATDKiGVQpsEhUJ Z9MGPCqCj5Nuo9c0V45GqTSr3cNCqG6esadiEu7FKlY+qduYx2jDWIFlXYrvqYZBWc 8UU2RsI2jIhAVssY3R34s09CgAe/W5yE7lNb74aJ1V/dXNY6PbRvi1UyDQJAH6ooEm XsRzEfoRdofvySp3uyyuTXEB3KxLyr1PD/DcCpszFnkZ1eE+s03LWP2c/pxYGfMsiv 7WDSOC5ZW/jn3odhbEtE40K/clV6eNUl1eqQWMF6g4ux3WJRWgpcis1NSRMKYwwj3B L9frXoE6UkQDYqO30inBzst0tVFdd6yIRtgeBWAJbU7avs5RGdgH+0E4jYuql1iWyQ G9CRuKnH6i+Lv9+IxLB3pMTg= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:33 +0100 Message-ID: <0933aa1105d60f052915f78a2b5ae5e50966de41.1742401473.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> References: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Generating the configuration file would error out with error stating: Wrong type to apply: # Moving the procedures below the respective define-configuration fixes that. * gnu/services/kerberos.scm (realm-list?, serialize-realm-list): Move below define-configuration for krb5-realm. Change-Id: I6a520a92cdc3c42d3916cdf33d427dadc531e7d1 --- gnu/services/kerberos.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index de85b43223..fcb0ac1ab4 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -170,23 +170,6 @@ (define (serialize-free-form-fields field-name val) (define non-negative-integer/unset? (predicate/unset non-negative-integer?)) -(define (realm-list? val) - (and (list? val) - (and-map (lambda (x) (krb5-realm? x)) val))) - -(define (serialize-realm-list field-name val) - (format #t "\n[~a]\n" field-name) - (for-each (lambda (realm) - (format #t "\n~a = {\n" (krb5-realm-name realm)) - (for-each (lambda (field) - (unless (eq? 'name (configuration-field-name field)) - ((configuration-field-serializer field) - (configuration-field-name field) - ((configuration-field-getter field) - realm)))) krb5-realm-fields) - - (format #t "}\n")) val)) - ;; For a more detailed explanation of these fields see man 5 krb5.conf @@ -246,6 +229,23 @@ (define-configuration krb5-realm "Used when the V4 realm name and the V5 realm name are not the same, but still share the same principal names and passwords.")) +(define (realm-list? val) + (and (list? val) + (and-map (lambda (x) (krb5-realm? x)) val))) + +(define (serialize-realm-list field-name val) + (format #t "\n[~a]\n" field-name) + (for-each (lambda (realm) + (format #t "\n~a = {\n" (krb5-realm-name realm)) + (for-each (lambda (field) + (unless (eq? 'name (configuration-field-name field)) + ((configuration-field-serializer field) + (configuration-field-name field) + ((configuration-field-getter field) + realm)))) krb5-realm-fields) + + (format #t "}\n")) val)) + ;; For a more detailed explanation of these fields see man 5 krb5.conf From patchwork Wed Mar 19 16:24:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40439 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ABCCC27BBE9; Wed, 19 Mar 2025 16:27:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B9B827BBE2 for ; Wed, 19 Mar 2025 16:27:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuwG6-0006dB-J3; Wed, 19 Mar 2025 12:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuwG1-0006cw-L6 for guix-patches@gnu.org; Wed, 19 Mar 2025 12:27:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuwG0-0000UT-HV; Wed, 19 Mar 2025 12:27:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=lTXfkocgkeKK3Ub6c9gYAPqqOyzfmuWvO0E2T7qDEhA=; b=WCAt1mSD2nsMgNicUL15xH8xSh7kS/lURKVeCf/ADhxOtUSIHYNyRXQQ2ajCDPLOQOHj1TqDI/oOnM6coMuPGu2F2OCSYyFjT6TARAJvAV/yHoxm2R1UMlt4dWS/K587d6o7VHIFoy7TdlYOGVj/0l26s3nLNa3wyNnJvW5onPLJSfZe5Svz23scQKrW+DA5gLcJ1ZZbz7qYgrrhXU7dR29uakzHP+wQPwrj7q5fXcCl0qcRZ+ROF+4e/Yi6FVbs3rnZ1AkRPtJyHn4GfVNRo/AYCE22U8QEQ186uveK9Rrn6vgrh+MbzD2QATXo78gYjaZHFvpoqRc+sGNnNrAfVg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuwG0-0007Vf-8z; Wed, 19 Mar 2025 12:27:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77001] [PATCH v2 8/8] services: krb5-service-type: Support launching KDC daemon. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 19 Mar 2025 16:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77001@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 77001-submit@debbugs.gnu.org id=B77001.174240157228350 (code B ref 77001); Wed, 19 Mar 2025 16:27:04 +0000 Received: (at 77001) by debbugs.gnu.org; 19 Mar 2025 16:26:12 +0000 Received: from localhost ([127.0.0.1]:52717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuwF8-0007N0-QM for submit@debbugs.gnu.org; Wed, 19 Mar 2025 12:26:12 -0400 Received: from wolfsden.cz ([37.205.8.62]:51406) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tuwE5-000778-LA for 77001@debbugs.gnu.org; Wed, 19 Mar 2025 12:25:13 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id B0B502984F4; Wed, 19 Mar 2025 16:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401500; bh=Oi6kYlstAyOW5qeycWYOh3FxtfPxgyo/stGUtDIjOig=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oIjM82ytfFNFfKqMZ0u0IlKtgi8f4v/Sn6MilwU86e9d7z4QFmnNhbAWmQ+PJVUCK f2mg48DxUGpvJwI8x1Mm3o4JuMvON9iuypsl0y8Yp0hoQUkleprmXO6otRabH7ABJL /whHfLjUivP0mpXziwuk+qFl3UhQuT2SDQuIpVrGhVDB2bYzI1/xpuqN0KyTmbkwsh ZbNrMhzulPUtK5jOIOYvBrNdLxMauBP7wl/xs1OJWmV+M4E0agg3S2w1vw0o9AfX64 MJvSVineBnoDC4RBHJAIDQoZ44l39BIhUpyhOXZ/keEtOTI6u1ykYTk/aEyg3+Yxe3 SSVFNTVzmaIEewFM0PtcwSDCYj+5RLstg+EEFsckWUuBBV1OHzH8u/KDIjsVdIjljU 4kQ4LEoHup3zDsEkzWdJTSUbo4LMCY96IOUfCmik7+Uj7UeBeD3ISlaPpt8SqLQCUC NM5oDFMoPsafPYAYZqWkoj+UT3bYYtVUOBgMikjtIf2fdLFNVvqSsXI6v7rN5picUS kb2UsecYWlhG4WvS71JkMkZZllgM4vc5VZT5Oq2lOkZ9AL3f8TzSVV6iTfuqEhjwwT 8cPRX9tkg5KQRItCeIwH2PEpo+ivxBdPUh4R3JELpd2lPU82D33MXfpWfnZfVKvic/ ZB7ffeW5R4Wz5PAHFDJpjxmI= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id D8A24299D16; Wed, 19 Mar 2025 16:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742401499; bh=Oi6kYlstAyOW5qeycWYOh3FxtfPxgyo/stGUtDIjOig=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d4SxaFAhgmah4uMB1P3drn4clLDjQL22c1QF5BRwe2RZTSMOlL+Kpif8zCO5IR/Fw Ln14Hred+AHGx48Kev8lBc/zTZDfuS8EJ5xqwV2Qnj46okSETWosZ8WsdCrjvNEQiK t2lev6gUheTbi7UZmqXRcvoRyx3s9gASW++rI4yEnUmuBXIx7zLRCnF+oYs3FkJESk w/QvVJ3umABzXSkpaF5qugWflIehrQH5ndCv3zcnocu60B7x1mBSO0CwzdH1WQA2C1 5TaFYO+cpjNtUEFNr4woeUg7lO+2eO9Q21LIyXryI/56nvQH36zv4azphv1F5PAHkB zFdzh348TtvU2hk42Eq+sW2Mj9I+jw+5hlZUOhazAuX6978OORITKBVTmVicSCngyR Tde3uXii6wy5LWQH+6mLmpz0RQXSVbY+az2IDz7huKllKWMihMnRqCno6AKGcYCJXQ iVZlQ8WsnhMUfPc+pQPSplASI4FAEhOR1g7rCBolln2YPQUhCMXWGt/ba90Mh3PphE 1Y4SR1/AH5UgwXNCiEIt3UvfcWnsgGw6uchLEOcxFZqm+dGkXpjJ+hYQKR0yNxC4ub a+A8uaBi5PQXfljRSjXbewWcKRaPoMAmgy/OYAsCExaiPanblzWnwwfvdSVULwpNtD aZ3LuwWs0hZTJg49nrJ7fqVw= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 19 Mar 2025 17:24:34 +0100 Message-ID: <518d2488c89ccaf12e0cb1d491b6d66c1bdde925.1742401473.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> References: <43cc10a6e9e4f8359465adcd73ba59e9404012ba.1742401473.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/kerberos.scm (krb5-configuration): Add krb5, kdc-shepherd-service? fields. (krb5-activation, krb5-shepherd-services): New procedures. (krb5-service-type): Use them. Change-Id: I091ae2a6ef25f5ce95123c29588749483954c2ac Reviewed-by: Maxim Cournoyer --- doc/guix.texi | 12 ++++++----- gnu/services/kerberos.scm | 43 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index fe43ed2504..939683277b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32135,11 +32135,13 @@ Kerberos Services @subsubheading Krb5 Service -Programs using a Kerberos client library normally -expect a configuration file in @file{/etc/krb5.conf}. -This service generates such a file from a definition provided in the -operating system declaration. -It does not cause any daemon to be started. +Programs using a Kerberos client library normally expect a configuration +file in @file{/etc/krb5.conf}. This service generates such a file from +a definition provided in the operating system declaration. + +When @code{kdc-shepherd-service?} is set to @code{#t}, a shepherd +service for @acronym{KDC, Key Distribution Center} is created. +Otherwise no daemons are started. No ``keytab'' files are provided by this service---you must explicitly create them. This service is known to work with the MIT client library, @code{mit-krb5}. diff --git a/gnu/services/kerberos.scm b/gnu/services/kerberos.scm index fcb0ac1ab4..a721cf3be5 100644 --- a/gnu/services/kerberos.scm +++ b/gnu/services/kerberos.scm @@ -18,10 +18,13 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu services kerberos) + #:use-module (gnu packages kerberos) #:use-module (gnu services) #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) #:use-module (gnu system pam) #:use-module (guix gexp) + #:use-module (guix packages) #:use-module (guix records) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -417,7 +420,16 @@ (define-configuration krb5-configuration (realms (realm-list '()) - "The list of realms which clients may access.")) + "The list of realms which clients may access.") + + (krb5 + (package mit-krb5) + "The package to use for @command{krb5kdc}.") + + (kdc-shepherd-service? + (boolean #f) + "Whether to generate a shepherd service for the @acronym{KDC, Key +Distribution Center} daemon." empty-serializer)) (define (krb5-configuration-file config) @@ -432,15 +444,40 @@ (define (krb5-configuration-file config) (define (krb5-etc-service config) (list `("krb5.conf" ,(krb5-configuration-file config)))) +(define (krb5-activation config) + (if (krb5-configuration-kdc-shepherd-service? config) + #~(begin + (use-modules (guix build utils)) + (mkdir-p "/var/krb5kdc")) + #~#t)) + +(define (krb5-shepherd-services config) + (match-record config + (krb5 kdc-shepherd-service?) + (if kdc-shepherd-service? + (list + (shepherd-service + (documentation "Run a krb5kdc daemon.") + (provision '(krb5kdc)) + (requirement '(user-processes)) + (start #~(make-forkexec-constructor + '(#$(file-append krb5 "/sbin/krb5kdc") "-n"))) + (stop #~(make-kill-destructor)))) + '()))) + (define krb5-service-type (service-type (name 'krb5) (extensions (list (service-extension etc-service-type - krb5-etc-service))) + krb5-etc-service) + (service-extension activation-service-type + krb5-activation) + (service-extension shepherd-root-service-type + krb5-shepherd-services))) (description "Programs using a Kerberos client library normally expect a configuration file in @file{/etc/krb5.conf}. This service -generates such a file. It does not cause any daemon to be started."))) +generates such a file and (optionally) a shepherd service to run a daemon.")))