From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 17 Jan 2013 17:49:57 +0000 (-0500)
Subject: Fix iprop safety net in kdb5_util load
X-Git-Tag: krb5-1.12-alpha1~334
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b264161818eba43263b4d7f137dbae6b266907f0;p=thirdparty%2Fkrb5.git

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

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index af10c9cd49..600f07f843 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;
         }
     }