diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 19:03:08 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 19:03:08 +0000 |
| commit | d5a7ab2e94f063aaec8093975f70ae031c6242f9 (patch) | |
| tree | d7ee4fe7024955fdf3cd1641414a1b38a92add7a /src/kadmin/v5server/admin.c | |
| parent | aac77f4a9b67ba578896315676553fbcf2d64b0a (diff) | |
| download | krb5-d5a7ab2e94f063aaec8093975f70ae031c6242f9.tar.gz krb5-d5a7ab2e94f063aaec8093975f70ae031c6242f9.tar.xz krb5-d5a7ab2e94f063aaec8093975f70ae031c6242f9.zip | |
* admin.c, passwd.c, srv_key.c, srv_main.c :
s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6706 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/v5server/admin.c')
| -rw-r--r-- | src/kadmin/v5server/admin.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/kadmin/v5server/admin.c b/src/kadmin/v5server/admin.c index f0d228e19..76304f8f0 100644 --- a/src/kadmin/v5server/admin.c +++ b/src/kadmin/v5server/admin.c @@ -230,15 +230,15 @@ admin_merge_keys(kcontext, dbentp, unique, xxx2.n_key_data = nkeys2; xxx2.key_data = in2; for (i=0; i<nksents; i++) { - (void) krb5_dbe_find_keytype(kcontext, + (void) krb5_dbe_find_enctype(kcontext, &xxx1, - kslist[i].ks_keytype, + kslist[i].ks_enctype, kslist[i].ks_salttype, -1, &kp1); - (void) krb5_dbe_find_keytype(kcontext, + (void) krb5_dbe_find_enctype(kcontext, &xxx2, - kslist[i].ks_keytype, + kslist[i].ks_enctype, kslist[i].ks_salttype, -1, &kp2); @@ -1199,9 +1199,9 @@ admin_keysalt_verify(kcontext, debug_level, dbentp, should_be_there, DPRINT(DEBUG_CALLS, debug_level, ("* admin_keysalt_verify()\n")); for (i=0; i<nksents; i++) { kdata = (krb5_key_data *) NULL; - (void) krb5_dbe_find_keytype(kcontext, + (void) krb5_dbe_find_enctype(kcontext, dbentp, - kslist[i].ks_keytype, + kslist[i].ks_enctype, kslist[i].ks_salttype, kvnolist[i], &kdata); @@ -1247,9 +1247,9 @@ admin_keysalt_operate(kcontext, debug_level, dbentp, password, keyectomy, if (keyectomy) { count = dbentp->n_key_data; for (i=0; i<nksents; i++) { - if (!krb5_dbe_find_keytype(kcontext, + if (!krb5_dbe_find_enctype(kcontext, dbentp, - kslist[i].ks_keytype, + kslist[i].ks_enctype, kslist[i].ks_salttype, kvnolist[i], &kdata)) { @@ -1970,7 +1970,7 @@ admin_extract_key(kcontext, debug_level, ticket, &dkey_list))) { ktabentry.principal = principal; ktabentry.vno = dkey_list[0].key_data_kvno; - ktabentry.key.keytype = + ktabentry.key.enctype = dkey_list[0].key_data_type[0]; ktabentry.key.length = dkey_list[0].key_data_length[0]; @@ -2071,7 +2071,7 @@ admin_extract_key(kcontext, debug_level, ticket, } /* - * admin_add_key() - Add new keytypes for the given principal. + * admin_add_key() - Add new enctypes for the given principal. */ krb5_int32 admin_add_key(kcontext, debug_level, ticket, nargs, arglist) @@ -2096,7 +2096,7 @@ admin_add_key(kcontext, debug_level, ticket, nargs, arglist) } /* - * admin_delete_key() - Delete keytypes for the given principal. + * admin_delete_key() - Delete enctypes for the given principal. */ krb5_int32 admin_delete_key(kcontext, debug_level, ticket, nargs, arglist) |