[27621] in CVS-changelog-for-Kerberos-V5
krb5 commit: Reset ulog header if iprop load fails
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Mar 15 13:27:05 2013
Date: Fri, 15 Mar 2013 13:27:00 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201303151727.r2FHR0sU013394@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/b1314b12b12e6cdbe80338010f265ccdaf359e4e
commit b1314b12b12e6cdbe80338010f265ccdaf359e4e
Author: Greg Hudson <ghudson@mit.edu>
Date: Fri Mar 15 13:03:26 2013 -0400
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
src/kadmin/dbutil/dump.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index f326999..7b0d1dc 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. */
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
