diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 18:59:17 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 18:59:17 +0000 |
| commit | 527f1eaca9cab3f3e9950ce2fe85dc5f6f34005b (patch) | |
| tree | 671f9a61b2cb281ee596cf0a07785567d32e5325 /src/admin/edit/dump.c | |
| parent | 758dcd90976b3e8772de5c6498dc7263aa167543 (diff) | |
| download | krb5-527f1eaca9cab3f3e9950ce2fe85dc5f6f34005b.tar.gz krb5-527f1eaca9cab3f3e9950ce2fe85dc5f6f34005b.tar.xz krb5-527f1eaca9cab3f3e9950ce2fe85dc5f6f34005b.zip | |
* cpw.c, dump.c, dumpv4.c, kdb5_edit.c, loadv4.c :
s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6698 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin/edit/dump.c')
| -rw-r--r-- | src/admin/edit/dump.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/admin/edit/dump.c b/src/admin/edit/dump.c index bbf2d09d07..c0aaa72ee5 100644 --- a/src/admin/edit/dump.c +++ b/src/admin/edit/dump.c @@ -275,9 +275,9 @@ name_matches(name, arglist) } static krb5_error_code -find_keytype(dbentp, keytype, salttype, kentp) +find_enctype(dbentp, enctype, salttype, kentp) krb5_db_entry *dbentp; - krb5_keytype keytype; + krb5_enctype enctype; krb5_int32 salttype; krb5_key_data **kentp; { @@ -288,7 +288,7 @@ find_keytype(dbentp, keytype, salttype, kentp) maxkvno = -1; datap = (krb5_key_data *) NULL; for (i=0; i<dbentp->n_key_data; i++) { - if ((dbentp->key_data[i].key_data_type[0] == keytype) && + if ((dbentp->key_data[i].key_data_type[0] == enctype) && ((dbentp->key_data[i].key_data_type[1] == salttype) || (salttype < 0))) { maxkvno = dbentp->key_data[i].key_data_kvno; @@ -397,12 +397,12 @@ dump_k5beta_iterator(ptr, entry) /* * Find the 'primary' key and the 'alternate' key. */ - if ((retval = find_keytype(entry, - KEYTYPE_DES_CBC_CRC, + if ((retval = find_enctype(entry, + ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_NORMAL, &pkey)) && - (retval = find_keytype(entry, - KEYTYPE_DES_CBC_CRC, + (retval = find_enctype(entry, + ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_V4, &akey))) { fprintf(stderr, nokeys_err, arg->programname, name); |