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

Two patches from Roland Dowdeswell to make n_keys/new_keys args optional.

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-20 18:54:29 -05:00
parent c818890dd7
commit 4f5dbf2f81
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/kadm5/randkey_c.c
View File

@@ -120,8 +120,10 @@ kadm5_c_randkey_principal(void *server_handle,
}
for(i = 0; i < tmp; i++)
krb5_ret_keyblock(sp, &k[i]);
*n_keys = tmp;
*new_keys = k;
if (n_keys && new_keys) {
*n_keys = tmp;
*new_keys = k;
}
}
out:
krb5_storage_free(sp);

6
lib/kadm5/set_keys.c
View File

@@ -309,8 +309,10 @@ out:
_kadm5_free_keys (context->context, ent->keys.len, ent->keys.val);
ent->keys.val = keys;
ent->keys.len = num_keys;
*new_keys = kblock;
*n_keys = num_keys;
if (n_keys && new_keys) {
*new_keys = kblock;
*n_keys = num_keys;
}
hdb_entry_set_pw_change_time(context->context, ent, 0);
hdb_entry_clear_password(context->context, ent);