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

(kadm5_s_randkey_principal): nuke old mkvno, otherwise hdb will think

Browse Source 
that the new random keys are already encrypted which will cause lots
of confusion later.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6383 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-06-28 18:33:24 +00:00
parent 4217f47285
commit a7904acbad
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/kadm5/randkey_s.c
View File

@@ -49,6 +49,7 @@ kadm5_s_randkey_principal(void *server_handle,
kadm5_server_context *context = server_handle; kadm5_server_context *context = server_handle;
hdb_entry ent; hdb_entry ent;
kadm5_ret_t ret; kadm5_ret_t ret;
krb5_keyblock *keys = NULL;
ent.principal = princ; ent.principal = princ;
ret = context->db->open(context->context, context->db, O_RDWR, 0); ret = context->db->open(context->context, context->db, O_RDWR, 0);
@@ -60,10 +61,17 @@ kadm5_s_randkey_principal(void *server_handle,
{ {
/* XXX this should be merged with set_keys */ /* XXX this should be merged with set_keys */
int i; int i;
Key *key;
*new_keys = malloc(ent.keys.len * sizeof(**new_keys)); keys = malloc(ent.keys.len * sizeof(*keys));
if (keys == NULL) {
ret = ENOMEM;
goto out2;
}
for(i = 0; i < ent.keys.len; i++){ for(i = 0; i < ent.keys.len; i++){
key = &ent.keys.val[i]; Key *key = &ent.keys.val[i];
free(key->mkvno);
key->mkvno = NULL;
if(key->salt) { if(key->salt) {
/* zap any salt */ /* zap any salt */
free_Salt(key->salt); free_Salt(key->salt);
@@ -77,9 +85,10 @@ kadm5_s_randkey_principal(void *server_handle,
if(ret) if(ret)
break; break;
ret = krb5_copy_keyblock_contents(context->context, ret = krb5_copy_keyblock_contents(context->context,
&key->key, &(*new_keys)[i]); &key->key, &keys[i]);
if(ret) if(ret)
break; break;
*n_keys = i + 1; *n_keys = i + 1;
} }
ent.kvno++; ent.kvno++;
@@ -103,13 +112,15 @@ out2:
hdb_free_entry(context->context, &ent); hdb_free_entry(context->context, &ent);
out: out:
context->db->close(context->context, context->db); context->db->close(context->context, context->db);
if(ret){ if(ret && keys != NULL) {
int i; int i;
for(i = 0; i < *n_keys; i++) for(i = 0; i < *n_keys; i++)
krb5_free_keyblock_contents(context->context, &(*new_keys)[i]); krb5_free_keyblock_contents(context->context, &keys[i]);
free(*new_keys); free(keys);
*n_keys = 0; *n_keys = 0;
} }
if (ret == 0)
*new_keys = keys;
return _kadm5_error_code(ret); return _kadm5_error_code(ret);
} }