1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00

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>
This commit is contained in:
Stefan Metzmacher 2022-03-23 04:17:01 +01:00
parent f917a20fce
commit 57bf975231

View File

@ -297,13 +297,13 @@ static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsign
hdb_entry *entry) hdb_entry *entry)
{ {
struct samba_kdc_db_context *kdc_db_ctx; struct samba_kdc_db_context *kdc_db_ctx;
struct sdb_entry_ex sdb_entry_ex = {}; struct sdb_entry sentry = {};
krb5_error_code ret; krb5_error_code ret;
kdc_db_ctx = talloc_get_type_abort(db->hdb_db, kdc_db_ctx = talloc_get_type_abort(db->hdb_db,
struct samba_kdc_db_context); 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) { switch (ret) {
case 0: case 0:
break; break;
@ -317,8 +317,8 @@ static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsign
return ret; return ret;
} }
ret = sdb_entry_to_hdb_entry(context, &sdb_entry_ex.entry, entry); ret = sdb_entry_to_hdb_entry(context, &sentry, entry);
sdb_free_entry(&sdb_entry_ex); sdb_entry_free(&sentry);
return ret; return ret;
} }
@ -326,13 +326,13 @@ static krb5_error_code hdb_samba4_nextkey(krb5_context context, HDB *db, unsigne
hdb_entry *entry) hdb_entry *entry)
{ {
struct samba_kdc_db_context *kdc_db_ctx; struct samba_kdc_db_context *kdc_db_ctx;
struct sdb_entry_ex sdb_entry_ex = {}; struct sdb_entry sentry = {};
krb5_error_code ret; krb5_error_code ret;
kdc_db_ctx = talloc_get_type_abort(db->hdb_db, kdc_db_ctx = talloc_get_type_abort(db->hdb_db,
struct samba_kdc_db_context); 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) { switch (ret) {
case 0: case 0:
break; break;
@ -346,8 +346,8 @@ static krb5_error_code hdb_samba4_nextkey(krb5_context context, HDB *db, unsigne
return ret; return ret;
} }
ret = sdb_entry_to_hdb_entry(context, &sdb_entry_ex.entry, entry); ret = sdb_entry_to_hdb_entry(context, &sentry, entry);
sdb_free_entry(&sdb_entry_ex); sdb_entry_free(&sentry);
return ret; return ret;
} }