Skip to content

Commit

Permalink
Remove kdb5_util load iprop safety net
Browse files Browse the repository at this point in the history
Revert the safety net added #7370.  As written it only applied to the
master KDC, where a normal load sometimes makes sense.  Even on a
slave, there are edge cases where it can make sense to do a normal
load.

ticket: 7850 (new)
  • Loading branch information
greghudson committed Jan 30, 2014
1 parent 91ef7d4 commit 1116f25
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/kadmin/dbutil/dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -1572,26 +1572,12 @@ load_db(int argc, char **argv)
}
}

/*
* Fail if the dump is not in iprop format and iprop is enabled and we have
* a ulog -- we don't want an accidental stepping on our toes by a sysadmin
* or wayward cronjob left over from before enabling iprop.
*/
if (global_params.iprop_enabled &&
ulog_map(util_context, global_params.iprop_logfile,
global_params.iprop_ulogsize, caller, db5util_db_args)) {
fprintf(stderr, _("Could not open iprop ulog\n"));
goto error;
}
if (global_params.iprop_enabled && !load->iprop) {
if (log_ctx->ulog != NULL && log_ctx->ulog->kdb_first_time.seconds &&
(log_ctx->ulog->kdb_first_sno || log_ctx->ulog->kdb_last_sno)) {
fprintf(stderr, _("%s: Loads disallowed when iprop is enabled "
"and a ulog is present\n"),
progname);
goto error;
}
}

if (load->updateonly && !update) {
fprintf(stderr, _("%s: dump version %s can only be loaded with the "
Expand Down

0 comments on commit 1116f25

Please sign in to comment.