diff options
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 9 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.c | 10 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index 64c63af..baebf4c 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -1082,6 +1082,7 @@ dump_db(argc, argv) kdb_log_context *log_ctx; char **db_args = 0; /* XXX */ unsigned int ipropx_version = IPROPX_VERSION_0; + krb5_keylist_node *mkeys; /* * Parse the arguments. @@ -1185,15 +1186,15 @@ dump_db(argc, argv) "while reading master key"); exit(1); } - retval = krb5_db_verify_master_key(util_context, - master_princ, - IGNORE_VNO, - &master_keyblock); + retval = krb5_db_fetch_mkey_list(util_context, master_princ, + &master_keyblock, IGNORE_VNO, + &mkeys); if (retval) { com_err(progname, retval, "while verifying master key"); exit(1); } + krb5_db_free_mkey_list(util_context, mkeys); } new_master_keyblock.enctype = global_params.enctype; if (new_master_keyblock.enctype == ENCTYPE_UNKNOWN) diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index 035a8c0..09b0d07 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -491,16 +491,6 @@ static int open_db_and_mkey() return(0); } } -#if 0 /************** Begin IFDEF'ed OUT *******************************/ - /* krb5_db_fetch_mkey_list will verify the mkey */ - if ((retval = krb5_db_verify_master_key(util_context, master_princ, - master_kvno, &master_keyblock))) { - com_err(progname, retval, "while verifying master key"); - exit_status++; - krb5_free_keyblock_contents(util_context, &master_keyblock); - return(1); - } -#endif /**************** END IFDEF'ed OUT *******************************/ if ((retval = krb5_db_fetch_mkey_list(util_context, master_princ, &master_keyblock, master_kvno, |