sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4:kdc: only pass sdb_entry to samba_kdc_trust_message2entry()

Browse Source 
It no longer needs sdb_entry_ex.

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 03:36:31 +01:00
parent 57829933c3
commit d3770c7d96
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/kdc/db-glue.c
View File

@ -1344,9 +1344,8 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
unsigned flags, unsigned flags,
uint32_t kvno, uint32_t kvno,
struct ldb_message *msg, 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; struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
const char *our_realm = lpcfg_realm(lp_ctx); const char *our_realm = lpcfg_realm(lp_ctx);
char *partner_realm = NULL; char *partner_realm = NULL;
@ -1944,6 +1943,7 @@ static krb5_error_code samba_kdc_fetch_krbtgt(krb5_context context,
uint32_t kvno, uint32_t kvno,
struct sdb_entry_ex *entry_ex) struct sdb_entry_ex *entry_ex)
{ {
struct sdb_entry *entry = &entry_ex->entry;
struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx; struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
krb5_error_code ret; krb5_error_code ret;
struct ldb_message *msg = NULL; 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, ret = samba_kdc_trust_message2entry(context, kdc_db_ctx, mem_ctx,
direction, direction,
realm_dn, flags, kvno, msg, entry_ex); realm_dn, flags, kvno, msg, entry);
if (ret != 0) { if (ret != 0) {
krb5_warnx(context, "samba_kdc_fetch: trust_message2entry failed for %s", krb5_warnx(context, "samba_kdc_fetch: trust_message2entry failed for %s",
ldb_dn_get_linearized(msg->dn)); ldb_dn_get_linearized(msg->dn));