s4:kdc: avoid using sdb_entry_ex in hdb_samba4_{first,next}key()

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

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index e27b612a0b2362eafa6a33f8fd22856186c7c3c9..62e6678158810cf61985c196309fc7a530c96885 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -297,13 +297,13 @@ static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsign
                                        hdb_entry *entry)
 {
        struct samba_kdc_db_context *kdc_db_ctx;
-       struct sdb_entry_ex sdb_entry_ex = {};
+       struct sdb_entry sentry = {};
        krb5_error_code ret;
 
        kdc_db_ctx = talloc_get_type_abort(db->hdb_db,
                                           struct samba_kdc_db_context);
 
-       ret = samba_kdc_firstkey(context, kdc_db_ctx, &sdb_entry_ex.entry);
+       ret = samba_kdc_firstkey(context, kdc_db_ctx, &sentry);
        switch (ret) {
        case 0:
                break;
@@ -317,8 +317,8 @@ static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsign
                return ret;
        }
 
-       ret = sdb_entry_to_hdb_entry(context, &sdb_entry_ex.entry, entry);
-       sdb_free_entry(&sdb_entry_ex);
+       ret = sdb_entry_to_hdb_entry(context, &sentry, entry);
+       sdb_entry_free(&sentry);
        return ret;
 }
 
@@ -326,13 +326,13 @@ static krb5_error_code hdb_samba4_nextkey(krb5_context context, HDB *db, unsigne
                                   hdb_entry *entry)
 {
        struct samba_kdc_db_context *kdc_db_ctx;
-       struct sdb_entry_ex sdb_entry_ex = {};
+       struct sdb_entry sentry = {};
        krb5_error_code ret;
 
        kdc_db_ctx = talloc_get_type_abort(db->hdb_db,
                                           struct samba_kdc_db_context);
 
-       ret = samba_kdc_nextkey(context, kdc_db_ctx, &sdb_entry_ex.entry);
+       ret = samba_kdc_nextkey(context, kdc_db_ctx, &sentry);
        switch (ret) {
        case 0:
                break;
@@ -346,8 +346,8 @@ static krb5_error_code hdb_samba4_nextkey(krb5_context context, HDB *db, unsigne
                return ret;
        }
 
-       ret = sdb_entry_to_hdb_entry(context, &sdb_entry_ex.entry, entry);
-       sdb_free_entry(&sdb_entry_ex);
+       ret = sdb_entry_to_hdb_entry(context, &sentry, entry);
+       sdb_entry_free(&sentry);
        return ret;
 }