From 30b8c8b9985a5eb41e700b80fd03f95548e45fba Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Feb 17 2020 15:40:16 +0000 Subject: kdb: make sure audit_as_req callback signature change is preserved audit_as_req() callback has changed its signature with MIT krb5 commit 20991d55efbe1f987c1dbc1065f2d58c8f34031b in 2017, we should preserve the change for any newer DAL versions. Otherwise audit_as_req() callback would reference wrong data and we might crash. Fixes: https://pagure.io/freeipa/issue/8200 Signed-off-by: Alexander Bokovoy Reviewed-By: Christian Heimes --- diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h index 7519f26..ae37a5a 100644 --- a/daemons/ipa-kdb/ipa_kdb.h +++ b/daemons/ipa-kdb/ipa_kdb.h @@ -345,7 +345,7 @@ krb5_error_code ipadb_check_allowed_to_delegate(krb5_context kcontext, void ipadb_audit_as_req(krb5_context kcontext, krb5_kdc_req *request, -#if (KRB5_KDB_DAL_MAJOR_VERSION == 7) +#if (KRB5_KDB_DAL_MAJOR_VERSION >= 7) const krb5_address *local_addr, const krb5_address *remote_addr, #endif diff --git a/daemons/ipa-kdb/ipa_kdb_audit_as.c b/daemons/ipa-kdb/ipa_kdb_audit_as.c index 77748a7..a60bc82 100644 --- a/daemons/ipa-kdb/ipa_kdb_audit_as.c +++ b/daemons/ipa-kdb/ipa_kdb_audit_as.c @@ -25,7 +25,7 @@ void ipadb_audit_as_req(krb5_context kcontext, krb5_kdc_req *request, -#if (KRB5_KDB_DAL_MAJOR_VERSION == 7) +#if (KRB5_KDB_DAL_MAJOR_VERSION >= 7) const krb5_address *local_addr, const krb5_address *remote_addr, #endif