From 1ad64fe5991caf659d4d7469a1485ed3e468b764 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 1 Jan 2011 02:29:49 +0100 Subject: [PATCH 1/2] hdb.h: Include krb5.h first, so hdb.h can be included standalone. This makes it a bit easier to find libhdb in e.g. configure tests and is consistent with the main header files for the other Heimdal libraries, none of which has any prerequisite other headers. Signed-off-by: Love Hornquist Astrand --- lib/hdb/hdb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/hdb/hdb.h b/lib/hdb/hdb.h index 1b0468a48..fffda7aef 100644 --- a/lib/hdb/hdb.h +++ b/lib/hdb/hdb.h @@ -36,6 +36,8 @@ #ifndef __HDB_H__ #define __HDB_H__ +#include + #include #include From 9427bcc22e4f044b64e66c5b196d3879f05b996f Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Mon, 3 Jan 2011 12:12:18 +0100 Subject: [PATCH 2/2] log more version numbers --- lib/kadm5/ipropd_master.c | 6 ++++-- lib/kadm5/log.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c index 630b6495e..c5e0ffd84 100644 --- a/lib/kadm5/ipropd_master.c +++ b/lib/kadm5/ipropd_master.c @@ -574,8 +574,10 @@ process_msg (krb5_context context, slave *s, int log_fd, /* new started slave that have old log */ if (s->version == 0 && tmp != 0) { if (current_version < tmp) { - krb5_warnx (context, "Slave %s have later version the master " - "OUT OF SYNC", s->name); + krb5_warnx (context, "Slave %s (version %lu) have later version " + "the master (version %lu) OUT OF SYNC", + s->name, (unsigned long)tmp, + (unsigned long)current_version); } s->version = tmp; } diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c index 5a89be1a8..425e0df0c 100644 --- a/lib/kadm5/log.c +++ b/lib/kadm5/log.c @@ -884,7 +884,10 @@ kadm5_log_previous (krb5_context context, krb5_storage_seek(sp, oldoff, SEEK_SET); krb5_set_error_message(context, KADM5_BAD_DB, "kadm5_log_previous: log entry " - "have consistency failure, version number wrong"); + "have consistency failure, version number wrong " + "(tmp %lu ver %lu)", + (unsigned long)tmp, + (unsigned long)*ver); return KADM5_BAD_DB; } ret = krb5_ret_int32 (sp, &tmp);