diff options
author | Greg Hudson <ghudson@mit.edu> | 2014-01-24 16:52:47 -0500 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2014-02-20 20:42:47 -0500 |
commit | 6a4a4b7b5e3265e4a811a9fd72c2534e6c5f5fd4 (patch) | |
tree | c7dff9c0ec49836e715f901a97724d63088b8118 /src/kadmin/dbutil/kdb5_create.c | |
parent | 71d028f1054deb186807e7c8048218b82b478422 (diff) | |
download | krb5-6a4a4b7b5e3265e4a811a9fd72c2534e6c5f5fd4.tar.gz krb5-6a4a4b7b5e3265e4a811a9fd72c2534e6c5f5fd4.tar.xz krb5-6a4a4b7b5e3265e4a811a9fd72c2534e6c5f5fd4.zip |
Simplify ulog_map
Get rid of the caller parameter. The kproplog semantics (without -R)
for mapping the ulog are simple and almost completely different from
other users of the ulog, so implement them as a static helper in
kproplog. With hierarchical iprop, kpropd will need the same
semantics as FKCOMMAND and FKADMIND, which were already identical.
Get rid of the db_args parameter, since ulog_map no longer opens the
database after #7552.
Remove an inoperative lseek() call when creating a new ulog file.
Rename ulog_filesize to filesize and compute it from scratch each time
we use it, for easier analysis. If kdb_hmagic is zero, init the ulog
header but don't skip the rest of the function; it's possible that we
need to expand the ulog file. Remove an unneeded conditional before
calling extend_file_to for an existing ulog.
ticket: 7855
Diffstat (limited to 'src/kadmin/dbutil/kdb5_create.c')
-rw-r--r-- | src/kadmin/dbutil/kdb5_create.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c index f6df9923e4..385dfb931f 100644 --- a/src/kadmin/dbutil/kdb5_create.c +++ b/src/kadmin/dbutil/kdb5_create.c @@ -288,9 +288,9 @@ void kdb5_create(argc, argv) /* } */ if (log_ctx && log_ctx->iproprole) { - if ((retval = ulog_map(util_context, global_params.iprop_logfile, - global_params.iprop_ulogsize, FKCOMMAND, - db5util_db_args))) { + retval = ulog_map(util_context, global_params.iprop_logfile, + global_params.iprop_ulogsize); + if (retval) { com_err(argv[0], retval, _("while creating update log")); exit_status++; return; |