Skip to content

Commit

Permalink
Fix iprop safety net in kdb5_util load
Browse files Browse the repository at this point in the history
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
  • Loading branch information
greghudson committed Jan 17, 2013
1 parent 774f0bf commit b264161
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/kadmin/dbutil/dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit b264161

Please sign in to comment.