From b1314b12b12e6cdbe80338010f265ccdaf359e4e Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 15 Mar 2013 13:03:26 -0400 Subject: 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 . ticket: 7588 target_version: 1.11.2 tags: pullup --- src/kadmin/dbutil/dump.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/kadmin') diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index f32699994..7b0d1dc26 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. */ -- cgit