From 30b8c8b9985a5eb41e700b80fd03f95548e45fba Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 17 Feb 2020 13:58:51 +0200 Subject: [PATCH] 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 --- daemons/ipa-kdb/ipa_kdb.h | 2 +- daemons/ipa-kdb/ipa_kdb_audit_as.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h index 7519f26e26..ae37a5a033 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 77748a75d6..a60bc82b6d 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 #From 4eb48492b354ecc30ffe1dd9654dcc0e0e833d64 Mon Sep 17 00:00:00 2001 #From: Alexander Bokovoy #Date: Mon, 17 Feb 2020 14:21:10 +0200 #Subject: [PATCH] Azure Pipelines: re-enable nodejs:12 stream for Fedora 31+ # #Reviewed-By: Christian Heimes #--- # ipatests/azure/templates/prepare-build.yml | 1 + # 1 file changed, 1 insertion(+) # #diff --git a/ipatests/azure/templates/prepare-build.yml b/ipatests/azure/templates/prepare-build.yml #index 0528efe129..643910f085 100644 #--- a/ipatests/azure/templates/prepare-build.yml #+++ b/ipatests/azure/templates/prepare-build.yml #@@ -13,6 +13,7 @@ steps: # for metalink in $(sudo dnf repolist -v |grep Repo-metalink | awk '{print $2}' ) ; do echo '###############' ; echo '####' ; echo $metalink ; echo '####' ; curl $metalink ; done # echo "Fastestmirror results:" # sudo cat /var/cache/dnf/fastestmirror.cache #+ sudo dnf -y module enable nodejs:12 # sudo dnf makecache || : # echo "Installing base development environment" # sudo dnf install -y \