summaryrefslogtreecommitdiffstats
path: root/doc/admin/admin_commands
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2014-03-21 18:07:41 -0400
committerGreg Hudson <ghudson@mit.edu>2014-03-26 18:12:31 -0400
commit54c97cd0c435f78880d80541a20cf7f08928705d (patch)
tree2487b4ccf15dcaaaec76fe5969fe28bbcbb274f1 /doc/admin/admin_commands
parent3890d1dff87a839efec38a77dcc88574ed65f4a9 (diff)
Improve salt type display in kadmin getprinc
In krb5_salttype_to_string, output the salt type name we would recognize as input. In the output of getprinc, display the enctype and salt type in a form we would accept--either enctype:salttype if the salt type is not the default, or just the enctype if it is. Update t_mkey.py and t_salt.py to expect the new output format. Update documentation examples to show the new format. ticket: 5958
Diffstat (limited to 'doc/admin/admin_commands')
-rw-r--r--doc/admin/admin_commands/kadmin_local.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/admin/admin_commands/kadmin_local.rst b/doc/admin/admin_commands/kadmin_local.rst
index 580824165..927daf9ff 100644
--- a/doc/admin/admin_commands/kadmin_local.rst
+++ b/doc/admin/admin_commands/kadmin_local.rst
@@ -508,8 +508,8 @@ Examples:
Last failed authentication: [never]
Failed password attempts: 0
Number of keys: 2
- Key: vno 1, des-cbc-crc, no salt
- Key: vno 1, des-cbc-crc, Version 4
+ Key: vno 1, des-cbc-crc
+ Key: vno 1, des-cbc-crc:v4
Attributes:
Policy: [none]