prefix all struct HDB elements with hdb_
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12880 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -43,13 +43,13 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
|
||||
hdb_entry ent;
|
||||
|
||||
ent.principal = princ;
|
||||
ret = context->db->open(context->context, context->db, O_RDWR, 0);
|
||||
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
||||
if(ret) {
|
||||
krb5_warn(context->context, ret, "opening database");
|
||||
return ret;
|
||||
}
|
||||
ret = context->db->fetch(context->context, context->db,
|
||||
HDB_F_DECRYPT, &ent);
|
||||
ret = context->db->hdb_fetch(context->context, context->db,
|
||||
HDB_F_DECRYPT, &ent);
|
||||
if(ret == HDB_ERR_NOENTRY)
|
||||
goto out2;
|
||||
if(ent.flags.immutable) {
|
||||
@@ -63,10 +63,10 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
|
||||
|
||||
kadm5_log_delete (context, princ);
|
||||
|
||||
ret = context->db->remove(context->context, context->db, &ent);
|
||||
ret = context->db->hdb_remove(context->context, context->db, &ent);
|
||||
out:
|
||||
hdb_free_entry(context->context, &ent);
|
||||
out2:
|
||||
context->db->close(context->context, context->db);
|
||||
context->db->hdb_close(context->context, context->db);
|
||||
return _kadm5_error_code(ret);
|
||||
}
|
||||
|
Reference in New Issue
Block a user