summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff D'Angelo <jcd@psu.edu>2014-02-28 09:47:30 -0500
committerTom Yu <tlyu@mit.edu>2014-02-28 14:34:49 -0500
commit2d0f2fa48df1ea81363de5c78ab7e8cf1ab6d214 (patch)
treee1b6ae2c68eb7b011323e0f6c1f16dfb7c8af5c1
parent6a593788bb79e189d31386ea5a354af9afccd252 (diff)
downloadkrb5-2d0f2fa48df1ea81363de5c78ab7e8cf1ab6d214.zip
krb5-2d0f2fa48df1ea81363de5c78ab7e8cf1ab6d214.tar.gz
krb5-2d0f2fa48df1ea81363de5c78ab7e8cf1ab6d214.tar.xz
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] ticket: 7865 tags: pullup target_version: 1.12.2
-rw-r--r--doc/admin/admin_commands/kdb5_util.rst8
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 a10e6d8..a818bb5 100644
--- a/doc/admin/admin_commands/kdb5_util.rst
+++ b/doc/admin/admin_commands/kdb5_util.rst
@@ -204,7 +204,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
@@ -232,10 +233,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.