diff options
| author | Günther Deschner <gd@samba.org> | 2014-05-09 14:56:22 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2015-03-27 01:26:16 +0100 |
| commit | f4b087b4833cde5b20310f46d16020bef87b46c6 (patch) | |
| tree | 3034d342546598b48c180d89bc17adfaacb192e7 | |
| parent | 7afd9e6aca49e78d25d1415ad5739df873c17d94 (diff) | |
| download | samba-f4b087b4833cde5b20310f46d16020bef87b46c6.tar.gz | |
s4-kdc/db_glue: pass down only a samba_kdc_entry to samba_kdc_check_pkinit_ms_upn_match().
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source4/kdc/db-glue.c | 5 | ||||
| -rw-r--r-- | source4/kdc/db-glue.h | 2 | ||||
| -rw-r--r-- | source4/kdc/hdb-samba4.c | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index 9eace2e2414..827a9b958d4 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -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 diff --git a/source4/kdc/db-glue.h b/source4/kdc/db-glue.h index 7f07f19689c..0d86e4bfdc9 100644 --- a/source4/kdc/db-glue.h +++ b/source4/kdc/db-glue.h @@ -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 diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c index 6e4f5c21fa2..04b520087b9 100644 --- a/source4/kdc/hdb-samba4.c +++ b/source4/kdc/hdb-samba4.c @@ -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); } |