From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 17 Feb 2022 09:59:45 +0000 (+0100)
Subject: s4:kdc: let sdb_entry_ex_to_krb5_db_entry() initialize 'k' at the beginning
X-Git-Tag: tevent-0.12.0~338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6152db35a660574bcfdc8a2cffe795e3bc30e25e;p=thirdparty%2Fsamba.git

s4:kdc: let sdb_entry_ex_to_krb5_db_entry() initialize 'k' at the beginning

This is clearer and make further changes easier.

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

diff --git a/source4/kdc/sdb_to_kdb.c b/source4/kdc/sdb_to_kdb.c
index 4aefefa4096..16fe7cb0a63 100644
--- a/source4/kdc/sdb_to_kdb.c
+++ b/source4/kdc/sdb_to_kdb.c
@@ -234,6 +234,8 @@ static int sdb_entry_ex_to_krb5_db_entry(krb5_context context,
 	krb5_error_code ret;
 	int i;
 
+	ZERO_STRUCTP(k);
+
 	k->magic = KRB5_KDB_MAGIC_NUMBER;
 	k->len = KRB5_KDB_V1_BASE_LENGTH;
 
@@ -342,7 +344,12 @@ int sdb_entry_ex_to_kdb_entry_ex(krb5_context context,
 				 const struct sdb_entry_ex *s,
 				 krb5_db_entry *k)
 {
-	ZERO_STRUCTP(k);
+	int ret;
+
+	ret = sdb_entry_ex_to_krb5_db_entry(context, &s->entry, k);
+	if (ret != 0) {
+		return ret;
+	}
 
 	if (s->ctx != NULL) {
 		struct samba_kdc_entry *skdc_entry;
@@ -355,5 +362,5 @@ int sdb_entry_ex_to_kdb_entry_ex(krb5_context context,
 				      samba_kdc_kdb_entry_destructor);
 	}
 
-	return sdb_entry_ex_to_krb5_db_entry(context, &s->entry, k);
+	return 0;
 }