aboutsummaryrefslogtreecommitdiff
path: root/src/kadmin/dbutil/kdb5_mkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin/dbutil/kdb5_mkey.c')
-rw-r--r--src/kadmin/dbutil/kdb5_mkey.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 9ea7e5e..b2ac379 100644
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -866,7 +866,7 @@ update_princ_encryption_1(void *cb, krb5_db_entry *ent)
goto skip;
}
p->re_match_count++;
- retval = krb5_dbe_lookup_mkvno(util_context, ent, &old_mkvno);
+ retval = krb5_dbe_get_mkvno(util_context, ent, master_keylist, &old_mkvno);
if (retval) {
com_err(progname, retval,
"determining master key used for principal '%s'",
@@ -1137,7 +1137,7 @@ find_mkvnos_in_use(krb5_pointer ptr,
args = (struct purge_args *) ptr;
- retval = krb5_dbe_lookup_mkvno(args->kcontext, entry, &mkvno);
+ retval = krb5_dbe_get_mkvno(args->kcontext, entry, master_keylist, &mkvno);
if (retval)
return (retval);
@@ -1193,6 +1193,12 @@ kdb5_purge_mkeys(int argc, char *argv[])
}
}
+ if (master_keylist == NULL) {
+ com_err(progname, retval, "master keylist not initialized");
+ exit_status++;
+ return;
+ }
+
/* assemble & parse the master key name */
if ((retval = krb5_db_setup_mkey_name(util_context,
global_params.mkey_name,