kdb5_util. Fixes all of the master key rollover commands in the
presence of iprop. Reported by kacarstensen@csupomona.edu.
ticket: 6875
tags: pullup
target_version: 1.9.1
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24667
dc483132-0cff-0310-8789-
dd5450dbe970
fprintf(arglist.ofile, "%s", dump->header);
if (dump_sno) {
- if (ulog_map(util_context, global_params.iprop_logfile,
- global_params.iprop_ulogsize, FKCOMMAND, db_args)) {
- fprintf(stderr,
- _("%s: Could not map log\n"), progname);
- exit_status++;
- goto unlock_and_return;
- }
-
/*
* We grab the lock twice (once again in the iterator call),
* but that's ok since the lock func handles incr locks held.
return(1);
}
+ if (global_params.iprop_enabled) {
+ if (ulog_map(util_context, global_params.iprop_logfile,
+ global_params.iprop_ulogsize, FKCOMMAND,
+ db5util_db_args)) {
+ fprintf(stderr, _("%s: Could not map log\n"),
+ progname);
+ exit_status++;
+ return(1);
+ }
+ }
+
valid_master_key = 1;
dbactive = TRUE;
return 0;