switch to hdb_fetch_kvno
This commit is contained in:
@@ -53,8 +53,8 @@ change(void *server_handle,
|
|||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = context->db->hdb_fetch(context->context, context->db, princ,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db, princ,
|
||||||
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
||||||
if(ret)
|
if(ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
@@ -166,7 +166,7 @@ kadm5_s_chpass_principal_with_key(void *server_handle,
|
|||||||
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = context->db->hdb_fetch(context->context, context->db, princ,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db, princ, 0,
|
||||||
HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
||||||
if(ret == HDB_ERR_NOENTRY)
|
if(ret == HDB_ERR_NOENTRY)
|
||||||
goto out;
|
goto out;
|
||||||
|
@@ -48,8 +48,8 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
|
|||||||
krb5_warn(context->context, ret, "opening database");
|
krb5_warn(context->context, ret, "opening database");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
ret = context->db->hdb_fetch(context->context, context->db, princ,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db, princ,
|
||||||
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
||||||
if(ret == HDB_ERR_NOENTRY)
|
if(ret == HDB_ERR_NOENTRY)
|
||||||
goto out;
|
goto out;
|
||||||
if(ent.entry.flags.immutable) {
|
if(ent.entry.flags.immutable) {
|
||||||
|
@@ -78,8 +78,8 @@ kadm5_s_get_principal(void *server_handle,
|
|||||||
ret = context->db->hdb_open(context->context, context->db, O_RDONLY, 0);
|
ret = context->db->hdb_open(context->context, context->db, O_RDONLY, 0);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = context->db->hdb_fetch(context->context, context->db, princ,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db, princ,
|
||||||
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
||||||
context->db->hdb_close(context->context, context->db);
|
context->db->hdb_close(context->context, context->db);
|
||||||
if(ret)
|
if(ret)
|
||||||
return _kadm5_error_code(ret);
|
return _kadm5_error_code(ret);
|
||||||
|
@@ -583,9 +583,9 @@ kadm5_log_replay_modify (kadm5_server_context *context,
|
|||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
memset(&ent, 0, sizeof(ent));
|
memset(&ent, 0, sizeof(ent));
|
||||||
ret = context->db->hdb_fetch(context->context, context->db,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db,
|
||||||
log_ent.entry.principal,
|
log_ent.entry.principal,
|
||||||
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
HDB_F_DECRYPT|HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
if (mask & KADM5_PRINC_EXPIRE_TIME) {
|
if (mask & KADM5_PRINC_EXPIRE_TIME) {
|
||||||
|
@@ -53,8 +53,8 @@ modify_principal(void *server_handle,
|
|||||||
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = context->db->hdb_fetch(context->context, context->db,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db,
|
||||||
princ->principal, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
princ->principal, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
||||||
if(ret)
|
if(ret)
|
||||||
goto out;
|
goto out;
|
||||||
ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);
|
ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);
|
||||||
|
@@ -54,8 +54,8 @@ kadm5_s_randkey_principal(void *server_handle,
|
|||||||
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = context->db->hdb_fetch(context->context, context->db, princ,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db, princ,
|
||||||
HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
||||||
if(ret)
|
if(ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@@ -51,8 +51,8 @@ kadm5_s_rename_principal(void *server_handle,
|
|||||||
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = context->db->hdb_fetch(context->context, context->db,
|
ret = context->db->hdb_fetch_kvno(context->context, context->db,
|
||||||
source, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent);
|
source, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
|
||||||
if(ret){
|
if(ret){
|
||||||
context->db->hdb_close(context->context, context->db);
|
context->db->hdb_close(context->context, context->db);
|
||||||
goto out;
|
goto out;
|
||||||
|
Reference in New Issue
Block a user