From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 23 Mar 2022 02:29:21 +0000 (+0100)
Subject: s4:kdc: only ZERO and free sdb_entry in samba_kdc_message2entry()
X-Git-Tag: tevent-0.12.0~312
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=049c906091ee6754bb18f329cfbb9e0daf63af6c;p=thirdparty%2Fsamba.git

s4:kdc: only ZERO and free sdb_entry in samba_kdc_message2entry()

sdb_entry_ex only contains sdb_entry, so this is still doing
the same, but we want to remove sdb_entry_ex soon.

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 8c7984db864..f511a0f7111 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -904,7 +904,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
 	struct ldb_val computer_val = data_blob_string_const("computer");
 	const char *samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
 
-	ZERO_STRUCTP(entry_ex);
+	ZERO_STRUCTP(entry);
 
 	if (ldb_msg_find_element(msg, "msDS-SecondaryKrbTgtNumber")) {
 		is_rodc = true;
@@ -1324,7 +1324,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
 out:
 	if (ret != 0) {
 		/* This doesn't free ent itself, that is for the eventual caller to do */
-		sdb_free_entry(entry_ex);
+		sdb_entry_free(entry);
 	} else {
 		talloc_steal(kdc_db_ctx, p);
 	}