From 1c0507df449ded505f54383387032db2723bd871 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Thu, 23 Jan 2014 10:51:21 -0500 Subject: In kdb5_util load, init ulog closer to promote Always map the ulog with FKCOMMAND, not FKLOAD which reinitializes the ulog. Don't reinitialize the ulog until just before calling krb5_db_promote(). Get rid of FKLOAD since it isn't needed any more; we can just call ulog_init_header() manually. --- src/lib/kdb/kdb_log.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/lib/kdb') diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c index c988dcbceb..1fd798e5f6 100644 --- a/src/lib/kdb/kdb_log.c +++ b/src/lib/kdb/kdb_log.c @@ -415,11 +415,6 @@ ulog_init_header(krb5_context context) * * Create and initialize if need be, map as MAP_SHARED. * - * - FKLOAD - * - * Create if need be, initialize (even if the ulog was already present), map - * as MAP_SHARED. (Intended for kdb5_util load of iprop dump.) - * * - FKCOMMAND * * Create and [re-]initialize if need be, size appropriately, map as @@ -513,7 +508,7 @@ ulog_map(krb5_context context, const char *logname, uint32_t ulogentries, return KRB5_LOG_CORRUPT; } - if (ulog->kdb_hmagic != KDB_ULOG_HDR_MAGIC || caller == FKLOAD) { + if (ulog->kdb_hmagic != KDB_ULOG_HDR_MAGIC) { reset_header(ulog); if (caller != FKPROPLOG) ulog_sync_header(ulog); -- cgit