s4:kdc: use sdb_entry_to_hdb_entry() directly

We should avoid sdb_entry_ex, as it will be removed soon.

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 ca6443550ddcd29a642ad42d5622e3d40fb82102..436bf079536284ffda713397de276c2132c30b79 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -240,7 +240,7 @@ static krb5_error_code hdb_samba4_fetch_kvno(krb5_context context, HDB *db,
                                             krb5_const_principal principal,
                                             unsigned flags,
                                             krb5_kvno kvno,
-                                            hdb_entry *entry_ex)
+                                            hdb_entry *entry)
 {
        struct samba_kdc_db_context *kdc_db_ctx;
        struct sdb_entry_ex sdb_entry_ex = {};
@@ -253,7 +253,7 @@ static krb5_error_code hdb_samba4_fetch_kvno(krb5_context context, HDB *db,
        if (flags & HDB_F_GET_FAST_COOKIE) {
                return hdb_samba4_fetch_fast_cookie(context,
                                                    kdc_db_ctx,
-                                                   entry_ex);
+                                                   entry);
        }
 
        sflags = (flags & SDB_F_HDB_MASK);
@@ -283,7 +283,7 @@ static krb5_error_code hdb_samba4_fetch_kvno(krb5_context context, HDB *db,
                return ret;
        }
 
-       ret = sdb_entry_ex_to_hdb_entry_ex(context, &sdb_entry_ex, entry_ex);
+       ret = sdb_entry_to_hdb_entry(context, &sdb_entry_ex.entry, entry);
        sdb_free_entry(&sdb_entry_ex);
 
        if (code != 0 && ret != 0) {
@@ -317,7 +317,7 @@ static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsign
                return ret;
        }
 
-       ret = sdb_entry_ex_to_hdb_entry_ex(context, &sdb_entry_ex, entry);
+       ret = sdb_entry_to_hdb_entry(context, &sdb_entry_ex.entry, entry);
        sdb_free_entry(&sdb_entry_ex);
        return ret;
 }
@@ -346,7 +346,7 @@ static krb5_error_code hdb_samba4_nextkey(krb5_context context, HDB *db, unsigne
                return ret;
        }
 
-       ret = sdb_entry_ex_to_hdb_entry_ex(context, &sdb_entry_ex, entry);
+       ret = sdb_entry_to_hdb_entry(context, &sdb_entry_ex.entry, entry);
        sdb_free_entry(&sdb_entry_ex);
        return ret;
 }

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 2f207e4c44106528053e345dbea71d1d812c208d..b7e2c78a143b1a754714be75f81bc0f68f2d7a7e 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -341,9 +341,9 @@ static krb5_error_code samba_wdc_reget_pac(void *priv, astgs_request_t r,
                                        return ret;
                                }
 
-                               ret = sdb_entry_ex_to_hdb_entry_ex(context,
-                                                                  &signing_krbtgt_sdb,
-                                                                  &signing_krbtgt_hdb);
+                               ret = sdb_entry_to_hdb_entry(context,
+                                                            &signing_krbtgt_sdb.entry,
+                                                            &signing_krbtgt_hdb);
                                sdb_free_entry(&signing_krbtgt_sdb);
                                if (ret != 0) {
                                        return ret;