diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-01-23 10:51:21 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-02-05 00:21:30 -0500 |
| commit | 1c0507df449ded505f54383387032db2723bd871 (patch) | |
| tree | 57e195a53d89bb82958309f1b05cc0f4d417e85e /src/lib | |
| parent | 779a335f4e2deb2d76caf7d0dd3de847a040c050 (diff) | |
| download | krb5-1c0507df449ded505f54383387032db2723bd871.tar.gz krb5-1c0507df449ded505f54383387032db2723bd871.tar.xz krb5-1c0507df449ded505f54383387032db2723bd871.zip | |
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.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kdb/kdb_log.c | 7 |
1 files changed, 1 insertions, 6 deletions
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); |