[28730] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.11]: Correct docs for "kdb5_util load" switches
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Feb 6 17:30:11 2015
Date: Fri, 6 Feb 2015 17:26:48 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201502062226.t16MQmtN024749@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/2bfca3aabec77462d770c6942be09a2934bdf45d
commit 2bfca3aabec77462d770c6942be09a2934bdf45d
Author: Jeff D'Angelo <jcd@psu.edu>
Date: Fri Feb 28 09:47:30 2014 -0500
Correct docs for "kdb5_util load" switches
Remove obsolete parenthetical statement in the description of the
"-update" switch to "kdb5_util load". Using the "-update" flag to
load a second dump made using the "-ov" switch is no longer necessary
now that the "-r13" format is the default. Add statement that the
"-b7" dump format was the default for versions prior to 1.2.2 (to
match the statement from "dump" section).
[tlyu@mit.edu: commit message]
(cherry picked from commit 2d0f2fa48df1ea81363de5c78ab7e8cf1ab6d214)
ticket: 8085 (new)
version_fixed: 1.11.6
status: resolved
doc/admin/admin_commands/kdb5_util.rst | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/doc/admin/admin_commands/kdb5_util.rst b/doc/admin/admin_commands/kdb5_util.rst
index 99bac52..055e251 100644
--- a/doc/admin/admin_commands/kdb5_util.rst
+++ b/doc/admin/admin_commands/kdb5_util.rst
@@ -220,7 +220,8 @@ Options:
**-b7**
requires the database to be in the Kerberos 5 Beta 7 format
- ("kdb5_util load_dump version 4").
+ ("kdb5_util load_dump version 4"). This was the dump format
+ produced on releases prior to 1.2.2.
**-ov**
requires the database to be in "ovsec_adm_import" format. Must be
@@ -248,10 +249,7 @@ Options:
**-update**
records from the dump file are added to or updated in the existing
- database. (This is useful in conjunction with an ovsec_adm_export
- format dump if you want to preserve per-principal policy
- information, since the current default format does not contain
- this data.) Otherwise, a new database is created containing only
+ database. Otherwise, a new database is created containing only
what is in the dump file and the old one destroyed upon successful
completion.
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
