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

We want the time that a keyset was set, not the time it was replaced.

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-12 16:00:43 -05:00
committed by Nicolas Williams
parent b45ac85b65
commit a095933ee0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hdb/hdb.asn1
View File

@@ -89,7 +89,7 @@ HDB-Ext-Aliases ::= SEQUENCE {
hdb_keyset ::= SEQUENCE { hdb_keyset ::= SEQUENCE {
kvno[0] INTEGER (0..4294967295), kvno[0] INTEGER (0..4294967295),
replace-time[1] KerberosTime, -- time this key was replaced set-time[1] KerberosTime, -- time this key was created/set
keys[2] SEQUENCE OF Key keys[2] SEQUENCE OF Key
} }

2
lib/hdb/keys.c
View File

@@ -247,7 +247,7 @@ hdb_add_current_keys_to_history(krb5_context context, hdb_entry *entry)
hist_keys->val[0].keys.val = entry->keys.val; hist_keys->val[0].keys.val = entry->keys.val;
hist_keys->val[0].keys.len = entry->keys.len; hist_keys->val[0].keys.len = entry->keys.len;
hist_keys->val[0].kvno = entry->kvno; hist_keys->val[0].kvno = entry->kvno;
hist_keys->val[0].replace_time = time(NULL); (void) hdb_entry_get_pw_change_time(entry, &hist_keys->val[0].set_time);
if (add) { if (add) {
ret = hdb_replace_extension(context, entry, ext); ret = hdb_replace_extension(context, entry, ext);

2
lib/hdb/mkey.c
View File

@@ -549,7 +549,7 @@ hdb_unseal_keys_kvno(krb5_context context, HDB *db, krb5_kvno kvno,
tmp_keys[0].keys.len = ent->keys.len; tmp_keys[0].keys.len = ent->keys.len;
tmp_keys[0].keys.val = ent->keys.val; tmp_keys[0].keys.val = ent->keys.val;
tmp_keys[0].kvno = ent->kvno; tmp_keys[0].kvno = ent->kvno;
tmp_keys[0].replace_time = time(NULL); (void) hdb_entry_get_pw_change_time(ent, &tmp_keys[0].set_time);
i++; i++;
ent->keys.len = hist_keys->val[i].keys.len; ent->keys.len = hist_keys->val[i].keys.len;
ent->keys.val = hist_keys->val[i].keys.val; ent->keys.val = hist_keys->val[i].keys.val;

2
lib/hdb/test_hdbkeys.c
View File

@@ -88,7 +88,7 @@ main(int argc, char **argv)
memset(&keyset, 0, sizeof(keyset)); memset(&keyset, 0, sizeof(keyset));
keyset.kvno = kvno_integer; keyset.kvno = kvno_integer;
keyset.replace_time = time(NULL); keyset.set_time = time(NULL);
ret = hdb_generate_key_set_password(context, principal, password_str, ret = hdb_generate_key_set_password(context, principal, password_str,
&keyset.keys.val, &len); &keyset.keys.val, &len);