[27512] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix iprop safety net in kdb5_util load
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Jan 18 01:20:21 2013
Date: Fri, 18 Jan 2013 01:20:16 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201301180620.r0I6KG3B029620@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/b264161818eba43263b4d7f137dbae6b266907f0
commit b264161818eba43263b4d7f137dbae6b266907f0
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Jan 17 12:49:57 2013 -0500
Fix iprop safety net in kdb5_util load
The error message was missing a newline, and the exit behavior causes
the database to be destroyed.
ticket: 7370
target_version: 1.11.1
tags: pullup
src/kadmin/dbutil/dump.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index af10c9c..600f07f 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -2806,10 +2806,12 @@ load_db(argc, argv)
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"),
+ "and a ulog is present\n"),
progname);
exit_status++;
- goto error;
+ if (dumpfile)
+ fclose(f);
+ return;
}
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
