sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-kdc/db_glue: pass down only a samba_kdc_entry to samba_kdc_check_pkinit_ms_upn_match().

Browse Source 
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Günther Deschner 2014-05-09 14:56:22 +02:00
parent 7afd9e6aca
commit f4b087b483
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1930,7 +1930,7 @@ samba_kdc_check_s4u2self(krb5_context context,
krb5_error_code
samba_kdc_check_pkinit_ms_upn_match(krb5_context context,
struct samba_kdc_db_context *kdc_db_ctx,
hdb_entry_ex *entry,
struct samba_kdc_entry *skdc_entry,
krb5_const_principal certificate_principal)
{
krb5_error_code ret;
@ -1938,7 +1938,6 @@ samba_kdc_check_pkinit_ms_upn_match(krb5_context context,
struct ldb_message *msg;
struct dom_sid *orig_sid;
struct dom_sid *target_sid;
struct samba_kdc_entry *p = talloc_get_type(entry->ctx, struct samba_kdc_entry);
const char *ms_upn_check_attrs[] = {
"objectSid", NULL
};
@ -1960,7 +1959,7 @@ samba_kdc_check_pkinit_ms_upn_match(krb5_context context,
return ret;
}
orig_sid = samdb_result_dom_sid(mem_ctx, p->msg, "objectSid");
orig_sid = samdb_result_dom_sid(mem_ctx, skdc_entry->msg, "objectSid");
target_sid = samdb_result_dom_sid(mem_ctx, msg, "objectSid");
/* Consider these to be the same principal, even if by a different

2
source4/kdc/db-glue.h
View File

@ -45,7 +45,7 @@ samba_kdc_check_s4u2self(krb5_context context,
krb5_error_code
samba_kdc_check_pkinit_ms_upn_match(krb5_context context,
struct samba_kdc_db_context *kdc_db_ctx,
hdb_entry_ex *entry,
struct samba_kdc_entry *skdc_entry,
krb5_const_principal certificate_principal);
krb5_error_code

5
source4/kdc/hdb-samba4.c
View File

@ -143,12 +143,15 @@ hdb_samba4_check_pkinit_ms_upn_match(krb5_context context, HDB *db,
krb5_const_principal certificate_principal)
{
struct samba_kdc_db_context *kdc_db_ctx;
struct samba_kdc_entry *skdc_entry;
kdc_db_ctx = talloc_get_type_abort(db->hdb_db,
struct samba_kdc_db_context);
skdc_entry = talloc_get_type_abort(entry->ctx,
struct samba_kdc_entry);
return samba_kdc_check_pkinit_ms_upn_match(context, kdc_db_ctx,
entry,
skdc_entry,
certificate_principal);
}