diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-02-27 02:35:04 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-02-27 02:35:04 +0000 |
| commit | 55c9a76384bff75f93ee7e602caccf07bd29f5c5 (patch) | |
| tree | e512acb10a807506a180f110ede436fef22f72b8 | |
| parent | 259a07f169b9a1188c3a9efb3a5fb1fb67b4b04d (diff) | |
| download | krb5-55c9a76384bff75f93ee7e602caccf07bd29f5c5.tar.gz krb5-55c9a76384bff75f93ee7e602caccf07bd29f5c5.tar.xz krb5-55c9a76384bff75f93ee7e602caccf07bd29f5c5.zip | |
Make sure ulog_map() is invoked whenever we open the database in
kdb5_util. Fixes all of the master key rollover commands in the
presence of iprop. Reported by kacarstensen@csupomona.edu.
ticket: 6875
tags: pullup
target_version: 1.9.1
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24667 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 8 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.c | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index 96d1a13c47..9f1a1691f3 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -1283,14 +1283,6 @@ dump_db(argc, argv) fprintf(arglist.ofile, "%s", dump->header); if (dump_sno) { - if (ulog_map(util_context, global_params.iprop_logfile, - global_params.iprop_ulogsize, FKCOMMAND, db_args)) { - fprintf(stderr, - _("%s: Could not map log\n"), progname); - exit_status++; - goto unlock_and_return; - } - /* * We grab the lock twice (once again in the iterator call), * but that's ok since the lock func handles incr locks held. diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index 6c8e364c61..11b1a558f5 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -499,6 +499,17 @@ static int open_db_and_mkey() return(1); } + if (global_params.iprop_enabled) { + if (ulog_map(util_context, global_params.iprop_logfile, + global_params.iprop_ulogsize, FKCOMMAND, + db5util_db_args)) { + fprintf(stderr, _("%s: Could not map log\n"), + progname); + exit_status++; + return(1); + } + } + valid_master_key = 1; dbactive = TRUE; return 0; |