Imported Upstream version 1.20.1

[platform/upstream/krb5.git] / doc / admin / admin_commands / kdb5_util.rst

diff --git a/doc/admin/admin_commands/kdb5_util.rst b/doc/admin/admin_commands/kdb5_util.rst
index fee6826..444c58b 100644 (file)
--- a/doc/admin/admin_commands/kdb5_util.rst
+++ b/doc/admin/admin_commands/kdb5_util.rst
@@ -136,7 +136,7 @@ dump
 
 .. _kdb5_util_dump:
 
-    **dump** [**-b7**\|\ **-ov**\|\ **-r13**\|\ **-r18**]
+    **dump** [**-b7**\|\ **-r13**\|\ **-r18**]
     [**-verbose**] [**-mkey_convert**] [**-new_mkey_file**
     *mkey_file*] [**-rev**] [**-recurse**] [*filename*
     [*principals*...]]
@@ -151,9 +151,6 @@ load_dump version 7".  If filename is not specified, or is the string
     load_dump version 4").  This was the dump format produced on
     releases prior to 1.2.2.
 
-**-ov**
-    causes the dump to be in "ovsec_adm_export" format.
-
 **-r13**
     causes the dump to be in the Kerberos 5 1.3 format ("kdb5_util
     load_dump version 5").  This was the dump format produced on
@@ -204,7 +201,7 @@ load
 
 .. _kdb5_util_load:
 
-    **load** [**-b7**\|\ **-ov**\|\ **-r13**\|\ **-r18**] [**-hash**]
+    **load** [**-b7**\|\ **-r13**\|\ **-r18**] [**-hash**]
     [**-verbose**] [**-update**] *filename*
 
 Loads a database dump from the named file into the named database.  If
@@ -222,10 +219,6 @@ Options:
     ("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
-    used with the **-update** option.
-
 **-r13**
     requires the database to be in Kerberos 5 1.3 format ("kdb5_util
     load_dump version 5").  This was the dump format produced on
@@ -483,17 +476,17 @@ Examples::
     $ kdb5_util tabdump -o keyinfo.txt keyinfo
     $ cat keyinfo.txt
     name       keyindex        kvno    enctype salttype        salt
+    K/M@EXAMPLE.COM    0       1       aes256-cts-hmac-sha384-192      normal  -1
     foo@EXAMPLE.COM    0       1       aes128-cts-hmac-sha1-96 normal  -1
     bar@EXAMPLE.COM    0       1       aes128-cts-hmac-sha1-96 normal  -1
-    bar@EXAMPLE.COM    1       1       des-cbc-crc     normal  -1
     $ sqlite3
     sqlite> .mode tabs
     sqlite> .import keyinfo.txt keyinfo
-    sqlite> select * from keyinfo where enctype like 'des-cbc-%';
-    bar@EXAMPLE.COM    1       1       des-cbc-crc     normal  -1
+    sqlite> select * from keyinfo where enctype like 'aes256-%';
+    K/M@EXAMPLE.COM    1       1       aes256-cts-hmac-sha384-192      normal  -1
     sqlite> .quit
-    $ awk -F'\t' '$4 ~ /des-cbc-/ { print }' keyinfo.txt
-    bar@EXAMPLE.COM    1       1       des-cbc-crc     normal  -1
+    $ awk -F'\t' '$4 ~ /aes256-/ { print }' keyinfo.txt
+    K/M@EXAMPLE.COM    1       1       aes256-cts-hmac-sha384-192      normal  -1
 
 
 ENVIRONMENT