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

Fix HDB two-phase commit for /dev/null log

Browse Source
This commit is contained in:
Nicolas Williams
2016-02-28 17:54:56 -06:00
parent 33e3f7fb94
commit d5bc673e31
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/kadm5/log.c
View File

@@ -897,6 +897,13 @@ kadm5_log_create(kadm5_server_context *context, hdb_entry *entry)
ent.free_entry = 0; ent.free_entry = 0;
ent.entry = *entry; ent.entry = *entry;
/*
* If we're not logging then we can't recover-to-perform, so just
* perform.
*/
if (strcmp(log_context->log_file, "/dev/null") == 0)
return context->db->hdb_store(context->context, context->db, 0, &ent);
/* /*
* Test for any conflicting entries before writing the log. If we commit * Test for any conflicting entries before writing the log. If we commit
* to the log we'll end-up rolling forward on recovery, but that would be * to the log we'll end-up rolling forward on recovery, but that would be
@@ -982,6 +989,9 @@ kadm5_log_delete(kadm5_server_context *context,
off_t end_off = 0; /* Ditto; this allows de-indentation by two levels */ off_t end_off = 0; /* Ditto; this allows de-indentation by two levels */
off_t off; off_t off;
if (strcmp(log_context->log_file, "/dev/null") == 0)
return context->db->hdb_remove(context->context, context->db, 0,
princ);
ret = context->db->hdb_remove(context->context, context->db, ret = context->db->hdb_remove(context->context, context->db,
HDB_F_PRECHECK, princ); HDB_F_PRECHECK, princ);
if (ret) if (ret)
@@ -1088,6 +1098,14 @@ kadm5_log_rename(kadm5_server_context *context,
ent.free_entry = 0; ent.free_entry = 0;
ent.entry = *entry; ent.entry = *entry;
if (strcmp(log_context->log_file, "/dev/null") == 0) {
ret = context->db->hdb_store(context->context, context->db, 0, &ent);
if (ret == 0)
return context->db->hdb_remove(context->context, context->db, 0,
source);
return ret;
}
/* /*
* Pre-check that the transaction will succeed. * Pre-check that the transaction will succeed.
* *
@@ -1243,6 +1261,10 @@ kadm5_log_modify(kadm5_server_context *context,
ent.free_entry = 0; ent.free_entry = 0;
ent.entry = *entry; ent.entry = *entry;
if (strcmp(log_context->log_file, "/dev/null") == 0)
return context->db->hdb_store(context->context, context->db,
HDB_F_REPLACE, &ent);
ret = context->db->hdb_store(context->context, context->db, ret = context->db->hdb_store(context->context, context->db,
HDB_F_PRECHECK | HDB_F_REPLACE, &ent); HDB_F_PRECHECK | HDB_F_REPLACE, &ent);
if (ret) if (ret)
@@ -1598,6 +1620,9 @@ kadm5_log_nop(kadm5_server_context *context, enum kadm_nop_type nop_type)
kadm5_log_context *log_context = &context->log_context; kadm5_log_context *log_context = &context->log_context;
off_t off; off_t off;
if (strcmp(log_context->log_file, "/dev/null") == 0)
return 0;
off = lseek(log_context->log_fd, 0, SEEK_CUR); off = lseek(log_context->log_fd, 0, SEEK_CUR);
if (off == -1) if (off == -1)
return errno; return errno;