sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

s4:kdc: let samba_kdc_trust_message2entry() return all keys with SDB_F_ADMIN_DATA

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2024-03-15 19:23:46 +01:00 committed by Andrew Bartlett
parent 6ecc607ede
commit 37292f8a60
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source4/kdc/db-glue.c
View File

@ -2086,6 +2086,7 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
struct trustAuthInOutBlob password_blob;
struct samba_kdc_entry *p;
bool use_previous = false;
bool include_previous = false;
uint32_t current_kvno;
uint32_t previous_kvno;
struct samba_kdc_trust_keys current_keys = {};
@ -2314,6 +2315,15 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
} else {
use_previous = false;
}
if (flags & SDB_F_ADMIN_DATA) {
/*
* let admin tool
* get to all keys
*/
use_previous = false;
include_previous = true;
}
} else if (kvno == current_kvno) {
/*
* Exact match ...
@ -2361,6 +2371,13 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
current_keys.skeys = &entry->keys;
current_keys.available_enctypes = &available_enctypes;
current_keys.returned_kvno = &returned_kvno;
if (include_previous) {
/*
* return the old keys in addition.
*/
previous_keys.skeys = &entry->old_keys;
}
}
if (current_keys.skeys != NULL) {