diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-07-02 19:09:20 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-07-02 19:09:20 +0000 |
| commit | b119d362e2e195a61488737511be2ca7b37138b5 (patch) | |
| tree | 7645a1671f6d5497f0ef8a82ee4299b2490406d2 /src/lib/kadm5/srv | |
| parent | 323fa3f74a84ee28115c4df7c7c0ea9b5b231a76 (diff) | |
| download | krb5-b119d362e2e195a61488737511be2ca7b37138b5.zip krb5-b119d362e2e195a61488737511be2ca7b37138b5.tar.gz krb5-b119d362e2e195a61488737511be2ca7b37138b5.tar.bz2 | |
Remove verify_master_key from the DAL table, as well as its associated
libkdb5 interface. Callers can (and mostly already do) use
krb5_fetch_mkey_list to verify master keyblocks. Adjust tests/create,
tests/verify, and kdb5_util dump to do so.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24166 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5/srv')
| -rw-r--r-- | src/lib/kadm5/srv/server_kdb.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c index 768c8f7..d986b62 100644 --- a/src/lib/kadm5/srv/server_kdb.c +++ b/src/lib/kadm5/srv/server_kdb.c @@ -72,18 +72,6 @@ krb5_error_code kdb_init_master(kadm5_server_handle_t handle, if (ret) goto done; -#if 0 /************** Begin IFDEF'ed OUT *******************************/ - /* - * krb5_db_fetch_mkey_list will verify mkey so don't call - * krb5_db_verify_master_key() - */ - if ((ret = krb5_db_verify_master_key(handle->context, master_princ, - IGNORE_VNO, &master_keyblock))) { - krb5_db_fini(handle->context); - return ret; - } -#endif /**************** END IFDEF'ed OUT *******************************/ - if ((ret = krb5_db_fetch_mkey_list(handle->context, master_princ, &master_keyblock, mkvno, &master_keylist))) { krb5_db_fini(handle->context); |