diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-06-08 17:53:19 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-06-08 17:53:19 +0000 |
| commit | 27388a63d966366d9265ee96898c44e975c57c6c (patch) | |
| tree | 9f53d82f6d830b14395debbdfbed58e51adc8050 /src/kadmin/cli | |
| parent | c38c2428d55cc3fa5440907e42d15e9a2e882084 (diff) | |
| download | krb5-27388a63d966366d9265ee96898c44e975c57c6c.tar.gz krb5-27388a63d966366d9265ee96898c44e975c57c6c.tar.xz krb5-27388a63d966366d9265ee96898c44e975c57c6c.zip | |
When we display enctypes, display the input name rather than the
description. Affects klist -e, kdb5_util list_mkeys, kdb5_util stash
(error message), kadmin getprinc, kadmin ktadd, and ktutil list -e.
ticket: 5014
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24122 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/cli')
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 4 | ||||
| -rw-r--r-- | src/kadmin/cli/keytab.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index c8ef3eb20..9e5bc4479 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -1380,8 +1380,8 @@ kadmin_getprinc(int argc, char *argv[]) krb5_key_data *key_data = &dprinc.key_data[i]; char enctype[BUFSIZ], salttype[BUFSIZ]; - if (krb5_enctype_to_string(key_data->key_data_type[0], - enctype, sizeof(enctype))) + if (krb5_enctype_to_name(key_data->key_data_type[0], FALSE, + enctype, sizeof(enctype))) snprintf(enctype, sizeof(enctype), "<Encryption type 0x%x>", key_data->key_data_type[0]); printf("Key: vno %d, %s, ", key_data->key_data_kvno, enctype); diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c index a2f8775fb..8b291100e 100644 --- a/src/kadmin/cli/keytab.c +++ b/src/kadmin/cli/keytab.c @@ -473,7 +473,7 @@ etype_string(krb5_enctype enctype) static char buf[100]; krb5_error_code ret; - ret = krb5_enctype_to_string(enctype, buf, sizeof(buf)); + ret = krb5_enctype_to_name(enctype, FALSE, buf, sizeof(buf)); if (ret) snprintf(buf, sizeof(buf), "etype %d", enctype); |