]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix iprop safety net in kdb5_util load
authorGreg Hudson <ghudson@mit.edu>
Thu, 17 Jan 2013 17:49:57 +0000 (12:49 -0500)
committerGreg Hudson <ghudson@mit.edu>
Thu, 17 Jan 2013 17:58:25 +0000 (12:58 -0500)
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

index af10c9cd49e81b91aacc542d7235655f4c1fc628..600f07f8439c24283db2080a8c212047cf7e3924 100644 (file)
@@ -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;
         }
     }