summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2014-01-23 23:49:34 -0500
committerGreg Hudson <ghudson@mit.edu>2014-01-30 18:33:10 -0500
commit1116f25224207f051af22858c60ccfbe114aa96c (patch)
tree389d6465c5229b9356049721330f2cead9ddd08d /src
parent91ef7d4c3f892b99630422a71780788f2d1c04d7 (diff)
downloadkrb5-1116f25224207f051af22858c60ccfbe114aa96c.tar.gz
krb5-1116f25224207f051af22858c60ccfbe114aa96c.tar.xz
krb5-1116f25224207f051af22858c60ccfbe114aa96c.zip
Remove kdb5_util load iprop safety net
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)
Diffstat (limited to 'src')
-rw-r--r--src/kadmin/dbutil/dump.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 8bff367eb9..e180f69152 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -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 "