From nobody Wed Oct 08 01:53:44 2025 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 4chGJ86z26z69xX3; Wed, 08 Oct 2025 01:53:44 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chGJ86SX8z3g3J; Wed, 08 Oct 2025 01:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759888424; 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=FIoAMFidyX4jFR7JzlJ6rdt6krshz5Uf1pFoFYiVsmg=; b=KQJf96GvwTTXkccNrTq+pntU9pfbffXALeCNh8ngzwZeP9t1E3DEy20Lh++sbFhuAsepnh QFGC6r7uqbRcoTwPHvwqU27bjsTUS+L6iJxwNTEWyDV3C7IaoajJ+HwUJkhqtj2nUW3A93 krotrhvilNsdqHmsoVXenygcLhRNPkN1+EW/ixXo24fQEiXtKd7va9mY1ypvLJaIbyU0ZD /LM5zJxrjOkDHiCSHUH/8Tfe5FIoW0QcBWnbTRCVe2XdRYz+F3saog3ZLtiyUXbbD0gwNN 6Uyo2cHAojDdeAi9foeCdAZXR87RgASxtpfI72e2TYuy/Zmdzl09MNUzNgOP6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759888424; 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=FIoAMFidyX4jFR7JzlJ6rdt6krshz5Uf1pFoFYiVsmg=; b=CcCrgU1F/73aI0xOjlo6IquHqD39iy7PcknC02uRNbTfdY5Jt8zIk16pB1jIrg4B68BzzK hSjLuavTS/w5q+him/Nn2ii3bTnU7CwvsRnT334vku9K+rcs3aFPjdMnE9fTXoj4xC01TG NMFBAHbfpIDyIqYNgRwtgAMXQoe+OWd9PB4ODYrFh0wMcppfYCmdq3EbTw979JeAEGFSvw SBkMvgbw+INDDm6CkVJV0p0yn/0GpkAYd/2e8bHZr/z3gpJQRExHALHYJFYl6yAio8PwJB p2oFr6wzhxlj1/RJ4OkxUlEm2leOBGmWPz4+djkyekbWFro268zobIdgqht0Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759888424; a=rsa-sha256; cv=none; b=Qns+rI3pTuderoY2gvwOTGcIWZOlVXI87QY45KMMrmmeE+10TgmCtCXWn7qpFxN1DA4LpA 6EcEyqnz47Bm/OuPmw1RwWFrswHY2gXT88wbf7zViS3x0wpsj02uliDVKvC0MICD+uAXu0 IVtZh/6JjW3E+7zRAZ2qZG6/vXaV7QrBUOt5GDYwMBvdHCKMNNPUCHMnC+tSzu47mdyChy enluLoM+JFVmMDpH5rkKD4irWjRu3MIdXVPrRsRKFOyQxRi229tjS5zAvJF1/BWvR9ZhaO 0aqAhdwLOPu2h45vF4yWxK7DXugI7G1xk3ZY2uBNoUOwxMhUthsbsQ0sT7kibg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chGJ85nqpz199F; Wed, 08 Oct 2025 01:53:44 +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 5981riTK051059; Wed, 8 Oct 2025 01:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5981ri48051056; Wed, 8 Oct 2025 01:53:44 GMT (envelope-from git) Date: Wed, 8 Oct 2025 01:53:44 GMT Message-Id: <202510080153.5981ri48051056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 23fbea8cf2f3 - stable/15 - kadmin.8: Document the new dump -f flag 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 23fbea8cf2f360dd45cb69c98f6f2931fff3721e Auto-Submitted: auto-generated The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=23fbea8cf2f360dd45cb69c98f6f2931fff3721e commit 23fbea8cf2f360dd45cb69c98f6f2931fff3721e Author: Rick Macklem AuthorDate: 2025-10-05 21:06:26 +0000 Commit: Rick Macklem CommitDate: 2025-10-08 01:51:08 +0000 kadmin.8: Document the new dump -f flag Commit 5000d023a446 added a new flag to the dump option. This patch documents this new flag. This is a content change. Fixes: 5000d023a446 ("heimdal-kadmin: Add support for the -f dump option") (cherry picked from commit 03da141d59ae1da4e66974c466e2cb26f296e6df) --- crypto/heimdal/kadmin/kadmin.8 | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/kadmin/kadmin.8 b/crypto/heimdal/kadmin/kadmin.8 index bd2fd4e7363f..e4555cd529f4 100644 --- a/crypto/heimdal/kadmin/kadmin.8 +++ b/crypto/heimdal/kadmin/kadmin.8 @@ -31,7 +31,7 @@ .\" .\" $Id$ .\" -.Dd Feb 22, 2007 +.Dd October 5, 2025 .Dt KADMIN 8 .Os HEIMDAL .Sh NAME @@ -286,14 +286,39 @@ When running in local mode, the following commands can also be used: .Pp .Nm dump .Op Fl d | Fl Fl decrypt +.Op Fl f Ns Ar format | Fl Fl format= Ns Ar format .Op Ar dump-file .Bd -ragged -offset indent Writes the database in -.Dq human readable +.Dq machine readable text form to the specified file, or standard out. If the database is encrypted, the dump will also have encrypted keys, unless .Fl Fl decrypt is used. +.Pp +If +.Fl Fl format=MIT +is used then the dump will be in MIT format. +This option may be used if you require that all principal +passwords be changed after loading the dump into an MIT KDC database. +.Pp +If +.Fl Fl format= +is used, the +.Dq +should hold the master key for the +MIT KDC (usually a file called /var/db/krb5kdc/.k5.YOUR.REALM). +This will cause the keys to be re-encrypted in the MIT master +key as well as doing the dump in MIT format. +When this dump is loaded into the MIT KDC's database, +the principals that had at least one strong encryption type +key should work and any keytabs for those principals should still work. +The principcals with only weak encryption keys will require a +.Dq change_password +be done on the MIT KDC to get them working. +The +.Fl Fl decrypt +flag is meaningless for this case. .Ed .Pp .Nm init