From 6a4a4b7b5e3265e4a811a9fd72c2534e6c5f5fd4 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 24 Jan 2014 16:52:47 -0500 Subject: 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 --- src/include/kdb_log.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/include/kdb_log.h') diff --git a/src/include/kdb_log.h b/src/include/kdb_log.h index 7f35eb7c86..bb0847ca11 100644 --- a/src/include/kdb_log.h +++ b/src/include/kdb_log.h @@ -43,14 +43,6 @@ extern "C" { #define KDB_ULOG_MAGIC 0x6661212 #define KDB_ULOG_HDR_MAGIC 0x6662323 -/* - * DB Flags - */ -#define FKADMIND 1 -#define FKPROPLOG 2 -#define FKPROPD 3 -#define FKCOMMAND 4 /* Includes kadmin.local and kdb5_util */ - /* * Default ulog file attributes */ @@ -68,7 +60,7 @@ extern "C" { * Prototype declarations */ krb5_error_code ulog_map(krb5_context context, const char *logname, - uint32_t entries, int caller, char **db_args); + uint32_t entries); krb5_error_code ulog_init_header(krb5_context context); krb5_error_code ulog_add_update(krb5_context context, kdb_incr_update_t *upd); krb5_error_code ulog_get_entries(krb5_context context, const kdb_last_t *last, -- cgit