From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 22 Mar 2022 17:11:44 +0000 (+0100)
Subject: s4:kdc: only pass keys to samba_kdc_set_random_keys()
X-Git-Tag: tevent-0.12.0~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8c0f40690ce73ea2f86a87e636f3e28b31c5604;p=thirdparty%2Fsamba.git

s4:kdc: only pass keys to samba_kdc_set_random_keys()

This prepares the removal of sdb_entry_ex.

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 7d7f98db1e3..1dbb74532b9 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -416,7 +416,7 @@ out:
 
 static int samba_kdc_set_random_keys(krb5_context context,
 				     struct samba_kdc_db_context *kdc_db_ctx,
-				     struct sdb_entry_ex *entry_ex,
+				     struct sdb_keys *keys,
 				     bool is_protected)
 {
 	struct ldb_val secret_val;
@@ -436,7 +436,7 @@ static int samba_kdc_set_random_keys(krb5_context context,
 	return samba_kdc_set_fixed_keys(context, kdc_db_ctx,
 					&secret_val,
 					is_protected,
-					&entry_ex->entry.keys);
+					keys);
 }
 
 
@@ -528,7 +528,7 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
 	    && (userAccountControl & UF_SMARTCARD_REQUIRED)) {
 		ret = samba_kdc_set_random_keys(context,
 						kdc_db_ctx,
-						entry_ex,
+						&entry->keys,
 						is_protected);
 
 		*supported_enctypes_out = supported_enctypes;