From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 15 Mar 2024 18:19:20 +0000 (+0100)
Subject: s4:kdc: add a returned_kvno helper variable in samba_kdc_trust_message2entry()
X-Git-Tag: tdb-1.4.11~637
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f48699641cf95f1e2d197e0f8ea1ed4ce2c4fb41;p=thirdparty%2Fsamba.git

s4:kdc: add a returned_kvno helper variable in samba_kdc_trust_message2entry()

This will simplifiy further changes.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 6589b067142..724fe896675 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1861,6 +1861,7 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 		ENC_ALL_TYPES;
 	struct lsa_TrustDomainInfoInfoEx *tdo = NULL;
 	NTSTATUS status;
+	uint32_t returned_kvno = 0;
 
 	*entry = (struct sdb_entry) {};
 
@@ -2093,9 +2094,9 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 
 	/* use the kvno the client specified, if available */
 	if (flags & SDB_F_KVNO_SPECIFIED) {
-		entry->kvno = kvno;
+		returned_kvno = kvno;
 	} else {
-		entry->kvno = *auth_kvno;
+		returned_kvno = *auth_kvno;
 	}
 
 	for (i=0; i < auth_array->count; i++) {
@@ -2308,6 +2309,8 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 
 	samba_kdc_sort_keys(&entry->keys);
 
+	entry->kvno = returned_kvno;
+
 	ret = sdb_entry_set_etypes(entry);
 	if (ret) {
 		goto out;