From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 24 Jan 2014 04:49:34 +0000 (-0500)
Subject: Remove kdb5_util load iprop safety net
X-Git-Tag: krb5-1.13-alpha1~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1116f25224207f051af22858c60ccfbe114aa96c;p=thirdparty%2Fkrb5.git

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)
---

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 "