[28232] in CVS-changelog-for-Kerberos-V5
krb5 commit: Remove kdb5_util load iprop safety net
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Jan 30 18:40:17 2014
Date: Thu, 30 Jan 2014 18:40:01 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201401302340.s0UNe1Xl013426@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/1116f25224207f051af22858c60ccfbe114aa96c
commit 1116f25224207f051af22858c60ccfbe114aa96c
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Jan 23 23:49:34 2014 -0500
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)
src/kadmin/dbutil/dump.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 8bff367..e180f69 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 "
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
