From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 15 Mar 2013 17:03:26 +0000 (-0400)
Subject: Reset ulog header if iprop load fails
X-Git-Tag: krb5-1.12-alpha1~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1314b12b12e6cdbe80338010f265ccdaf359e4e;p=thirdparty%2Fkrb5.git

Reset ulog header if iprop load fails

If an iprop slave tries to load a dump from the master and it fails,
reset the ulog header so we take another full dump, instead of
reporting that the slave is current when it isn't.  Reported by
Richard Basch <basch@alum.mit.edu>.

ticket: 7588
target_version: 1.11.2
tags: pullup
---

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index f326999940..7b0d1dc260 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1691,6 +1691,8 @@ load_db(int argc, char **argv)
 cleanup:
     /* If we created a temporary DB but didn't succeed, destroy it. */
     if (exit_status && temp_db_created) {
+        if (log_ctx && log_ctx->iproprole)
+            ulog_init_header(util_context);
         ret = krb5_db_destroy(util_context, db5util_db_args);
         /* Ignore a not supported error since there is nothing to do about
          * it anyway. */