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

Duh, act on keepold in randkey!

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-18 01:13:43 -05:00
parent af23757829
commit acc8cd4b22
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/kadm5/randkey_s.c
View File

@@ -62,9 +62,11 @@ kadm5_s_randkey_principal(void *server_handle,
if(ret) if(ret)
goto out; goto out;
ret = hdb_add_current_keys_to_history(context->context, &ent.entry); if (keepold) {
if (ret) ret = hdb_add_current_keys_to_history(context->context, &ent.entry);
goto out2; if (ret)
goto out2;
}
ret = _kadm5_set_keys_randomly (context, ret = _kadm5_set_keys_randomly (context,
&ent.entry, &ent.entry,
@@ -83,9 +85,18 @@ kadm5_s_randkey_principal(void *server_handle,
if (ret) if (ret)
goto out2; goto out2;
ret = hdb_seal_keys(context->context, context->db, &ent.entry); if (keepold) {
if (ret) ret = hdb_seal_keys(context->context, context->db, &ent.entry);
goto out2; if (ret)
goto out2;
} else {
HDB_extension ext;
ext.data.element = choice_HDB_extension_data_hist_keys;
ext.data.u.hist_keys.len = 0;
ext.data.u.hist_keys.val = NULL;
hdb_replace_extension(context->context, &ent.entry, &ext);
}
ret = context->db->hdb_store(context->context, context->db, ret = context->db->hdb_store(context->context, context->db,
HDB_F_REPLACE, &ent); HDB_F_REPLACE, &ent);