s4:kdc: only pass sdb_entry to samba_kdc_trust_message2entry()

It no longer needs 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 4f85b54c5a12a519d7dd9c769208e2eb8c37dd5e..0c5ec0019bd0d9f480f74388ba978e1c18429555 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1344,9 +1344,8 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
                                               unsigned flags,
                                               uint32_t kvno,
                                               struct ldb_message *msg,
-                                              struct sdb_entry_ex *entry_ex)
+                                              struct sdb_entry *entry)
 {
-       struct sdb_entry *entry = &entry_ex->entry;
        struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
        const char *our_realm = lpcfg_realm(lp_ctx);
        char *partner_realm = NULL;
@@ -1944,6 +1943,7 @@ static krb5_error_code samba_kdc_fetch_krbtgt(krb5_context context,
                                              uint32_t kvno,
                                              struct sdb_entry_ex *entry_ex)
 {
+       struct sdb_entry *entry = &entry_ex->entry;
        struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
        krb5_error_code ret;
        struct ldb_message *msg = NULL;
@@ -2067,7 +2067,7 @@ static krb5_error_code samba_kdc_fetch_krbtgt(krb5_context context,
 
                ret = samba_kdc_trust_message2entry(context, kdc_db_ctx, mem_ctx,
                                                    direction,
-                                                   realm_dn, flags, kvno, msg, entry_ex);
+                                                   realm_dn, flags, kvno, msg, entry);
                if (ret != 0) {
                        krb5_warnx(context, "samba_kdc_fetch: trust_message2entry failed for %s",
                                   ldb_dn_get_linearized(msg->dn));