diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-01-17 12:49:57 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-01-17 12:58:25 -0500 |
| commit | b264161818eba43263b4d7f137dbae6b266907f0 (patch) | |
| tree | 3875e5f235224e280bb1bd8c72455d2969312495 /src/kadmin | |
| parent | 774f0bf84e815591fc2b11d55d5dfa21e1fd63b3 (diff) | |
| download | krb5-b264161818eba43263b4d7f137dbae6b266907f0.tar.gz krb5-b264161818eba43263b4d7f137dbae6b266907f0.tar.xz krb5-b264161818eba43263b4d7f137dbae6b266907f0.zip | |
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
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | 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 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; } } |