hdb: eliminate hdb_entry_ex
Remove hdb_entry_ex and revert to the original design of hdb_entry (except with an additional context member in hdb_entry which is managed by the free_entry method in HDB).
This commit is contained in:
@@ -92,7 +92,7 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
|
||||
{
|
||||
kadm5_server_context *context = server_handle;
|
||||
kadm5_ret_t ret;
|
||||
hdb_entry_ex ent;
|
||||
hdb_entry ent;
|
||||
|
||||
memset(&ent, 0, sizeof(ent));
|
||||
if (!context->keep_open) {
|
||||
@@ -112,7 +112,7 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
|
||||
0, &ent);
|
||||
if (ret == HDB_ERR_NOENTRY)
|
||||
goto out2;
|
||||
if (ent.entry.flags.immutable) {
|
||||
if (ent.flags.immutable) {
|
||||
ret = KADM5_PROTECT_PRINCIPAL;
|
||||
goto out3;
|
||||
}
|
||||
@@ -121,7 +121,7 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
|
||||
if (ret)
|
||||
goto out3;
|
||||
|
||||
ret = hdb_seal_keys(context->context, context->db, &ent.entry);
|
||||
ret = hdb_seal_keys(context->context, context->db, &ent);
|
||||
if (ret)
|
||||
goto out3;
|
||||
|
||||
|
Reference in New Issue
Block a user