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

s4:kdc: Pull auth_sam_trigger_repl_secret() up one layer to samba_kdc_message2entry()

Browse Source 
This avoids making a call out in samba_kdc_message2entry_keys() and allows
for potential reuse of the key parsing code.

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2022-03-23 10:13:54 +13:00 committed by Stefan Metzmacher
parent 2684856aac
commit 2340a9a44f
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -904,21 +904,6 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
}
entry->kvno = returned_kvno;
if (entry->keys.len == 0) {
if (kdc_db_ctx->rodc) {
/* We are on an RODC, but don't have keys for this account. Signal this to the caller */
auth_sam_trigger_repl_secret(kdc_db_ctx, kdc_db_ctx->msg_ctx,
kdc_db_ctx->ev_ctx, msg->dn);
return SDB_ERR_NOT_FOUND_HERE;
}
/*
* oh, no password. Apparently (comment in
* hdb-ldap.c) this violates the ASN.1, but this
* allows an entry with no keys (yet).
*/
}
out:
return ret;
}
@ -1421,6 +1406,26 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
goto out;
}
if (entry->keys.len == 0) {
if (kdc_db_ctx->rodc) {
/*
* We are on an RODC, but don't have keys for this
* account. Signal this to the caller
*/
auth_sam_trigger_repl_secret(kdc_db_ctx,
kdc_db_ctx->msg_ctx,
kdc_db_ctx->ev_ctx,
msg->dn);
return SDB_ERR_NOT_FOUND_HERE;
}
/*
* oh, no password. Apparently (comment in
* hdb-ldap.c) this violates the ASN.1, but this
* allows an entry with no keys (yet).
*/
}
p->msg = talloc_steal(p, msg);
p->supported_enctypes = supported_enctypes;