From b119d362e2e195a61488737511be2ca7b37138b5 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 2 Jul 2010 19:09:20 +0000 Subject: 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 --- src/tests/create/kdb5_mkdums.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/tests/create') diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c index 3179b968e..0d860b909 100644 --- a/src/tests/create/kdb5_mkdums.c +++ b/src/tests/create/kdb5_mkdums.c @@ -336,6 +336,7 @@ set_dbname_help(pname, dbname) krb5_boolean more; krb5_data pwd, scratch; char *args[2]; + krb5_keylist_node *mkeys; /* assemble & parse the master key name */ @@ -392,12 +393,14 @@ set_dbname_help(pname, dbname) /* Done with args */ free(args[0]); - if ((retval = krb5_db_verify_master_key(test_context, master_princ, - IGNORE_VNO, &master_keyblock))){ + if ((retval = krb5_db_fetch_mkey_list(test_context, master_princ, + &master_keyblock, IGNORE_VNO, + &mkeys))){ com_err(pname, retval, "while verifying master key"); (void) krb5_db_fini(test_context); return(1); } + krb5_db_free_mkey_list(test_context, mkeys); nentries = 1; if ((retval = krb5_db_get_principal(test_context, master_princ, &master_entry, &nentries, &more))) { -- cgit