diff options
| author | Tom Yu <tlyu@mit.edu> | 2013-12-09 15:48:02 -0500 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2013-12-09 17:03:05 -0500 |
| commit | 23a75649277afc24a9dfea199689e18129fa390c (patch) | |
| tree | 11491b938fa8735470b9fb59775ca467af7d76c1 /doc/admin/admin_commands/kdb5_util.rst | |
| parent | 13fd26e1863c79f616653f6a10a58c01f65fceff (diff) | |
| download | krb5-23a75649277afc24a9dfea199689e18129fa390c.zip krb5-23a75649277afc24a9dfea199689e18129fa390c.tar.gz krb5-23a75649277afc24a9dfea199689e18129fa390c.tar.bz2 | |
Better keysalt docs
Add a new section to kdc_conf.rst to describe keysalt lists, and
update other documentation to better distinguish enctype lists from
keysalt lists.
ticket: 7608
target_version: 1.12
tags: pullup
Diffstat (limited to 'doc/admin/admin_commands/kdb5_util.rst')
| -rw-r--r-- | doc/admin/admin_commands/kdb5_util.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/admin/admin_commands/kdb5_util.rst b/doc/admin/admin_commands/kdb5_util.rst index 4a90eb6..a10e6d8 100644 --- a/doc/admin/admin_commands/kdb5_util.rst +++ b/doc/admin/admin_commands/kdb5_util.rst @@ -262,9 +262,9 @@ add_mkey Adds a new master key to the master key principal, but does not mark it as active. Existing master keys will remain. The **-e** option specifies the encryption type of the new master key; see -:ref:`Encryption_and_salt_types` in :ref:`kdc.conf(5)` for a list of -possible values. The **-s** option stashes the new master key in the -stash file, which will be created if it doesn't already exist. +:ref:`Encryption_types` in :ref:`kdc.conf(5)` for a list of possible +values. The **-s** option stashes the new master key in the stash +file, which will be created if it doesn't already exist. After a new master key is added, it should be propagated to slave servers via a manual or periodic invocation of :ref:`kprop(8)`. Then, |