hdb: Fix new key delay special casing of kvno 1

This commit is contained in:
Nicolas Williams
2020-09-22 18:27:05 -05:00
parent 7845bda1e0
commit 753e636274

View File

@@ -1194,11 +1194,10 @@ fix_keys(krb5_context context,
continue;
/*
* Ignore the keyset with kvno 1 when the entry is at 2 because
* kadmin's `ank -r' command immediately changes the keys.
* Ignore the keyset with kvno 1 when the entry has better kvnos
* because kadmin's `ank -r' command immediately changes the keys.
*/
if (h->entry.kvno == 2 && keys.val[i].kvno == 1 &&
keys.val[i].set_time[0] - best < 30)
if (kvno > 1 && keys.val[i].kvno == 1)
continue;
/*