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/tests/verify | |
| parent | 323fa3f74a84ee28115c4df7c7c0ea9b5b231a76 (diff) | |
| download | krb5-b119d362e2e195a61488737511be2ca7b37138b5.tar.gz krb5-b119d362e2e195a61488737511be2ca7b37138b5.tar.xz krb5-b119d362e2e195a61488737511be2ca7b37138b5.zip | |
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/tests/verify')
| -rw-r--r-- | src/tests/verify/kdb5_verify.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c index 2e465f36f7..5fdab77c03 100644 --- a/src/tests/verify/kdb5_verify.c +++ b/src/tests/verify/kdb5_verify.c @@ -368,6 +368,7 @@ set_dbname_help(context, pname, dbname) krb5_boolean more; krb5_data pwd, scratch; char *args[2]; + krb5_keylist_node *mkeys; /* assemble & parse the master key name */ @@ -419,12 +420,14 @@ set_dbname_help(context, pname, dbname) com_err(pname, retval, "while initializing database"); return(1); } - if ((retval = krb5_db_verify_master_key(context, master_princ, - IGNORE_VNO, &master_keyblock))) { + if ((retval = krb5_db_fetch_mkey_list(context, master_princ, + &master_keyblock, IGNORE_VNO, + &mkeys))) { com_err(pname, retval, "while verifying master key"); (void) krb5_db_fini(context); return(1); } + krb5_db_free_mkey_list(context, mkeys); nentries = 1; if ((retval = krb5_db_get_principal(context, master_princ, &master_entry, &nentries, &more))) { |