diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/clients/klist/klist.c | 2 | ||||
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 4 | ||||
| -rw-r--r-- | src/kadmin/cli/keytab.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_mkey.c | 4 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_stash.c | 3 | ||||
| -rw-r--r-- | src/kadmin/ktutil/ktutil.c | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c index 32cf4d0a41..f8d3cd87ac 100644 --- a/src/clients/klist/klist.c +++ b/src/clients/klist/klist.c @@ -428,7 +428,7 @@ etype_string(enctype) static char buf[100]; krb5_error_code retval; - if ((retval = krb5_enctype_to_string(enctype, buf, sizeof(buf)))) { + if ((retval = krb5_enctype_to_name(enctype, FALSE, buf, sizeof(buf)))) { /* XXX if there's an error != EINVAL, I should probably report it */ snprintf(buf, sizeof(buf), "etype %d", enctype); } diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index c8ef3eb200..9e5bc44796 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 a2f8775fb4..8b291100ea 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); diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c index 83a23ef792..6abd796d96 100644 --- a/src/kadmin/dbutil/kdb5_mkey.c +++ b/src/kadmin/dbutil/kdb5_mkey.c @@ -668,8 +668,8 @@ kdb5_list_mkeys(int argc, char *argv[]) for (cur_kb_node = master_keylist; cur_kb_node != NULL; cur_kb_node = cur_kb_node->next) { - if ((retval = krb5_enctype_to_string(cur_kb_node->keyblock.enctype, - enctype, sizeof(enctype)))) { + if ((retval = krb5_enctype_to_name(cur_kb_node->keyblock.enctype, + FALSE, enctype, sizeof(enctype)))) { com_err(progname, retval, "while getting enctype description"); exit_status++; goto cleanup_return; diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c index 858cf58dc4..b639cd1596 100644 --- a/src/kadmin/dbutil/kdb5_stash.c +++ b/src/kadmin/dbutil/kdb5_stash.c @@ -118,7 +118,8 @@ kdb5_stash(argc, argv) if (!krb5_c_valid_enctype(master_keyblock.enctype)) { char tmp[32]; - if (krb5_enctype_to_string(master_keyblock.enctype, tmp, sizeof(tmp))) + if (krb5_enctype_to_name(master_keyblock.enctype, FALSE, + tmp, sizeof(tmp))) com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP, "while setting up enctype %d", master_keyblock.enctype); else diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c index 5de9779138..2f39fe764c 100644 --- a/src/kadmin/ktutil/ktutil.c +++ b/src/kadmin/ktutil/ktutil.c @@ -252,8 +252,8 @@ void ktutil_list(argc, argv) printf("%40s", pname); if (show_enctype) { static char buf[256]; - if ((retval = krb5_enctype_to_string( - lp->entry->key.enctype, buf, 256))) { + if ((retval = krb5_enctype_to_name(lp->entry->key.enctype, FALSE, + buf, sizeof(buf)))) { com_err(argv[0], retval, "While converting enctype to string"); return; } |