From 0d91a32452a73feb61f625483af5ea86248fa292 Mon Sep 17 00:00:00 2001 From: Julien Rische Date: Wed, 21 Jun 2023 15:58:59 +0200 Subject: [PATCH] Rely on sssd-krb5 to include SSSD-generated krb5 configuration Resolves: RHBZ#2214563 Signed-off-by: Julien Rische --- ipa.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ipa.spec b/ipa.spec index c30d4d5..384f800 100644 --- a/ipa.spec +++ b/ipa.spec @@ -189,7 +189,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 2%{?rc_version:.%rc_version}%{?dist} +Release: 3%{?rc_version:.%rc_version}%{?dist} Summary: The Identity, Policy and Audit system License: GPLv3+ @@ -668,6 +668,7 @@ Requires: jansson %endif Requires: sssd-ipa >= %{sssd_version} Requires: sssd-idp >= %{sssd_version} +Requires: sssd-krb5 >= %{sssd_version} Requires: certmonger >= %{certmonger_version} Requires: nss-tools >= %{nss_version} Requires: bind-utils @@ -1229,10 +1230,8 @@ if [ $1 -gt 1 ] ; then test -f '/var/lib/ipa-client/sysrestore/sysrestore.index' && restore=$(wc -l '/var/lib/ipa-client/sysrestore/sysrestore.index' | awk '{print $1}') if [ -f '/etc/sssd/sssd.conf' -a $restore -ge 2 ]; then - if ! grep -E -q '/var/lib/sss/pubconf/krb5.include.d/' /etc/krb5.conf 2>/dev/null ; then - echo "includedir /var/lib/sss/pubconf/krb5.include.d/" > /etc/krb5.conf.ipanew - cat /etc/krb5.conf >> /etc/krb5.conf.ipanew - mv -Z /etc/krb5.conf.ipanew /etc/krb5.conf + if grep -E -q '/var/lib/sss/pubconf/krb5.include.d/' /etc/krb5.conf 2>/dev/null ; then + sed -i '\;includedir /var/lib/sss/pubconf/krb5.include.d;d' /etc/krb5.conf fi fi @@ -1727,6 +1726,10 @@ fi %endif %changelog +* Wed Jun 21 2023 Julien Rische - 4.9.12-3 +- Rely on sssd-krb5 to include SSSD-generated krb5 configuration + Resolves: RHBZ#2214563 + * Thu May 25 2023 Rafael Jeffman - 4.9.12-1 - Use the OpenSSL certificate parser in cert-find Resolves: RHBZ#2209947