summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-10-23 11:55:19 -0400
committerGreg Hudson <ghudson@mit.edu>2013-10-25 11:36:11 -0400
commit4ccc18bc3ddc49d0fd0d2de00ec91c0fa44c53a8 (patch)
treeb5b184695615332f50d2ad29ef7e62f8c58cd4f8 /doc
parent7fee58ccadf1b61eec9a8c62f47dac43986e2ad1 (diff)
downloadkrb5-4ccc18bc3ddc49d0fd0d2de00ec91c0fa44c53a8.tar.gz
krb5-4ccc18bc3ddc49d0fd0d2de00ec91c0fa44c53a8.tar.xz
krb5-4ccc18bc3ddc49d0fd0d2de00ec91c0fa44c53a8.zip
Use active master key in update_princ_encryption
kdb5_util update_princ_encryption should update to the active master key version, not the most recent. ticket: 6507 target_version: 1.12 tags: pullup
Diffstat (limited to 'doc')
-rw-r--r--doc/admin/admin_commands/kdb5_util.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/admin/admin_commands/kdb5_util.rst b/doc/admin/admin_commands/kdb5_util.rst
index 2d7636ef15..f9fcd0afe8 100644
--- a/doc/admin/admin_commands/kdb5_util.rst
+++ b/doc/admin/admin_commands/kdb5_util.rst
@@ -324,8 +324,8 @@ update_princ_encryption
Update all principal records (or only those matching the
*princ-pattern* glob pattern) to re-encrypt the key data using the
-active database master key, if they are encrypted using older
-versions, and give a count at the end of the number of principals
+active database master key, if they are encrypted using a different
+version, and give a count at the end of the number of principals
updated. If the **-f** option is not given, ask for confirmation
before starting to make changes. The **-v** option causes each
principal processed to be listed, with an indication as to whether it