oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge branch 'master' of github.com:heimdal/heimdal

Browse Source
This commit is contained in:
Luke Howard
2011-01-05 15:49:15 +11:00
parent 5b47a8816d 9427bcc22e
commit 728fd7cad2
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hdb/hdb.h
View File

@@ -36,6 +36,8 @@
#ifndef __HDB_H__
#define __HDB_H__
#include <krb5.h>
#include <hdb_err.h>
#include <heim_asn1.h>

6
lib/kadm5/ipropd_master.c
View File

@@ -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;
}

5
lib/kadm5/log.c
View File

@@ -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);