From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 10 Aug 2023 02:48:04 +0000 (+1200)
Subject: s4:kdc: Ensure we don’t increase the value of entry->etypes->len
X-Git-Tag: tevent-0.16.0~1008
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26e2e891d0cebd68555cf17df2e6bd9b819b606a;p=thirdparty%2Fsamba.git

s4:kdc: Ensure we don’t increase the value of entry->etypes->len

The value of entry->etypes->len ought to be equal to that of
entry->keys.len, and so should be nonzero. But it’s safer not to rely on
that assumption.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index d7fe2f54347..e6aadaf3539 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1665,7 +1665,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
 			 */
 			entry->keys.len = 1;
 			if (entry->etypes != NULL) {
-				entry->etypes->len = 1;
+				entry->etypes->len = MIN(entry->etypes->len, 1);
 			}
 			entry->old_keys.len = MIN(entry->old_keys.len, 1);
 			entry->older_keys.len = MIN(entry->older_keys.len, 1);