78 changed files with 9959 additions and 11755 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,140 @@
-SOURCES/freeipa-4.9.13.tar.gz
+/freeipa-2.0.0GIT442d6ad.tar.gz
 /freeipa-2.0.0.pre2.tar.gz
 /freeipa-2.0.0.rc1.tar.gz
 /freeipa-2.0.0.rc2.tar.gz
 /freeipa-2.0.0.tar.gz
 /freeipa-2.0.1.tar.gz
 /freeipa-2.1.0.tar.gz
 /freeipa-2.1.2.tar.gz
 /freeipa-2.1.2-2.1.3.patch.gz
 /freeipa-2.1.3-systemd.patch.gz
 /freeipa-2.1.3.tar.gz
 /freeipa-2.1.3-wait_for_socket.patch.gz
 /freeipa-2.1.4.tar.gz
 /freeipa-2.1.90.pre1.tar.gz
 /freeipa-2.1.90.rc1.tar.gz
 /freeipa-2.2.0.tar.gz
 /freeipa-3.0.0.pre1.tar.gz
 /freeipa-3.0.0.pre2.tar.gz
 /freeipa-3.0.0.rc1.tar.gz
 /freeipa-3.0.0.rc2.tar.gz
 /freeipa-3.0.0.tar.gz
 /freeipa-3.1.0.tar.gz
 /freeipa-3.1.2.tar.gz
 /freeipa-3.2.0.pre1.tar.gz
 /freeipa-3.2.0.tar.gz
 /freeipa-3.2.2.tar.gz
 /freeipa-3.3.0.tar.gz
 /freeipa-3.3.1.tar.gz
 /freeipa-3.3.3.tar.gz
 /freeipa-3.3.4.tar.gz
 /freeipa-3.3.5.tar.gz
 /freeipa-4.0.0.tar.gz
 /freeipa-4.0.1.tar.gz
 /freeipa-4.0.2.tar.gz
 /freeipa-4.0.3.tar.gz
 /freeipa-4.1.0.tar.gz
 /freeipa-4.1.1.tar.gz
 /freeipa-4.1.2.tar.gz
 /freeipa-4.1.3.tar.gz
 /freeipa-4.1.4.tar.gz
 /freeipa-4.2.1.tar.gz
 /freeipa-4.2.2.tar.gz
 /freeipa-4.2.3.tar.gz
 /freeipa-4.3.0.tar.gz
 /freeipa-4.3.1.tar.gz
 /freeipa-4.3.2.tar.gz
 /freeipa-4.4.1.tar.gz
 /freeipa-4.4.2.tar.gz
 /freeipa-4.4.3.tar.gz
 /freeipa-4.4.4.tar.gz
 /freeipa-4.4.4.tar.gz.asc
 /freeipa-4.5.1.tar.gz
 /freeipa-4.5.1.tar.gz.asc
 /freeipa-4.5.2.tar.gz
 /freeipa-4.5.2.tar.gz.asc
 /freeipa-4.5.3.tar.gz
 /freeipa-4.5.3.tar.gz.asc
 /freeipa-4.6.0.tar.gz
 /freeipa-4.6.0.tar.gz.asc
 /freeipa-4.6.1.tar.gz
 /freeipa-4.6.1.tar.gz.asc
 /freeipa-4.6.3.tar.gz
 /freeipa-4.6.3.tar.gz.asc
 /freeipa-4.6.90.pre1-1.fc29.src.rpm
 /freeipa-4.6.90.pre1.tar.gz
 /freeipa-4.6.90.pre1.tar.gz.asc
 /freeipa-4.6.90.pre2.tar.gz
 /freeipa-4.6.90.pre2.tar.gz.asc
 /freeipa-4.7.0.tar.gz
 /freeipa-4.7.0.tar.gz.asc
 /freeipa-4.7.1.tar.gz
 /freeipa-4.7.1.tar.gz.asc
 /freeipa-4.7.2.tar.gz
 /freeipa-4.7.2.tar.gz.asc
 /freeipa-4.7.90.pre1.tar.gz
 /freeipa-4.7.90.pre1.tar.gz.asc
 /freeipa-4.8.0.tar.gz
 /freeipa-4.8.0.tar.gz.asc
 /freeipa-4.8.1.tar.gz
 /freeipa-4.8.1.tar.gz.asc
 /freeipa-4.8.2.tar.gz
 /freeipa-4.8.2.tar.gz.asc
 /freeipa-4.8.3.tar.gz
 /freeipa-4.8.3.tar.gz.asc
 /freeipa-4.8.4.tar.gz
 /freeipa-4.8.4.tar.gz.asc
 /freeipa-4.8.5.tar.gz
 /freeipa-4.8.5.tar.gz.asc
 /freeipa-4.8.6.tar.gz
 /freeipa-4.8.6.tar.gz.asc
 /freeipa-4.8.7.tar.gz
 /freeipa-4.8.7.tar.gz.asc
 /freeipa-4.8.9.tar.gz
 /freeipa-4.8.9.tar.gz.asc
 /freeipa-4.8.10.tar.gz
 /freeipa-4.8.10.tar.gz.asc
 /freeipa-4.9.0rc1.tar.gz
 /freeipa-4.9.0rc1.tar.gz.asc
 /freeipa-4.9.0rc2.tar.gz
 /freeipa-4.9.0rc2.tar.gz.asc
 /freeipa-4.9.0rc3.tar.gz
 /freeipa-4.9.0rc3.tar.gz.asc
 /freeipa-4.9.0.tar.gz
 /freeipa-4.9.0.tar.gz.asc
 /freeipa-4.9.1.tar.gz
 /freeipa-4.9.1.tar.gz.asc
 /freeipa-4.9.2.tar.gz
 /freeipa-4.9.2.tar.gz.asc
 /freeipa-4.9.3.tar.gz
 /freeipa-4.9.3.tar.gz.asc
 /freeipa-4.9.4.tar.gz
 /freeipa-4.9.4.tar.gz.asc
 /freeipa-4.9.6.tar.gz
 /freeipa-4.9.6.tar.gz.asc
 /freeipa-4.9.7.tar.gz
 /freeipa-4.9.7.tar.gz.asc
 /freeipa-4.9.8.tar.gz
 /freeipa-4.9.8.tar.gz.asc
 /freeipa-4.9.9.tar.gz
 /freeipa-4.9.9.tar.gz.asc
 /freeipa-4.9.10.tar.gz
 /freeipa-4.9.10.tar.gz.asc
 /freeipa-4.10.0.tar.gz
 /freeipa-4.10.0.tar.gz.asc
 /freeipa-4.10.1.tar.gz
 /freeipa-4.10.1.tar.gz.asc
 /freeipa-4.10.2.tar.gz
 /freeipa-4.10.2.tar.gz.asc
 /freeipa-4.11.0beta1.tar.gz
 /freeipa-4.11.0beta1.tar.gz.asc
 /freeipa-4.11.0.tar.gz
 /freeipa-4.11.0.tar.gz.asc
 /freeipa-4.11.1.tar.gz
 /freeipa-4.11.1.tar.gz.asc
 /freeipa-4.12.0.tar.gz
 /freeipa-4.12.0.tar.gz.asc
 /freeipa-4.12.1.tar.gz.asc
 /freeipa-4.12.1.tar.gz
 /freeipa-4.12.2.tar.gz
 /freeipa-4.12.2.tar.gz.asc
--- a/.ipa.metadata
+++ b/.ipa.metadata
@ -1 +0,0 @@
 da1bb0220894d8dc06afb98dcf087fea38076a79 SOURCES/freeipa-4.9.13.tar.gz
--- a/0002-freeipa-disable-nis.patch
+++ b/0002-freeipa-disable-nis.patch
@ -0,0 +1,900 @@
 From da1ec155fb5d5afc29b70ff4d68f0d774aa7f245 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Mon, 29 Apr 2024 10:10:08 +0300
 Subject: [PATCH] Remove NIS server support
  RHEL 8.3+ already deprecated support for NIS protocol.
  RHEL 9 does not ship NIS client side
  RHEL 10 removes NIS server emulator support
 Remove NIS server integration from the migration and
 management tools.
 Fixes: https://pagure.io/freeipa/issue/9363
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 freeipa.spec.in                            |   2 -
 install/share/Makefile.am                  |   2 -
 install/share/nis-update.uldif             |  38 ----
 install/share/nis.uldif                    |  96 ----------
 install/tools/Makefile.am                  |   2 -
 install/tools/ipa-compat-manage.in         |  17 +-
 install/tools/ipa-nis-manage.in            | 205 ---------------------
 install/tools/man/Makefile.am              |   1 -
 install/tools/man/ipa-nis-manage.1         |  51 -----
 install/updates/10-enable-betxn.update     |   3 -
 install/updates/50-nis.update              |   3 -
 install/updates/Makefile.am                |   1 -
 ipaplatform/base/paths.py                  |   2 -
 ipaserver/install/ipa_migrate.py           |  27 +--
 ipaserver/install/ipa_migrate_constants.py |  24 ---
 ipaserver/install/plugins/update_nis.py    |  92 ---------
 ipatests/test_cmdline/test_cli.py          |   1 -
 ipatests/test_integration/test_commands.py |  87 ---------
 18 files changed, 16 insertions(+), 638 deletions(-)
 delete mode 100644 install/share/nis-update.uldif
 delete mode 100644 install/share/nis.uldif
 delete mode 100644 install/tools/ipa-nis-manage.in
 delete mode 100644 install/tools/man/ipa-nis-manage.1
 delete mode 100644 install/updates/50-nis.update
 delete mode 100644 ipaserver/install/plugins/update_nis.py
 diff --git a/freeipa.spec.in b/freeipa.spec.in
 index e370290bc..b5e33a6ac 100755
 --- a/freeipa.spec.in
 +++ b/freeipa.spec.in
@@ -1508,7 +1508,6 @@ fi
 %{_sbindir}/ipa-ldap-updater
 %{_sbindir}/ipa-otptoken-import
 %{_sbindir}/ipa-compat-manage
 -%{_sbindir}/ipa-nis-manage
 %{_sbindir}/ipa-managed-entries
 %{_sbindir}/ipactl
 %{_sbindir}/ipa-advise
@@ -1583,7 +1582,6 @@ fi
 %{_mandir}/man1/ipa-ca-install.1*
 %{_mandir}/man1/ipa-kra-install.1*
 %{_mandir}/man1/ipa-compat-manage.1*
 -%{_mandir}/man1/ipa-nis-manage.1*
 %{_mandir}/man1/ipa-managed-entries.1*
 %{_mandir}/man1/ipa-ldap-updater.1*
 %{_mandir}/man8/ipactl.8*
 diff --git a/install/share/Makefile.am b/install/share/Makefile.am
 index 4029297b7..24664ca3b 100644
 --- a/install/share/Makefile.am
 +++ b/install/share/Makefile.am
@@ -67,8 +67,6 @@ dist_app_DATA =				\
 	master-entry.ldif		\
 	memberof-task.ldif		\
 	memberof-conf.ldif		\
 -	nis.uldif			\
 -	nis-update.uldif			\
 	opendnssec_conf.template	\
 	opendnssec_kasp.template	\
 	unique-attributes.ldif		\
 diff --git a/install/share/nis-update.uldif b/install/share/nis-update.uldif
 deleted file mode 100644
 index e602c1de0..000000000
 --- a/install/share/nis-update.uldif
 +++ /dev/null
@@ -1,38 +0,0 @@
 -# Updates for NIS
 -
 -# Correct syntax error that caused users to not appear
 -dn: nis-domain=$DOMAIN+nis-map=netgroup, cn=NIS Server, cn=plugins, cn=config
 -replace:nis-value-format: %merge(" ","%{memberNisNetgroup}","(%link(\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%{externalHost}\\\\\\\",\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\",\",\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\"%deref(\\\\\\\"memberUser\\\\\\\",\\\\\\\"uid\\\\\\\")\\\",\\\"%deref_r(\\\\\\\"member\\\\\\\",\\\\\\\"uid\\\\\\\")\\\",\\\"%deref_r(\\\\\\\"memberUser\\\\\\\",\\\\\\\"member\\\\\\\",\\\\\\\"uid\\\\\\\")\\\")\\\")\",\"-\"),%{nisDomainName:-})")::%merge(" ","%{memberNisNetgroup}","(%link(\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%{externalHost}\\\\\\\",\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\",\",\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\"),%{nisDomainName:-})")
 -
 -# Correct syntax error that caused nested netgroups to not work
 -# https://bugzilla.redhat.com/show_bug.cgi?id=788625
 -dn: nis-domain=$DOMAIN+nis-map=netgroup, cn=NIS Server, cn=plugins, cn=config
 -replace:nis-value-format: %merge(" ","%{memberNisNetgroup}","(%link(\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%{externalHost}\\\\\\\",\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\",\",\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\"),%{nisDomainName:-})")::%merge(" ","%deref_f(\"member\",\"(objectclass=ipanisNetgroup)\",\"cn\")","(%link(\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%{externalHost}\\\\\\\",\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\",\",\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\"),%{nisDomainName:-})")
 -
 -# Make the padding an expression so usercat and hostcat always gets
 -# evaluated when displaying entries.
 -# https://bugzilla.redhat.com/show_bug.cgi?id=767372
 -dn: nis-domain=$DOMAIN+nis-map=netgroup, cn=NIS Server, cn=plugins, cn=config
 -replace:nis-value-format: %merge(" ","%deref_f(\"member\",\"(objectclass=ipanisNetgroup)\",\"cn\")","(%link(\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%{externalHost}\\\\\\\",\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\",\",\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"-\"),%{nisDomainName:-})")::%merge(" ","%deref_f(\"member\",\"(objectclass=ipanisNetgroup)\",\"cn\")","(%link(\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%{externalHost}\\\\\\\",\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"-\\\")\",\",\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"-\\\")\"),%{nisDomainName:-})")
 -
 -dn: nis-domain=$DOMAIN+nis-map=ethers.byaddr, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: ethers.byaddr
 -default:nis-base: cn=computers, cn=accounts, $SUFFIX
 -default:nis-filter: (&(macAddress=*)(fqdn=*)(objectClass=ipaHost))
 -default:nis-keys-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%1:%2:%3:%4:%5:%6")
 -default:nis-values-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%1:%2:%3:%4:%5:%6 %7")
 -default:nis-secure: no
 -
 -dn: nis-domain=$DOMAIN+nis-map=ethers.byname, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: ethers.byname
 -default:nis-base: cn=computers, cn=accounts, $SUFFIX
 -default:nis-filter: (&(macAddress=*)(fqdn=*)(objectClass=ipaHost))
 -default:nis-keys-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%7")
 -default:nis-values-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%1:%2:%3:%4:%5:%6 %7")
 -default:nis-secure: no
 diff --git a/install/share/nis.uldif b/install/share/nis.uldif
 deleted file mode 100644
 index 1735fb552..000000000
 --- a/install/share/nis.uldif
 +++ /dev/null
@@ -1,96 +0,0 @@
 -dn: cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: nsSlapdPlugin
 -default:objectclass: extensibleObject
 -default:cn: NIS Server
 -default:nsslapd-pluginpath: /usr/lib$LIBARCH/dirsrv/plugins/nisserver-plugin.so
 -default:nsslapd-plugininitfunc: nis_plugin_init
 -default:nsslapd-plugintype: object
 -default:nsslapd-pluginbetxn: on
 -default:nsslapd-pluginenabled: on
 -default:nsslapd-pluginid: nis-server
 -default:nsslapd-pluginversion: 0.10
 -default:nsslapd-pluginvendor: redhat.com
 -default:nsslapd-plugindescription: NIS Server Plugin
 -default:nis-tcp-wrappers-name: nis-server
 -
 -dn: nis-domain=$DOMAIN+nis-map=passwd.byname, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: passwd.byname
 -default:nis-base: cn=users, cn=accounts, $SUFFIX
 -default:nis-secure: no
 -
 -dn: nis-domain=$DOMAIN+nis-map=passwd.byuid, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: passwd.byuid
 -default:nis-base: cn=users, cn=accounts, $SUFFIX
 -default:nis-secure: no
 -
 -dn: nis-domain=$DOMAIN+nis-map=group.byname, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: group.byname
 -default:nis-base: cn=groups, cn=accounts, $SUFFIX
 -default:nis-secure: no
 -
 -dn: nis-domain=$DOMAIN+nis-map=group.bygid, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: group.bygid
 -default:nis-base: cn=groups, cn=accounts, $SUFFIX
 -default:nis-secure: no
 -
 -dn: nis-domain=$DOMAIN+nis-map=netid.byname, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: netid.byname
 -default:nis-base: cn=users, cn=accounts, $SUFFIX
 -default:nis-secure: no
 -
 -# Note that the escapes in this entry can be quite confusing. The trick
 -# is that each level of nesting requires (2^n) - 1 escapes. So the
 -# first level is \", the second is \\\", the third is \\\\\\\", etc.
 -# (1, 3, 7, 15, more than that and you'll go insane)
 -
 -# Note that this configuration mirrors the Schema Compat configuration for
 -# triples.
 -dn: nis-domain=$DOMAIN+nis-map=netgroup, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: netgroup
 -default:nis-base: cn=ng, cn=alt, $SUFFIX
 -default:nis-filter: (objectClass=ipanisNetgroup)
 -default:nis-key-format: %{cn}
 -default:nis-value-format:%merge(" ","%deref_f(\"member\",\"(objectclass=ipanisNetgroup)\",\"cn\")","(%link(\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%{externalHost}\\\\\\\",\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberHost\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"fqdn\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"%ifeq(\\\"hostCategory\\\",\\\"all\\\",\\\"\\\",\\\"-\\\")\",\",\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"%collect(\\\\\\\"%deref(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\",\\\\\\\"%deref_r(\\\\\\\\\\\\\\\"memberUser\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"member\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"uid\\\\\\\\\\\\\\\")\\\\\\\")\\\")\",\"%ifeq(\\\"userCategory\\\",\\\"all\\\",\\\"\\\",\\\"-\\\")\"),%{nisDomainName:-})")
 -default:nis-secure: no
 -
 -dn: nis-domain=$DOMAIN+nis-map=ethers.byaddr, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: ethers.byaddr
 -default:nis-base: cn=computers, cn=accounts, $SUFFIX
 -default:nis-filter: (&(macAddress=*)(fqdn=*)(objectClass=ipaHost))
 -default:nis-keys-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%1:%2:%3:%4:%5:%6")
 -default:nis-values-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%1:%2:%3:%4:%5:%6 %7")
 -default:nis-secure: no
 -
 -dn: nis-domain=$DOMAIN+nis-map=ethers.byname, cn=NIS Server, cn=plugins, cn=config
 -default:objectclass: top
 -default:objectclass: extensibleObject
 -default:nis-domain: $DOMAIN
 -default:nis-map: ethers.byname
 -default:nis-base: cn=computers, cn=accounts, $SUFFIX
 -default:nis-filter: (&(macAddress=*)(fqdn=*)(objectClass=ipaHost))
 -default:nis-keys-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%7")
 -default:nis-values-format: %mregsub("%{macAddress} %{fqdn}","(..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..)[:\\\|-](..) (.*)","%1:%2:%3:%4:%5:%6 %7")
 -default:nis-secure: no
 -
 diff --git a/install/tools/Makefile.am b/install/tools/Makefile.am
 index c454fad97..a5306ffe9 100644
 --- a/install/tools/Makefile.am
 +++ b/install/tools/Makefile.am
@@ -19,7 +19,6 @@ dist_noinst_DATA =		\
 	ipa-server-upgrade.in	\
 	ipactl.in			\
 	ipa-compat-manage.in	\
 -	ipa-nis-manage.in		\
 	ipa-managed-entries.in     \
 	ipa-ldap-updater.in	\
 	ipa-otptoken-import.in	\
@@ -56,7 +55,6 @@ nodist_sbin_SCRIPTS =		\
 	ipa-server-upgrade	\
 	ipactl			\
 	ipa-compat-manage	\
 -	ipa-nis-manage		\
 	ipa-managed-entries     \
 	ipa-ldap-updater	\
 	ipa-otptoken-import	\
 diff --git a/install/tools/ipa-compat-manage.in b/install/tools/ipa-compat-manage.in
 index 459f39fc8..70dd7c451 100644
 --- a/install/tools/ipa-compat-manage.in
 +++ b/install/tools/ipa-compat-manage.in
@@ -26,6 +26,7 @@ from ipaplatform.paths import paths
 try:
     from optparse import OptionParser  # pylint: disable=deprecated-module
     from ipapython import ipautil, config
 +    from ipapython.ipaldap import realm_to_serverid
     from ipaserver.install import installutils
     from ipaserver.install.ldapupdate import LDAPUpdate
     from ipalib import api, errors
@@ -150,9 +151,19 @@ def main():
         try:
             entry = get_entry(nis_config_dn)
             # We can't disable schema compat if the NIS plugin is enabled
 -            if entry is not None and entry.get('nsslapd-pluginenabled', [''])[0].lower() == 'on':
 -                print("The NIS plugin is configured, cannot disable compatibility.", file=sys.stderr)
 -                print("Run 'ipa-nis-manage disable' first.", file=sys.stderr)
 +            if (
 +                entry is not None
 +                and entry.get("nsslapd-pluginenabled", [""])[0].lower() == "on"
 +            ):
 +                instance = realm_to_serverid(api.env.realm)
 +                print(
 +                    "The NIS plugin is configured, cannot "
 +                    "disable compatibility.", file=sys.stderr,
 +                )
 +                print(
 +                    f"Run \"dsconf {instance} plugin set --enabled off "
 +                    "'NIS Server'\" first.", file=sys.stderr,
 +                )
                 retval = 2
         except errors.ExecutionError as lde:
             print("An error occurred while talking to the server.")
 diff --git a/install/tools/ipa-nis-manage.in b/install/tools/ipa-nis-manage.in
 deleted file mode 100644
 index 6b156ce6a..000000000
 --- a/install/tools/ipa-nis-manage.in
 +++ /dev/null
@@ -1,205 +0,0 @@
 -#!/usr/bin/python3
 -# Authors: Rob Crittenden <rcritten@redhat.com>
 -# Authors: Simo Sorce <ssorce@redhat.com>
 -#
 -# Copyright (C) 2009  Red Hat
 -# see file 'COPYING' for use and warranty information
 -#
 -# This program is free software; you can redistribute it and/or modify
 -# it under the terms of the GNU General Public License as published by
 -# the Free Software Foundation, either version 3 of the License, or
 -# (at your option) any later version.
 -#
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -# GNU General Public License for more details.
 -#
 -# You should have received a copy of the GNU General Public License
 -# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -#
 -
 -from __future__ import print_function
 -
 -import sys
 -import os
 -from ipaplatform.paths import paths
 -try:
 -    from optparse import OptionParser  # pylint: disable=deprecated-module
 -    from ipapython import ipautil, config
 -    from ipaserver.install import installutils
 -    from ipaserver.install.ldapupdate import LDAPUpdate
 -    from ipalib import api, errors
 -    from ipapython.ipa_log_manager import standard_logging_setup
 -    from ipapython.dn import DN
 -    from ipaplatform import services
 -except ImportError as e:
 -    print("""\
 -There was a problem importing one of the required Python modules. The
 -error was:
 -
 -    %s
 -""" % e, file=sys.stderr)
 -    sys.exit(1)
 -
 -nis_config_dn = DN(('cn', 'NIS Server'), ('cn', 'plugins'), ('cn', 'config'))
 -compat_dn = DN(('cn', 'Schema Compatibility'), ('cn', 'plugins'), ('cn', 'config'))
 -
 -def parse_options():
 -    usage = "%prog [options] <enable|disable|status>\n"
 -    usage += "%prog [options]\n"
 -    parser = OptionParser(usage=usage, formatter=config.IPAFormatter())
 -
 -    parser.add_option("-d", "--debug", action="store_true", dest="debug",
 -                      help="Display debugging information about the update(s)")
 -    parser.add_option("-y", dest="password",
 -                      help="File containing the Directory Manager password")
 -
 -    config.add_standard_options(parser)
 -    options, args = parser.parse_args()
 -
 -    return options, args
 -
 -def get_dirman_password():
 -    """Prompt the user for the Directory Manager password and verify its
 -       correctness.
 -    """
 -    password = installutils.read_password("Directory Manager", confirm=False, validate=False, retry=False)
 -
 -    return password
 -
 -def get_entry(dn):
 -    """
 -    Return the entry for the given DN. If the entry is not found return
 -    None.
 -    """
 -    entry = None
 -    try:
 -        entry = api.Backend.ldap2.get_entry(dn)
 -    except errors.NotFound:
 -        pass
 -    return entry
 -
 -def main():
 -    retval = 0
 -    files = [paths.NIS_ULDIF]
 -    servicemsg = ""
 -
 -    if os.getegid() != 0:
 -        sys.exit('Must be root to use this tool.')
 -
 -    installutils.check_server_configuration()
 -
 -    options, args = parse_options()
 -
 -    if len(args) != 1:
 -        sys.exit("You must specify one action: enable | disable | status")
 -    elif args[0] not in {"enable", "disable", "status"}:
 -        sys.exit("Unrecognized action [" + args[0] + "]")
 -
 -    standard_logging_setup(None, debug=options.debug)
 -    dirman_password = ""
 -    if options.password:
 -        try:
 -            pw = ipautil.template_file(options.password, [])
 -        except IOError:
 -            sys.exit("File \"%s\" not found or not readable" % options.password)
 -        dirman_password = pw.strip()
 -    else:
 -        dirman_password = get_dirman_password()
 -        if dirman_password is None:
 -            sys.exit("Directory Manager password required")
 -
 -    if not dirman_password:
 -        sys.exit("No password supplied")
 -
 -    api.bootstrap(
 -        context='cli', confdir=paths.ETC_IPA,
 -        debug=options.debug, in_server=True)
 -    api.finalize()
 -    api.Backend.ldap2.connect(bind_pw=dirman_password)
 -
 -    if args[0] == "enable":
 -        compat = get_entry(compat_dn)
 -        if compat is None or compat.get('nsslapd-pluginenabled', [''])[0].lower() == 'off':
 -            sys.exit("The compat plugin needs to be enabled: ipa-compat-manage enable")
 -        entry = None
 -        try:
 -            entry = get_entry(nis_config_dn)
 -        except errors.ExecutionError as lde:
 -            print("An error occurred while talking to the server.")
 -            print(lde)
 -            retval = 1
 -
 -        # Enable either the portmap or rpcbind service
 -        portmap = services.knownservices.portmap
 -        rpcbind = services.knownservices.rpcbind
 -
 -        if portmap.is_installed():
 -            portmap.enable()
 -            servicemsg = portmap.service_name
 -        elif rpcbind.is_installed():
 -            rpcbind.enable()
 -            servicemsg = rpcbind.service_name
 -        else:
 -            print("Unable to enable either %s or %s" % (portmap.service_name, rpcbind.service_name))
 -            retval = 3
 -
 -        # The cn=config entry for the plugin may already exist but it
 -        # could be turned off, handle both cases.
 -        if entry is None:
 -            print("Enabling plugin")
 -            ld = LDAPUpdate()
 -            if ld.update(files) != True:
 -                retval = 1
 -        elif entry.get('nsslapd-pluginenabled', [''])[0].lower() == 'off':
 -            print("Enabling plugin")
 -            # Already configured, just enable the plugin
 -            entry['nsslapd-pluginenabled'] = ['on']
 -            api.Backend.ldap2.update_entry(entry)
 -        else:
 -            print("Plugin already Enabled")
 -            retval = 2
 -
 -    elif args[0] == "disable":
 -        try:
 -            entry = api.Backend.ldap2.get_entry(nis_config_dn, ['nsslapd-pluginenabled'])
 -            entry['nsslapd-pluginenabled'] = ['off']
 -            api.Backend.ldap2.update_entry(entry)
 -        except (errors.NotFound, errors.EmptyModlist):
 -            print("Plugin is already disabled")
 -            retval = 2
 -        except errors.LDAPError as lde:
 -            print("An error occurred while talking to the server.")
 -            print(lde)
 -            retval = 1
 -
 -    elif args[0] == "status":
 -        nis_entry = get_entry(nis_config_dn)
 -        enabled = (nis_entry and
 -                   nis_entry.get(
 -                       'nsslapd-pluginenabled', '')[0].lower() == "on")
 -        if enabled:
 -            print("Plugin is enabled")
 -            retval = 0
 -        else:
 -            print("Plugin is not enabled")
 -            retval = 4
 -
 -    else:
 -        retval = 1
 -
 -    if retval == 0:
 -        if args[0] in {"enable", "disable"}:
 -            print("This setting will not take effect until you restart "
 -                  "Directory Server.")
 -
 -        if args[0] == "enable":
 -            print("The %s service may need to be started." % servicemsg)
 -
 -    api.Backend.ldap2.disconnect()
 -
 -    return retval
 -
 -if __name__ == '__main__':
 -    installutils.run_script(main, operation_name='ipa-nis-manage')
 diff --git a/install/tools/man/Makefile.am b/install/tools/man/Makefile.am
 index 34f359863..282407602 100644
 --- a/install/tools/man/Makefile.am
 +++ b/install/tools/man/Makefile.am
@@ -18,7 +18,6 @@ dist_man1_MANS = 			\
 	ipa-kra-install.1		\
 	ipa-ldap-updater.1		\
 	ipa-compat-manage.1		\
 -	ipa-nis-manage.1		\
 	ipa-managed-entries.1		\
 	ipa-backup.1			\
 	ipa-restore.1			\
 diff --git a/install/tools/man/ipa-nis-manage.1 b/install/tools/man/ipa-nis-manage.1
 deleted file mode 100644
 index 1107b7790..000000000
 --- a/install/tools/man/ipa-nis-manage.1
 +++ /dev/null
@@ -1,51 +0,0 @@
 -.\" A man page for ipa-nis-manage
 -.\" Copyright (C) 2009 Red Hat, Inc.
 -.\"
 -.\" This program is free software; you can redistribute it and/or modify
 -.\" it under the terms of the GNU General Public License as published by
 -.\" the Free Software Foundation, either version 3 of the License, or
 -.\" (at your option) any later version.
 -.\"
 -.\" This program is distributed in the hope that it will be useful, but
 -.\" WITHOUT ANY WARRANTY; without even the implied warranty of
 -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -.\" General Public License for more details.
 -.\"
 -.\" You should have received a copy of the GNU General Public License
 -.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -.\"
 -.\" Author: Rob Crittenden <rcritten@redhat.com>
 -.\"
 -.TH "ipa-nis-manage" "1" "April 25 2016" "IPA" "IPA Manual Pages"
 -.SH "NAME"
 -ipa\-nis\-manage \- Enables or disables the NIS listener plugin
 -.SH "SYNOPSIS"
 -ipa\-nis\-manage [options] <enable|disable|status>
 -.SH "DESCRIPTION"
 -Run the command with the \fBenable\fR option to enable the NIS plugin.
 -
 -Run the command with the \fBdisable\fR option to disable the NIS plugin.
 -
 -Run the command with the \fBstatus\fR option to read status of the NIS plugin. Return code 0 indicates enabled plugin, return code 4 indicates disabled plugin.
 -
 -In all cases the user will be prompted to provide the Directory Manager's password unless option \fB\-y\fR is used.
 -
 -Directory Server will need to be restarted after the NIS listener plugin has been enabled.
 -
 -.SH "OPTIONS"
 -.TP
 -\fB\-d\fR, \fB\-\-debug\fR
 -Enable debug logging when more verbose output is needed
 -.TP
 -\fB\-y\fR \fIfile\fR
 -File containing the Directory Manager password
 -.SH "EXIT STATUS"
 -0 if the command was successful
 -
 -1 if an error occurred
 -
 -2 if the plugin is already in the required status (enabled or disabled)
 -
 -3 if RPC services cannot be enabled.
 -
 -4 if status command detected plugin in disabled state.
 diff --git a/install/updates/10-enable-betxn.update b/install/updates/10-enable-betxn.update
 index 1f89341c7..9525292cb 100644
 --- a/install/updates/10-enable-betxn.update
 +++ b/install/updates/10-enable-betxn.update
@@ -44,6 +44,3 @@ only: nsslapd-pluginbetxn: on
 dn: cn=Schema Compatibility, cn=plugins, cn=config
 onlyifexist: nsslapd-pluginbetxn: on
 -
 -dn: cn=NIS Server, cn=plugins, cn=config
 -onlyifexist: nsslapd-pluginbetxn: on
 diff --git a/install/updates/50-nis.update b/install/updates/50-nis.update
 deleted file mode 100644
 index 05a166f00..000000000
 --- a/install/updates/50-nis.update
 +++ /dev/null
@@ -1,3 +0,0 @@
 -# Updates are applied only if NIS plugin has been configured
 -# update definitions are located in install/share/nis-update.uldif
 -plugin: update_nis_configuration
 diff --git a/install/updates/Makefile.am b/install/updates/Makefile.am
 index fd96831d8..cce2670a6 100644
 --- a/install/updates/Makefile.am
 +++ b/install/updates/Makefile.am
@@ -52,7 +52,6 @@ app_DATA =				\
 	50-groupuuid.update		\
 	50-hbacservice.update		\
 	50-krbenctypes.update		\
 -	50-nis.update			\
 	50-ipaconfig.update		\
 	55-pbacmemberof.update		\
 	59-trusts-sysacount.update	\
 diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
 index b339d2202..aed293845 100644
 --- a/ipaplatform/base/paths.py
 +++ b/ipaplatform/base/paths.py
@@ -295,8 +295,6 @@ class BasePathNamespace:
     KRB_CON = "/usr/share/ipa/html/krb.con"
     HTML_KRB5_INI = "/usr/share/ipa/html/krb5.ini"
     HTML_KRBREALM_CON = "/usr/share/ipa/html/krbrealm.con"
 -    NIS_ULDIF = "/usr/share/ipa/nis.uldif"
 -    NIS_UPDATE_ULDIF = "/usr/share/ipa/nis-update.uldif"
     SCHEMA_COMPAT_ULDIF = "/usr/share/ipa/updates/91-schema_compat.update"
     SCHEMA_COMPAT_POST_ULDIF = "/usr/share/ipa/schema_compat_post.uldif"
     IPA_JS_PLUGINS_DIR = "/usr/share/ipa/ui/js/plugins"
 diff --git a/ipaserver/install/ipa_migrate.py b/ipaserver/install/ipa_migrate.py
 index e21937401..a889143ec 100644
 --- a/ipaserver/install/ipa_migrate.py
 +++ b/ipaserver/install/ipa_migrate.py
@@ -31,7 +31,7 @@ from ipapython.ipa_log_manager import standard_logging_setup
 from ipaserver.install.ipa_migrate_constants import (
     DS_CONFIG, DB_OBJECTS, DS_INDEXES, BIND_DN, LOG_FILE_NAME,
     STRIP_OP_ATTRS, STRIP_ATTRS, STRIP_OC, PROD_ATTRS,
 -    DNA_REGEN_VAL, DNA_REGEN_ATTRS, NIS_PLUGIN, IGNORE_ATTRS,
 +    DNA_REGEN_VAL, DNA_REGEN_ATTRS, IGNORE_ATTRS,
     DB_EXCLUDE_TREES
 )
@@ -718,8 +718,7 @@ class IPAMigrate():
         self.log_info(title)
         self.log_info('-' * (len(title) - 1))
         logged_something = self.log_stats(DS_CONFIG)
 -        if self.args.verbose or NIS_PLUGIN['count'] > 0:
 -            self.log_info(f" - NIS Server Plugin:       {NIS_PLUGIN['count']}")
 +        if self.args.verbose:
             logged_something = True
         if not self.log_stats(DS_INDEXES) and not logged_something:
             self.log_info(" - No updates")
@@ -1847,28 +1846,6 @@ class IPAMigrate():
                         add_missing=True)
                     stats['config_processed'] += 1
 -            # Slapi NIS Plugin
 -            if DN(NIS_PLUGIN['dn']) == DN(entry['dn']):
 -                # Parent plugin entry
 -                self.process_config_entry(
 -                    entry['dn'], entry['attrs'], NIS_PLUGIN,
 -                    add_missing=True)
 -                stats['config_processed'] += 1
 -            elif DN(NIS_PLUGIN['dn']) in DN(entry['dn']):
 -                # Child NIS plugin entry
 -                nis_dn = entry['dn']
 -                lc_remote_realm = self.remote_realm.lower()
 -                lc_realm = self.realm.lower()
 -                nis_dn = nis_dn.replace(lc_remote_realm, lc_realm)
 -                if 'nis-domain' in entry['attrs']:
 -                    value = entry['attrs']['nis-domain'][0]
 -                    value = value.replace(lc_remote_realm, lc_realm)
 -                    entry['attrs']['nis-domain'][0] = value
 -                # Process the entry
 -                self.process_config_entry(nis_dn, entry['attrs'], NIS_PLUGIN,
 -                                          add_missing=True)
 -                stats['config_processed'] += 1
 -
     #
     # Migration
     #
 diff --git a/ipaserver/install/ipa_migrate_constants.py b/ipaserver/install/ipa_migrate_constants.py
 index 0e26c7549..e0e504741 100644
 --- a/ipaserver/install/ipa_migrate_constants.py
 +++ b/ipaserver/install/ipa_migrate_constants.py
@@ -502,30 +502,6 @@ DS_CONFIG = {
     },
 }
 -#
 -# Slpai NIS is an optional plugin.  It requires special handling
 -#
 -NIS_PLUGIN = {
 -    'dn': 'cn=NIS Server,cn=plugins,cn=config',
 -    'attrs': [
 -        'nis-domain',
 -        'nis-base',
 -        'nis-map',
 -        'nis-filter',
 -        'nis-key-format:',
 -        'nis-values-format:',
 -        'nis-secure',
 -        'nis-disallowed-chars',
 -        # Parent plugin entry
 -        'nsslapd-pluginarg0',
 -        'nsslapd-pluginenabled'
 -    ],
 -    'multivalued': [],
 -    'label': 'NIS Server Plugin',
 -    'mode': 'all',
 -    'count': 0,
 -}
 -
 #
 # This mapping is simliar to above but it handles container entries
 # This could be built into the above mapping using the "comma" approach
 diff --git a/ipaserver/install/plugins/update_nis.py b/ipaserver/install/plugins/update_nis.py
 deleted file mode 100644
 index c02eb5f83..000000000
 --- a/ipaserver/install/plugins/update_nis.py
 +++ /dev/null
@@ -1,92 +0,0 @@
 -#
 -# Copyright (C) 2015  FreeIPA Contributors see COPYING for license
 -#
 -
 -from __future__ import absolute_import
 -
 -import logging
 -
 -from ipalib.plugable import Registry
 -from ipalib import errors
 -from ipalib import Updater
 -from ipaplatform.paths import paths
 -from ipapython.dn import DN
 -from ipaserver.install import sysupgrade
 -from ipaserver.install.ldapupdate import LDAPUpdate
 -
 -logger = logging.getLogger(__name__)
 -
 -register = Registry()
 -
 -
 -@register()
 -class update_nis_configuration(Updater):
 -    """Update NIS configuration
 -
 -    NIS configuration can be updated only if NIS Server was configured via
 -    ipa-nis-manage command.
 -    """
 -
 -    def __recover_from_missing_maps(self, ldap):
 -        # https://fedorahosted.org/freeipa/ticket/5507
 -        # if all following DNs are missing, but 'NIS Server' container exists
 -        # we are experiencig bug and maps should be fixed
 -
 -        if sysupgrade.get_upgrade_state('nis',
 -                                        'done_recover_from_missing_maps'):
 -            # this recover must be done only once, a user may deleted some
 -            # maps, we do not want to restore them again
 -            return
 -
 -        logger.debug("Recovering from missing NIS maps bug")
 -
 -        suffix = "cn=NIS Server,cn=plugins,cn=config"
 -        domain = self.api.env.domain
 -        missing_dn_list = [
 -            DN(nis_map.format(domain=domain, suffix=suffix)) for nis_map in [
 -                "nis-domain={domain}+nis-map=passwd.byname,{suffix}",
 -                "nis-domain={domain}+nis-map=passwd.byuid,{suffix}",
 -                "nis-domain={domain}+nis-map=group.byname,{suffix}",
 -                "nis-domain={domain}+nis-map=group.bygid,{suffix}",
 -                "nis-domain={domain}+nis-map=netid.byname,{suffix}",
 -                "nis-domain={domain}+nis-map=netgroup,{suffix}",
 -            ]
 -        ]
 -
 -        for dn in missing_dn_list:
 -            try:
 -                ldap.get_entry(dn, attrs_list=['cn'])
 -            except errors.NotFound:
 -                pass
 -            else:
 -                # bug is not effective, at least one of 'possible missing'
 -                # maps was detected
 -                return
 -
 -        sysupgrade.set_upgrade_state('nis', 'done_recover_from_missing_maps',
 -                                     True)
 -
 -        # bug is effective run update to recreate missing maps
 -        ld = LDAPUpdate(api=self.api)
 -        ld.update([paths.NIS_ULDIF])
 -
 -    def execute(self, **options):
 -        ldap = self.api.Backend.ldap2
 -        dn = DN(('cn', 'NIS Server'), ('cn', 'plugins'), ('cn', 'config'))
 -        try:
 -            ldap.get_entry(dn, attrs_list=['cn'])
 -        except errors.NotFound:
 -            # NIS is not configured on system, do not execute update
 -            logger.debug("Skipping NIS update, NIS Server is not configured")
 -
 -            # container does not exist, bug #5507 is not effective
 -            sysupgrade.set_upgrade_state(
 -                'nis', 'done_recover_from_missing_maps', True)
 -        else:
 -            self.__recover_from_missing_maps(ldap)
 -
 -            logger.debug("Executing NIS Server update")
 -            ld = LDAPUpdate(api=self.api)
 -            ld.update([paths.NIS_UPDATE_ULDIF])
 -
 -        return False, ()
 diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py
 index ae0d059ce..718798d68 100644
 --- a/ipatests/test_cmdline/test_cli.py
 +++ b/ipatests/test_cmdline/test_cli.py
@@ -385,7 +385,6 @@ IPA_CLIENT_NOT_CONFIGURED = b'IPA client is not configured on this system'
           '/usr/share/ipa/updates/05-pre_upgrade_plugins.update'],
          2, None, IPA_NOT_CONFIGURED),
         (['ipa-managed-entries'], 2, None, IPA_NOT_CONFIGURED),
 -        (['ipa-nis-manage'], 2, None, IPA_NOT_CONFIGURED),
         (['ipa-pkinit-manage'], 2, None, IPA_NOT_CONFIGURED),
         (['ipa-replica-manage', 'list'], 1, IPA_NOT_CONFIGURED, None),
         (['ipa-server-certinstall'], 2, None, IPA_NOT_CONFIGURED),
 diff --git a/ipatests/test_integration/test_commands.py b/ipatests/test_integration/test_commands.py
 index fd34defe5..e00b0f3bb 100644
 --- a/ipatests/test_integration/test_commands.py
 +++ b/ipatests/test_integration/test_commands.py
@@ -1269,93 +1269,6 @@ class TestIPACommand(IntegrationTest):
         serverid = realm_to_serverid(self.master.domain.realm)
         return ("dirsrv@%s.service" % serverid)
 -    def test_ipa_nis_manage_enable(self):
 -        """
 -        This testcase checks if ipa-nis-manage enable
 -        command enables plugin on an IPA master
 -        """
 -        dirsrv_service = self.get_dirsrv_id()
 -        console_msg = (
 -            "Enabling plugin\n"
 -            "This setting will not take effect until "
 -            "you restart Directory Server.\n"
 -            "The rpcbind service may need to be started"
 -        )
 -        status_msg = "Plugin is enabled"
 -        tasks.kinit_admin(self.master)
 -        result = self.master.run_command(
 -            ["ipa-nis-manage", "enable"],
 -            stdin_text=self.master.config.admin_password,
 -        )
 -        assert console_msg in result.stdout_text
 -        # verify using backend
 -        conn = self.master.ldap_connect()
 -        dn = DN(('cn', 'NIS Server'), ('cn', 'plugins'), ('cn', 'config'))
 -        entry = conn.get_entry(dn)
 -        nispluginstring = entry.get('nsslapd-pluginEnabled')
 -        assert 'on' in nispluginstring
 -        # restart for changes to take effect
 -        self.master.run_command(["systemctl", "restart", dirsrv_service])
 -        self.master.run_command(["systemctl", "restart", "rpcbind"])
 -        time.sleep(DIRSRV_SLEEP)
 -        # check status msg on the console
 -        result = self.master.run_command(
 -            ["ipa-nis-manage", "status"],
 -            stdin_text=self.master.config.admin_password,
 -        )
 -        assert status_msg in result.stdout_text
 -
 -    def test_ipa_nis_manage_disable(self):
 -        """
 -        This testcase checks if ipa-nis-manage disable
 -        command disable plugin on an IPA Master
 -        """
 -        dirsrv_service = self.get_dirsrv_id()
 -        msg = (
 -            "This setting will not take effect "
 -            "until you restart Directory Server."
 -        )
 -        status_msg = "Plugin is not enabled"
 -        tasks.kinit_admin(self.master)
 -        result = self.master.run_command(
 -            ["ipa-nis-manage", "disable"],
 -            stdin_text=self.master.config.admin_password,
 -        )
 -        assert msg in result.stdout_text
 -        # verify using backend
 -        conn = self.master.ldap_connect()
 -        dn = DN(('cn', 'NIS Server'), ('cn', 'plugins'), ('cn', 'config'))
 -        entry = conn.get_entry(dn)
 -        nispluginstring = entry.get('nsslapd-pluginEnabled')
 -        assert 'off' in nispluginstring
 -        # restart dirsrv for changes to take effect
 -        self.master.run_command(["systemctl", "restart", dirsrv_service])
 -        time.sleep(DIRSRV_SLEEP)
 -        # check status msg on the console
 -        result = self.master.run_command(
 -            ["ipa-nis-manage", "status"],
 -            stdin_text=self.master.config.admin_password,
 -            raiseonerr=False,
 -        )
 -        assert result.returncode == 4
 -        assert status_msg in result.stdout_text
 -
 -    def test_ipa_nis_manage_enable_incorrect_password(self):
 -        """
 -        This testcase checks if ipa-nis-manage enable
 -        command throws error on console for invalid DS admin password
 -        """
 -        msg1 = "Insufficient access: "
 -        msg2 = "Invalid credentials"
 -        result = self.master.run_command(
 -            ["ipa-nis-manage", "enable"],
 -            stdin_text='Invalid_pwd',
 -            raiseonerr=False,
 -        )
 -        assert result.returncode == 1
 -        assert msg1 in result.stderr_text
 -        assert msg2 in result.stderr_text
 -
     def test_pkispawn_log_is_present(self):
         """
         This testcase checks if pkispawn logged properly.
 -- 
 2.45.2
--- a/0003-ipatests-Check-Default-PAC-type-is-added-to-config.patch
+++ b/0003-ipatests-Check-Default-PAC-type-is-added-to-config.patch
@ -0,0 +1,92 @@
 From ad4b7f6cedaed54acf279033b650010c65face10 Mon Sep 17 00:00:00 2001
 From: Sudhir Menon <sumenon@redhat.com>
 Date: Tue, 20 Aug 2024 14:52:03 +0530
 Subject: [PATCH] ipatests: Check Default PAC type is added to config
 This patch checks that the default PAC type
 is added to configuration i.e ipaKrbAuthzData: MS-PAC
 during ipa-server-installation
 The patch also checks that if 'ipaKrbAuthzData: MS-PAC'
 attribute is deleted and then when we run 'ipa-server-upgrade'
 command the attribute is added back.
 Related: https://pagure.io/freeipa/issue/9632
 Signed-off-by: Sudhir Menon <sumenon@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 .../test_integration/test_installation.py     | 15 +++++++++++
 ipatests/test_integration/test_upgrade.py     | 26 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py
 index ada43e33fe173ea3c315178c37e2a664b05b905b..c5565c452010f23f038ddf329454b591ef09f6af 100644
 --- a/ipatests/test_integration/test_installation.py
 +++ b/ipatests/test_integration/test_installation.py
@@ -1190,6 +1190,21 @@ class TestInstallMaster(IntegrationTest):
                 expected_stdout=f'href="https://{self.master.hostname}/'
             )
 +    def test_pac_configuration_enabled(self):
 +        """
 +        This testcase checks that the default PAC type
 +        is added to configuration.
 +        """
 +        base_dn = str(self.master.domain.basedn)
 +        dn = DN(
 +            ("cn", "ipaConfig"),
 +            ("cn", "etc"),
 +            base_dn
 +        )
 +        result = tasks.ldapsearch_dm(self.master, str(dn),
 +                                     ["ipaKrbAuthzData"])
 +        assert 'ipaKrbAuthzData: MS-PAC' in result.stdout_text
 +
     def test_hostname_parameter(self, server_cleanup):
         """
         Test that --hostname parameter is respected in interactive mode.
 diff --git a/ipatests/test_integration/test_upgrade.py b/ipatests/test_integration/test_upgrade.py
 index 011de939e92790734d63da2f85be1c25349116a8..a0f393780ccc25774466992976532c876aa876da 100644
 --- a/ipatests/test_integration/test_upgrade.py
 +++ b/ipatests/test_integration/test_upgrade.py
@@ -165,7 +165,6 @@ class TestUpgrade(IntegrationTest):
                 ldap.update_entry(location_krb_rec)
         yield _setup_locations
 -
         ldap = self.master.ldap_connect()
         modified = False
@@ -491,3 +490,28 @@ class TestUpgrade(IntegrationTest):
         tasks.reinstall_packages(self.master, ['*ipa-client'])
         assert not self.master.transport.file_exists(
             paths.SSH_CONFIG + ".orig")
 +
 +    def test_mspac_attribute_set(self):
 +        """
 +        This testcase deletes the already existing attribute
 +        'ipaKrbAuthzData: MS-PAC'.
 +        The test then runs ipa-server-upgrade and checks that
 +        the attribute 'ipaKrbAuthzData: MS-PAC' is added again.
 +        """
 +        base_dn = str(self.master.domain.basedn)
 +        dn = DN(
 +            ("cn", "ipaConfig"),
 +            ("cn", "etc"),
 +            base_dn
 +        )
 +        ldif = textwrap.dedent("""
 +             dn: cn=ipaConfig,cn=etc,{}
 +             changetype: modify
 +             delete: ipaKrbAuthzData
 +        """).format(base_dn)
 +        tasks.ldapmodify_dm(self.master, ldif)
 +        tasks.kinit_admin(self.master)
 +        self.master.run_command(['ipa-server-upgrade'])
 +        result = tasks.ldapsearch_dm(self.master, str(dn),
 +                                     ["ipaKrbAuthzData"])
 +        assert 'ipaKrbAuthzData: MS-PAC' in result.stdout_text
 -- 
 2.46.0
--- a/0004-selinux-add-all-IPA-log-files-to-ipa_log_t-file-cont.patch
+++ b/0004-selinux-add-all-IPA-log-files-to-ipa_log_t-file-cont.patch
@ -0,0 +1,86 @@
 From 42eb97ee6bd8011b590aef321d4386ea9352933d Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Wed, 28 Aug 2024 10:02:19 +0300
 Subject: [PATCH] selinux: add all IPA log files to ipa_log_t file context
 We have multiple log files that produced by IPA components. Some of them
 are written by the tools that run as root and inherit their file context
 from /var/log -> var_log_t. However, increasingly we get tools that were
 run through oddjob helpers. These supposed to be run within ipa_helper_t
 SELinux context which has write permissions for ipa_log_t file context.
 Add all known log files from the base platform. The following script was
 used to generate them:
 $ git grep '_LOG = .*ipa.*\.log' ipaplatform/base/paths.py | cut -d= -f2 | \
      xargs -I% echo -e "%\t--\tgen_context(system_u:object_r:ipa_log_t,s0)"
 /var/log/ipabackup.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaclient-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaclient-uninstall.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaclientsamba-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaclientsamba-uninstall.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipareplica-ca-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipareplica-conncheck.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipareplica-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/iparestore.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaserver-enable-sid.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaserver-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaserver-adtrust-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaserver-dns-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaserver-kra-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaserver-uninstall.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaupgrade.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipatrust-enable-agent.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipaepn.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipa-custodia.audit.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/log/ipa-migrate.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 ipa-custodia.audit.log was already in the present list.
 Additionally, ipa-migrate-conflict.ldif is used by the ipa-migrate tool
 but is not provided through the ipaplatform mechanism. It is added
 explicitly.
 Fixes: https://pagure.io/freeipa/issue/9654
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 selinux/ipa.fc | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
 diff --git a/selinux/ipa.fc b/selinux/ipa.fc
 index 700e3a14a11fcd403a2e6f57ec781c58dae77660..47bd19ba77418cad1f0904dc4a9a35ce9d6ff9d2 100644
 --- a/selinux/ipa.fc
 +++ b/selinux/ipa.fc
@@ -24,7 +24,26 @@
 /var/log/ipa(/.*)?              gen_context(system_u:object_r:ipa_log_t,s0)
 -/var/log/ipareplica-conncheck.log.*	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipabackup.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaclient-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaclient-uninstall.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaclientsamba-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaclientsamba-uninstall.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipareplica-ca-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipareplica-conncheck.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipareplica-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/iparestore.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaserver-enable-sid.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaserver-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaserver-adtrust-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaserver-dns-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaserver-kra-install.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaserver-uninstall.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaupgrade.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipatrust-enable-agent.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipaepn.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipa-migrate.log	--	gen_context(system_u:object_r:ipa_log_t,s0)
 +/var/log/ipa-migrate-conflict.ldif	--	gen_context(system_u:object_r:ipa_log_t,s0)
 /var/run/ipa(/.*)?              gen_context(system_u:object_r:ipa_var_run_t,s0)
 -- 
 2.46.0
--- a/0005-Add-ipa-idrange-fix.patch
+++ b/0005-Add-ipa-idrange-fix.patch
--- a/0006-ipatests-Add-missing-comma-in-test_idrange_no_rid_ba.patch
+++ b/0006-ipatests-Add-missing-comma-in-test_idrange_no_rid_ba.patch
@ -0,0 +1,36 @@
 From 4fef80aeaaf017b286bd12ebfc30529f6a65a80e Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Mon, 2 Sep 2024 18:28:27 +0200
 Subject: [PATCH] ipatests: Add missing comma in
 test_idrange_no_rid_bases_reversed
 The test is calling ipa idrange-add but is missing a comma in
 the arguments list.
 The resulting call is using "--rid-base 100300000--secondary-rid-base".
 Add the missing comma to build the command with
 "--rid-base 100300000 --secondary-rid-base"
 Fixes: https://pagure.io/freeipa/issue/9656
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipatests/test_integration/test_ipa_idrange_fix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/ipatests/test_integration/test_ipa_idrange_fix.py b/ipatests/test_integration/test_ipa_idrange_fix.py
 index de3da9bfd221ce74f1d1bbb0dbe12e4db08b8daa..ff8fbdac9d028d26fc55f5e357f89af879a61723 100644
 --- a/ipatests/test_integration/test_ipa_idrange_fix.py
 +++ b/ipatests/test_integration/test_ipa_idrange_fix.py
@@ -72,7 +72,7 @@ class TestIpaIdrangeFix(IntegrationTest):
             "idrange_reversed",
             "--base-id", '50000',
             "--range-size", '20000',
 -            "--rid-base", '100300000'
 +            "--rid-base", '100300000',
             "--secondary-rid-base", '301000'
         ])
 -- 
 2.46.0
--- a/0007-ipatests-Update-ipa-adtrust-install-test.patch
+++ b/0007-ipatests-Update-ipa-adtrust-install-test.patch
@ -0,0 +1,32 @@
 From a18eb8358675b3697ccf8f8d8dc230cc62df6a4d Mon Sep 17 00:00:00 2001
 From: Erik Belko <ebelko@redhat.com>
 Date: Thu, 29 Aug 2024 16:47:21 +0200
 Subject: [PATCH] ipatests: Update ipa-adtrust-install test
 update test_user_connects_smb_share_if_locked_specific_group with wait
 for SSSD to be online after ipa-adtrust-install command
 Related: https://pagure.io/freeipa/issue/9655
 Signed-off-by: Erik Belko <ebelko@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipatests/test_integration/test_adtrust_install.py | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/ipatests/test_integration/test_adtrust_install.py b/ipatests/test_integration/test_adtrust_install.py
 index 72e8d874fb17adadc556ba55b825a88a3ac21a67..de252db1705ad940c3b5ee4df967d7c17a4203a7 100644
 --- a/ipatests/test_integration/test_adtrust_install.py
 +++ b/ipatests/test_integration/test_adtrust_install.py
@@ -853,6 +853,8 @@ class TestIpaAdTrustInstall(IntegrationTest):
              self.master.config.admin_password,
              "-U"]
         )
 +        # Wait for SSSD to become online before doing any other check
 +        tasks.wait_for_sssd_domain_status_online(self.master)
         self.master.run_command(["mkdir", "/freeipa4234"])
         self.master.run_command(
             ["chcon", "-t", "samba_share_t",
 -- 
 2.46.0
--- a/0008-Installer-activate-ssh-service-in-sssd.conf.patch
+++ b/0008-Installer-activate-ssh-service-in-sssd.conf.patch
@ -0,0 +1,33 @@
 From 373d41f211c1a04dc432a068bc7d2ba825ff554c Mon Sep 17 00:00:00 2001
 From: Francisco Trivino <ftrivino@redhat.com>
 Date: Tue, 13 Aug 2024 12:44:21 +0200
 Subject: [PATCH] Installer: activate ssh service in sssd.conf
 This commit enables SSSD's ssh service in ipa-client-install to ensure
 sss_ssh_knownhosts and sss_ssh_knownhostsproxy functions properly.
 Fixes: https://pagure.io/freeipa/issue/9649
 Related: https://pagure.io/freeipa/issue/9536
 Signed-off-by: Francisco Trivino <ftrivino@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipaclient/install/client.py | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
 index 802db9614b24553b2b49259f3aebb366093560ac..47a371f629f6ddfb1cd5e9fff9faad737aa01f54 100644
 --- a/ipaclient/install/client.py
 +++ b/ipaclient/install/client.py
@@ -974,6 +974,8 @@ def configure_sssd_conf(
     sssd_enable_service(sssdconfig, 'nss')
     sssd_enable_service(sssdconfig, 'pam')
 +    if options.conf_ssh:
 +        sssd_enable_service(sssdconfig, 'ssh')
     domain.set_option('ipa_domain', cli_domain)
     domain.set_option('ipa_hostname', client_hostname)
 -- 
 2.46.0
--- a/0009-ipa-migrate-fix-migration-issues-with-entries-using-.patch
+++ b/0009-ipa-migrate-fix-migration-issues-with-entries-using-.patch
@ -0,0 +1,404 @@
 From 8d242ba741ec22b258d5e70a530cefd0940783c7 Mon Sep 17 00:00:00 2001
 From: Mark Reynolds <mreynolds@redhat.com>
 Date: Tue, 23 Jul 2024 17:07:06 -0400
 Subject: [PATCH] ipa-migrate - fix migration issues with entries using
 ipaUniqueId in the RDN
 We need to handle these entries differently and specify what attribute
 and search base to use to find the entry on the local server.  Most
 entries can use the "cn" attribute but for selinux usermaps we need to
 search using the ipaOwner attribute which is a DN, and in turn requires
 additional handling/converting in order to properly check if the usermap
 exists or not.
 Also fixed an issue where an attribute should be removed from the local
 entry if it does not exist on the remote entry.
 And fixed the handling od "sudoOrder" which is defined as multi-valued
 in the schema, but we really need to treat it as single-valued
 Fixes: https://pagure.io/freeipa/issue/9640
 Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipaserver/install/ipa_migrate.py           | 119 +++++++++++++++++++--
 ipaserver/install/ipa_migrate_constants.py |  82 +++++++++++++--
 2 files changed, 187 insertions(+), 14 deletions(-)
 diff --git a/ipaserver/install/ipa_migrate.py b/ipaserver/install/ipa_migrate.py
 index e21937401b3463335d8297b41a403405071d3795..78c530f24fe5d8c9f5de0f816df9904bf30c7b94 100644
 --- a/ipaserver/install/ipa_migrate.py
 +++ b/ipaserver/install/ipa_migrate.py
@@ -32,7 +32,7 @@ from ipaserver.install.ipa_migrate_constants import (
     DS_CONFIG, DB_OBJECTS, DS_INDEXES, BIND_DN, LOG_FILE_NAME,
     STRIP_OP_ATTRS, STRIP_ATTRS, STRIP_OC, PROD_ATTRS,
     DNA_REGEN_VAL, DNA_REGEN_ATTRS, IGNORE_ATTRS,
 -    DB_EXCLUDE_TREES
 +    DB_EXCLUDE_TREES, POLICY_OP_ATTRS
 )
 """
@@ -529,6 +529,14 @@ class IPAMigrate():
     #
     # Helper functions
     #
 +    def attr_is_operational(self, attr):
 +        schema = self.local_conn.schema
 +        attr_obj = schema.get_obj(ldap.schema.AttributeType, attr)
 +        if attr_obj is not None:
 +            if attr_obj.usage == 1:
 +                return True
 +        return False
 +
     def replace_suffix(self, entry_dn):
         """
         Replace the base DN in an entry DN
@@ -1122,6 +1130,18 @@ class IPAMigrate():
             stats['reset_range'] += 1
         return entry
 +    def attr_is_required(self, attr, entry):
 +        """
 +        Check if an attribute is required in this entry
 +        """
 +        entry_oc = entry['objectClass']
 +        for oc in entry_oc:
 +            required_attrs = self.local_conn.get_allowed_attributes(
 +                [oc], raise_on_unknown=False, attributes="must")
 +            if attr.lower() in required_attrs:
 +                return True
 +        return False
 +
     def clean_entry(self, entry_dn, entry_type, entry_attrs):
         """
         Clean up the entry from the remote server
@@ -1311,7 +1331,17 @@ class IPAMigrate():
                                                    f"'{old_value}' "
                                                    "new value "
                                                    f"'{local_entry[attr][0]}'")
 -
 +                            elif 'single' == sp_attr[1]:
 +                                # The attribute is defined as multivalued, but
 +                                # we really need to treat it as single valued
 +                                self.log_debug("Entry is different and will "
 +                                               f"be updated: '{local_dn}' "
 +                                               f"attribute '{attr}' replaced "
 +                                               "with val "
 +                                               f"'{remote_attrs[attr][0]}' "
 +                                               "old value: "
 +                                               f"{local_entry[attr][0]}")
 +                                local_entry[attr][0] = remote_attrs[attr][0]
                             goto_next_attr = True
                             break
@@ -1358,6 +1388,31 @@ class IPAMigrate():
                 local_entry[attr] = remote_attrs[attr]
                 entry_updated = True
 +        # Remove attributes in the local entry that do not exist in the
 +        # remote entry
 +        remove_attrs = []
 +        for attr in local_entry:
 +            if (self.attr_is_operational(attr)
 +                and attr.lower() not in POLICY_OP_ATTRS) or \
 +               attr.lower() in IGNORE_ATTRS or \
 +               attr.lower() in STRIP_ATTRS or \
 +               attr.lower() == "usercertificate":
 +                # This is an attribute that we do not want to remove
 +                continue
 +
 +            if attr not in remote_attrs and \
 +               not self.attr_is_required(attr, local_entry):
 +                # Mark this attribute for deletion
 +                remove_attrs.append(attr)
 +                entry_updated = True
 +
 +        # Remove attributes
 +        for remove_attr in remove_attrs:
 +            self.log_debug("Entry is different and will be updated: "
 +                           f"'{local_dn}' attribute '{remove_attr}' "
 +                           "is being removed")
 +            del local_entry[remove_attr]
 +
         if range_reset:
             stats['reset_range'] += 1
@@ -1371,6 +1426,9 @@ class IPAMigrate():
         """
         Process chunks of remote entries from a paged results search
 +        entry_dn = the remote entry DN
 +        entry_attrs = the remote entry's attributes stored in a dict
 +
         Identify entry type
         Process entry (removing/change attr/val/schema)
         Compare processed remote entry with local entry, merge/overwrite?
@@ -1426,6 +1484,47 @@ class IPAMigrate():
         # Based on the entry type do additional work
         #
 +        # For entries with alternate identifying needs we need to rebuild the
 +        # local dn. Typically this is for entries that use ipaUniqueId as the
 +        # RDN attr
 +        if entry_type != "custom" and 'alt_id' in DB_OBJECTS[entry_type]:
 +            attr = DB_OBJECTS[entry_type]['alt_id']['attr']
 +            base = DB_OBJECTS[entry_type]['alt_id']['base']
 +            srch_filter = f'{attr}={entry_attrs[attr][0]}'
 +            if DB_OBJECTS[entry_type]['alt_id']['isDN'] is True:
 +                # Convert the filter to match the local suffix
 +                srch_filter = self.replace_suffix(srch_filter)
 +            srch_base = base + str(self.local_suffix)
 +
 +            try:
 +                entries = self.local_conn.get_entries(DN(srch_base),
 +                                                      filter=srch_filter)
 +                if len(entries) == 1:
 +                    local_dn = entries[0].dn
 +                elif len(entries) == 0:
 +                    # Not found, no problem just proceed and we will add it
 +                    pass
 +                else:
 +                    # Found too many entries - should not happen
 +                    self.log_error('Found too many local matching entries '
 +                                   f'for "{local_dn}"')
 +                    if self.args.force:
 +                        stats['ignored_errors'] += 1
 +                        return
 +                    else:
 +                        sys.exit(1)
 +            except errors.EmptyResult:
 +                # Not found, no problem just proceed and we will add it later
 +                pass
 +            except (errors.NetworkError, errors.DatabaseError) as e:
 +                self.log_error('Failed to find a local matching entry for '
 +                               f'"{local_dn}" error: {str(e)}')
 +                if self.args.force:
 +                    stats['ignored_errors'] += 1
 +                    return
 +                else:
 +                    sys.exit(1)
 +
         # See if the entry exists on the local server
         try:
             local_entry = self.local_conn.get_entry(DN(local_dn),
@@ -1441,14 +1540,20 @@ class IPAMigrate():
             if self.dryrun:
                 self.write_update_to_ldif(local_entry)
 -                DB_OBJECTS[entry_type]['count'] += 1
 +                if entry_type == "custom":
 +                    stats['custom'] += 1
 +                else:
 +                    DB_OBJECTS[entry_type]['count'] += 1
                 stats['total_db_migrated'] += 1
                 return
             # Update the local entry
             try:
                 self.local_conn.update_entry(local_entry)
 -                DB_OBJECTS[entry_type]['count'] += 1
 +                if entry_type == "custom":
 +                    stats['custom'] += 1
 +                else:
 +                    DB_OBJECTS[entry_type]['count'] += 1
             except errors.ExecutionError as e:
                 self.log_error(f'Failed to update "{local_dn}" error: '
                                f'{str(e)}')
@@ -1567,7 +1672,7 @@ class IPAMigrate():
         """
         Used paged search for online method to avoid large memory footprint
         """
 -        self.log_info("Migrating database ... (this make take a while)")
 +        self.log_info("Migrating database ... (this may take a while)")
         if self.args.db_ldif is not None:
             self.processDBOffline()
         else:
@@ -1608,7 +1713,7 @@ class IPAMigrate():
                        f"{len(objectclasses)} objectClasses")
         # Loop over attributes and objectclasses and count them
 -        schema = self.local_conn._get_schema()
 +        schema = self.local_conn.schema
         local_schema = schema.ldap_entry()
         for schema_type in [(attributes, "attributeTypes"),
                             (objectclasses, "objectClasses")]:
@@ -1967,7 +2072,7 @@ class IPAMigrate():
         # Run ipa-server-upgrade
         self.log_info("Running ipa-server-upgrade ... "
 -                      "(this make take a while)")
 +                      "(this may take a while)")
         if self.dryrun:
             self.log_info("Skipping ipa-server-upgrade in dryrun mode.")
         else:
 diff --git a/ipaserver/install/ipa_migrate_constants.py b/ipaserver/install/ipa_migrate_constants.py
 index 0e26c75497b216f09ed450aa25a09c2102582326..250f1b5b01bf066d316a98489ab6153b89615173 100644
 --- a/ipaserver/install/ipa_migrate_constants.py
 +++ b/ipaserver/install/ipa_migrate_constants.py
@@ -19,6 +19,28 @@ STRIP_OP_ATTRS = [
     'nsuniqueid',
     'dsentrydn',
     'entryuuid',
 +    'entrydn',
 +    'entryid',
 +    'entryusn',
 +    'numsubordinates',
 +    'parentid',
 +    'tombstonenumsubordinates'
 +]
 +
 +# Operational attributes that we would want to remove from the local entry if
 +# they don't exist in the remote entry
 +POLICY_OP_ATTRS = [
 +    'nsaccountlock',
 +    'passwordexpiratontime',
 +    'passwordgraceusertime',
 +    'pwdpolicysubentry',
 +    'passwordexpwarned',
 +    'passwordretrycount',
 +    'retrycountresettime',
 +    'accountunlocktime',
 +    'passwordhistory',
 +    'passwordallowchangetime',
 +    'pwdreset'
 ]
 # Atributes to strip from users/groups
@@ -110,7 +132,7 @@ STRIP_OC = [
 #
 # The DS_CONFIG mapping breaks each config entry (or type of entry) into its
 # own catagory. Each catagory, or type, as DN list "dn", the attributes# we
 -# are intrested in.  These attributes are broken into singel valued "attrs",
 +# are intrested in.  These attributes are broken into single valued "attrs",
 # or multi-valued attributes "multivalued".  If the attributes is single
 # valued then the value is replaced, if it's multivalued then it is "appended"
 #
@@ -565,6 +587,12 @@ DS_INDEXES = {
 # identify the entry.
 # The "label" and "count" attributes are used for the Summary Report
 #
 +# Some entries use ipaUniqueId as the RDN attribute, this makes comparing
 +# entries between the remote and local servers problematic. So we need special
 +# identifying information to find the local entry. In this case we use the
 +# "alt_id" key which is a dict of an attribute 'attr' and partial base DN
 +# 'base' - which is expected to end in a comma.
 +#
 DB_OBJECTS = {
     # Plugins
     'automember_def': {
@@ -640,8 +668,8 @@ DB_OBJECTS = {
         'oc': ['ipaconfigobject', 'ipaguiconfig'],
         'subtree': 'cn=ipaconfig,cn=etc,$SUFFIX',
         'special_attrs': [
 -            # needs special handling, but
 -            # ipa-server-upgrade rewrites this attribute anyway!
 +            # needs special handling, but ipa-server-upgrade rewrites this
 +            # attribute anyway!
             ('ipausersearchfields', 'list'),
         ],
         'label': 'IPA Config',
@@ -772,11 +800,16 @@ DB_OBJECTS = {
         'mode': 'all',
         'count': 0,
     },
 -    'subids': {  # unknown what these entries look like TODO
 +    'subids': {
         'oc': [],
         'subtree': ',cn=subids,cn=accounts,$SUFFIX',
         'label': 'Sub IDs',
 -        'mode': 'all',  # TODO Maybe production only?
 +        'mode': 'production',
 +        'alt_id': {
 +            'attr': 'ipaOwner',
 +            'isDN': True,
 +            'base': 'cn=subids,cn=accounts,',
 +        },
         'count': 0,
     },
@@ -884,6 +917,11 @@ DB_OBJECTS = {
         'oc': ['ipahbacrule'],
         'subtree': ',cn=hbac,$SUFFIX',
         'label': 'HBAC Rules',
 +        'alt_id': {
 +            'attr': 'cn',
 +            'base': 'cn=hbac,',
 +            'isDN': False,
 +        },
         'mode': 'all',
         'count': 0,
     },
@@ -892,6 +930,11 @@ DB_OBJECTS = {
     'selinux_usermap': {  # Not sure if this is needed, entry is empty  TODO
         'oc': [],
         'subtree': ',cn=usermap,cn=selinux,$SUFFIX',
 +        'alt_id': {
 +            'attr': 'cn',
 +            'base': 'cn=usermap,cn=selinux,',
 +            'isDN': False,
 +        },
         'label': 'Selinux Usermaps',
         'mode': 'all',
         'count': 0,
@@ -902,12 +945,27 @@ DB_OBJECTS = {
         'oc': ['ipasudorule'],
         'subtree': ',cn=sudorules,cn=sudo,$SUFFIX',
         'label': 'Sudo Rules',
 +        'alt_id': {
 +            'attr': 'cn',
 +            'base': 'cn=sudorules,cn=sudo,',
 +            'isDN': False,
 +        },
 +        'special_attrs': [
 +            # schema defines sudoOrder as mutlivalued, but we need to treat
 +            # it as single valued
 +            ('sudoorder', 'single'),
 +        ],
         'mode': 'all',
         'count': 0,
     },
     'sudo_cmds': {
         'oc': ['ipasudocmd'],
         'subtree': ',cn=sudocmds,cn=sudo,$SUFFIX',
 +        'alt_id': {
 +            'attr': 'sudoCmd',
 +            'base': 'cn=sudocmds,cn=sudo,',
 +            'isDN': False,
 +        },
         'label': 'Sudo Commands',
         'mode': 'all',
         'count': 0,
@@ -991,6 +1049,11 @@ DB_OBJECTS = {
         'oc': ['ipanisnetgroup'],
         'not_oc': ['mepmanagedentry'],
         'subtree': ',cn=ng,cn=alt,$SUFFIX',
 +        'alt_id': {
 +            'attr': 'cn',
 +            'base': 'cn=ng,cn=alt,',
 +            'isDN': False,
 +        },
         'label': 'Network Groups',
         'mode': 'all',
         'count': 0,
@@ -1006,9 +1069,14 @@ DB_OBJECTS = {
         'count': 0,
     },
     'caacls': {
 -        'oc': ['top'],
 +        'oc': ['ipacaacl'],
         'subtree': ',cn=caacls,cn=ca,$SUFFIX',
 -        'label': 'CA Certificates',
 +        'alt_id': {
 +            'attr': 'cn',
 +            'base': 'cn=caacls,cn=ca,',
 +            'isDN': False,
 +        },
 +        'label': 'CA Certificate ACLs',
         'mode': 'all',
         'count': 0,
     },
 -- 
 2.46.0
--- a/0010-ipa-migrate-fix-alternate-entry-search-filter.patch
+++ b/0010-ipa-migrate-fix-alternate-entry-search-filter.patch
@ -0,0 +1,68 @@
 From 3b5a980f5b65b03b9fd7ad0cfbb6c87874d3ff24 Mon Sep 17 00:00:00 2001
 From: Mark Reynolds <mreynolds@redhat.com>
 Date: Tue, 3 Sep 2024 13:42:05 -0400
 Subject: [PATCH] ipa-migrate - fix alternate entry search filter
 Processing a filter like a DN can cause normalization issues that result
 in an invalid filter. Make sure the filter is encapsulated with
 parenthesis and we call replace_suffix_value() instead of
 replace_suffix()
 Fixes: https://pagure.io/freeipa/issue/9658
 Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
 Fix typo in test
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 ipaserver/install/ipa_migrate.py                    | 4 ++--
 ipatests/test_integration/test_ipa_ipa_migration.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 diff --git a/ipaserver/install/ipa_migrate.py b/ipaserver/install/ipa_migrate.py
 index 78c530f24fe5d8c9f5de0f816df9904bf30c7b94..38356aa23ea435e2a616f48356feaea7b50dd1e4 100644
 --- a/ipaserver/install/ipa_migrate.py
 +++ b/ipaserver/install/ipa_migrate.py
@@ -1490,10 +1490,10 @@ class IPAMigrate():
         if entry_type != "custom" and 'alt_id' in DB_OBJECTS[entry_type]:
             attr = DB_OBJECTS[entry_type]['alt_id']['attr']
             base = DB_OBJECTS[entry_type]['alt_id']['base']
 -            srch_filter = f'{attr}={entry_attrs[attr][0]}'
 +            srch_filter = f'({attr}={entry_attrs[attr][0]})'
             if DB_OBJECTS[entry_type]['alt_id']['isDN'] is True:
                 # Convert the filter to match the local suffix
 -                srch_filter = self.replace_suffix(srch_filter)
 +                srch_filter = self.replace_suffix_value(srch_filter)
             srch_base = base + str(self.local_suffix)
             try:
 diff --git a/ipatests/test_integration/test_ipa_ipa_migration.py b/ipatests/test_integration/test_ipa_ipa_migration.py
 index f697bbfbfc6169309274db689501c99fe148cc70..288165e8a83a96e6f6bd4e52866f98617f497c56 100644
 --- a/ipatests/test_integration/test_ipa_ipa_migration.py
 +++ b/ipatests/test_integration/test_ipa_ipa_migration.py
@@ -610,7 +610,7 @@ class TestIPAMigrateScenario1(IntegrationTest):
         MIGRATION_SCHEMA_LOG_MSG = "Migrating schema ...\n"
         MIGRATION_CONFIG_LOG_MSG = "Migrating configuration ...\n"
         IPA_UPGRADE_LOG_MSG = (
 -            "Running ipa-server-upgrade ... (this make take a while)\n"
 +            "Running ipa-server-upgrade ... (this may take a while)\n"
         )
         SIDGEN_TASK_LOG_MSG = "Running SIDGEN task ...\n"
         MIGRATION_COMPLETE_LOG_MSG = "Migration complete!\n"
@@ -641,10 +641,10 @@ class TestIPAMigrateScenario1(IntegrationTest):
         tasks.kinit_admin(self.replicas[0])
         MIGRATION_SCHEMA_LOG_MSG = "Migrating schema ...\n"
         MIGRATION_DATABASE_LOG_MSG = (
 -            "Migrating database ... (this make take a while)\n"
 +            "Migrating database ... (this may take a while)\n"
         )
         IPA_UPGRADE_LOG_MSG = (
 -            "Running ipa-server-upgrade ... (this make take a while)\n"
 +            "Running ipa-server-upgrade ... (this may take a while)\n"
         )
         SIDGEN_TASK_LOG_MSG = "Running SIDGEN task ...\n"
         result = run_migrate(
 -- 
 2.46.0
--- a/0011-Custodia-in-fips-mode-add-nomac-or-nomacver-to-opens.patch
+++ b/0011-Custodia-in-fips-mode-add-nomac-or-nomacver-to-opens.patch
@ -0,0 +1,82 @@
 From c96d172d7d2e87513d9bd51a98591858e1f88def Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Thu, 5 Sep 2024 14:52:26 +0200
 Subject: [PATCH] Custodia: in fips mode add -nomac or -nomacver to openssl
 pkcs12
 In FIPS mode the command openssl pkcs12 fails unless the
 export is called with -nomac and import with -nomacver
 The command is used by custodia to export private keys from the
 master and import them in the replica.
 Fixes: https://pagure.io/freeipa/issue/9577
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipaserver/secrets/handlers/pemfile.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
 diff --git a/ipaserver/secrets/handlers/pemfile.py b/ipaserver/secrets/handlers/pemfile.py
 index ad36bd02008ff068fa7e237dd9653e31f7ac7d85..006d351699f3086653c2e461fdcb8afb53eea281 100644
 --- a/ipaserver/secrets/handlers/pemfile.py
 +++ b/ipaserver/secrets/handlers/pemfile.py
@@ -8,6 +8,7 @@ import json
 import os
 from ipaplatform.paths import paths
 +from ipaplatform.tasks import tasks
 from ipapython import ipautil
 from . import common
@@ -25,7 +26,7 @@ def export_key(args, tmpdir):
         f.write(password)
     # OpenSSL does not support pkcs12 export of a cert without key
 -    ipautil.run([
 +    cmd = [
         paths.OPENSSL, 'pkcs12', '-export',
         '-in', args.certfile,
         '-out', pk12file,
@@ -34,7 +35,13 @@ def export_key(args, tmpdir):
         '-keypbe', 'AES-256-CBC',
         '-certpbe', 'AES-256-CBC',
         '-macalg', 'sha384',
 -    ])
 +    ]
 +
 +    fips_enabled = tasks.is_fips_enabled()
 +    if fips_enabled:
 +        cmd.append('-nomac')
 +
 +    ipautil.run(cmd)
     with open(pk12file, 'rb') as f:
         p12data = f.read()
@@ -69,6 +76,11 @@ def import_key(args, tmpdir):
         '-out', args.certfile,
         '-password', 'file:{pk12pwfile}'.format(pk12pwfile=pk12pwfile),
     ]
 +
 +    fips_enabled = tasks.is_fips_enabled()
 +    if fips_enabled:
 +        cmd.append('-nomacver')
 +
     ipautil.run(cmd, umask=0o027)
     # get the private key from the file
@@ -79,6 +91,10 @@ def import_key(args, tmpdir):
         '-out', args.keyfile,
         '-password', 'file:{pk12pwfile}'.format(pk12pwfile=pk12pwfile),
     ]
 +
 +    if fips_enabled:
 +        cmd.append('-nomacver')
 +
     ipautil.run(cmd, umask=0o027)
 -- 
 2.46.0
--- a/0012-ipatests-make-TestDuplicates-teardowns-order-agnosti.patch
+++ b/0012-ipatests-make-TestDuplicates-teardowns-order-agnosti.patch
@ -0,0 +1,139 @@
 From d102773ce24481c6797f71557b75e77921164285 Mon Sep 17 00:00:00 2001
 From: Stanislav Levin <slev@altlinux.org>
 Date: Thu, 12 Sep 2024 12:38:52 +0300
 Subject: [PATCH] ipatests: make TestDuplicates teardowns order agnostic
 Fixtures 'user4' and 'user5' track the same actual user 'tuser'.
 If used together their teardowns can fail depending on the
 order of execution.
 With this change fixtures of TestDuplicates are simplified and
 method-scoped.
 Related: https://pagure.io/freeipa/issue/9571
 Signed-off-by: Stanislav Levin <slev@altlinux.org>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 ipatests/test_xmlrpc/test_stageuser_plugin.py | 76 +++++++------------
 1 file changed, 28 insertions(+), 48 deletions(-)
 diff --git a/ipatests/test_xmlrpc/test_stageuser_plugin.py b/ipatests/test_xmlrpc/test_stageuser_plugin.py
 index 9ae5561dfa4e0d54fe1231501bfea3c0ba261849..6ed593fbf24dd2e8ce087625b9cb4c21c9a3c145 100644
 --- a/ipatests/test_xmlrpc/test_stageuser_plugin.py
 +++ b/ipatests/test_xmlrpc/test_stageuser_plugin.py
@@ -120,12 +120,6 @@ def stageduser3(request, xmlrpc_setup):
     return tracker.make_fixture_activate(request)
 -@pytest.fixture(scope='class')
 -def stageduser4(request, xmlrpc_setup):
 -    tracker = StageUserTracker(u'tuser', u'test', u'user')
 -    return tracker.make_fixture(request)
 -
 -
 @pytest.fixture(scope='class')
 def stageduser_notposix(request, xmlrpc_setup):
     tracker = StageUserTracker(u'notposix', u'notposix', u'notposix')
@@ -161,18 +155,6 @@ def user3(request, xmlrpc_setup):
     return tracker.make_fixture(request)
 -@pytest.fixture(scope='class')
 -def user4(request, xmlrpc_setup):
 -    tracker = UserTracker(u'tuser', u'test', u'user')
 -    return tracker.make_fixture(request)
 -
 -
 -@pytest.fixture(scope='class')
 -def user5(request, xmlrpc_setup):
 -    tracker = UserTracker(u'tuser', u'test', u'user')
 -    return tracker.make_fixture(request)
 -
 -
 @pytest.fixture(scope='class')
 def user6(request, xmlrpc_setup):
     tracker = UserTracker(u'suser2', u'staged', u'user')
@@ -724,52 +706,50 @@ class TestManagers(XMLRPC_test):
 @pytest.mark.tier1
 class TestDuplicates(XMLRPC_test):
 -    def test_active_same_as_preserved(self, user4, user5):
 -        user4.ensure_missing()
 -        user5.make_preserved_user()
 -        command = user4.make_create_command()
 +    @pytest.fixture
 +    def user(self, request, xmlrpc_setup):
 +        tracker = UserTracker("tuser", "test", "user")
 +        return tracker.make_fixture(request)
 +
 +    @pytest.fixture
 +    def stageduser(self, request, xmlrpc_setup):
 +        tracker = StageUserTracker("tuser", "test", "user")
 +        return tracker.make_fixture(request)
 +
 +    def test_active_same_as_preserved(self, user):
 +        user.make_preserved_user()
 +        command = user.make_create_command()
         with raises_exact(errors.DuplicateEntry(
 -                message=u'user with name "%s" already exists' % user4.uid)):
 +                message=u'user with name "%s" already exists' % user.uid)):
             command()
 -        user5.delete()
 -    def test_staged_same_as_active(self, user4, stageduser4):
 -        user4.ensure_exists()
 -        stageduser4.create()  # can be created
 +    def test_staged_same_as_active(self, user, stageduser):
 +        user.create()
 +        stageduser.create()  # can be created
 -        command = stageduser4.make_activate_command()
 +        command = stageduser.make_activate_command()
         with raises_exact(errors.DuplicateEntry(
                 message=u'active user with name "%s" already exists' %
 -                user4.uid)):
 +                user.uid)):
             command()  # cannot be activated
 -        user4.delete()
 -        stageduser4.delete()
 -
 -    def test_staged_same_as_preserved(self, user5, stageduser4):
 -        user5.make_preserved_user()
 -        stageduser4.create()  # can be created
 +    def test_staged_same_as_preserved(self, user, stageduser):
 +        user.make_preserved_user()
 +        stageduser.create()  # can be created
 -        command = stageduser4.make_activate_command()
 +        command = stageduser.make_activate_command()
         with raises_exact(errors.DuplicateEntry(
                 message=u'This entry already exists')):
             command()  # cannot be activated
 -        user5.delete()
 -        stageduser4.delete()
 +    def test_active_same_as_staged(self, user, stageduser):
 +        stageduser.create()
 +        user.create()  # can be created
 -    def test_active_same_as_staged(self, user4, stageduser4):
 -        user4.ensure_missing()
 -        stageduser4.ensure_exists()
 -        command = user4.make_create_command()
 -        result = command()
 -        user4.track_create()
 -        user4.check_create(result)  # can be created
 -
 -        command = stageduser4.make_activate_command()
 +        command = stageduser.make_activate_command()
         with raises_exact(errors.DuplicateEntry(
                 message=u'active user with name "%s" already exists' %
 -                user4.uid)):
 +                user.uid)):
             command()  # cannot be activated
 -- 
 2.46.0
--- a/0013-UnsafeIPAddress-pass-flag-0-to-IPNetwork.patch
+++ b/0013-UnsafeIPAddress-pass-flag-0-to-IPNetwork.patch
@ -0,0 +1,34 @@
 From a9e653ca36a0829ae59cd204e7388d7a6c91e082 Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Fri, 13 Sep 2024 09:58:36 +0200
 Subject: [PATCH] UnsafeIPAddress: pass flag=0 to IPNetwork
 When parsing a string, the constructor tries to parse the value
 as an IP Address first, or falls back to an IPNetwork with the
 flags INET_PTON.
 Use the flag 0 instead for an IPNetwork.
 Fixes: https://pagure.io/freeipa/issue/9645
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipapython/ipautil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
 index 3e98bfd6a66f24933e7e4de8efb79f4f5bf8bd0e..c237d59fb4b8be4187fb0efb04b097ff4df6c182 100644
 --- a/ipapython/ipautil.py
 +++ b/ipapython/ipautil.py
@@ -119,7 +119,7 @@ class UnsafeIPAddress(netaddr.IPAddress):
                 if addr.version != 6:
                     raise
         except ValueError:
 -            self._net = netaddr.IPNetwork(addr, flags=self.netaddr_ip_flags)
 +            self._net = netaddr.IPNetwork(addr, flags=0)
             addr = self._net.ip
         super(UnsafeIPAddress, self).__init__(addr,
                                               flags=self.netaddr_ip_flags)
 -- 
 2.46.2
--- a/0014-ipatests-provide-a-ccache-to-rpcclient-deletetrustdo.patch
+++ b/0014-ipatests-provide-a-ccache-to-rpcclient-deletetrustdo.patch
@ -0,0 +1,67 @@
 From a343c149838a3058794f33c75c58b75bc1748f7f Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Tue, 17 Sep 2024 17:00:49 +0200
 Subject: [PATCH] ipatests: provide a ccache to rpcclient deletetrustdom
 With samba update to samba-4.20.4, rpcclient now needs a
 ccache otherwise it prompts for a password.
 Fixes: https://pagure.io/freeipa/issue/9667
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipatests/pytest_ipa/integration/tasks.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
 diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py
 index 9d6b5f67a311a28c335801d59e0ff0f0c7faccdd..677fb7534256a65940fb5280fa6412789dcba54f 100755
 --- a/ipatests/pytest_ipa/integration/tasks.py
 +++ b/ipatests/pytest_ipa/integration/tasks.py
@@ -795,15 +795,22 @@ def remove_trust_info_from_ad(master, ad_domain, ad_hostname):
     kinit_as_user(master,
                   'Administrator@{}'.format(ad_domain.upper()),
                   master.config.ad_admin_password)
 +    # Find cache for the user
 +    cache_args = []
 +    cache = get_credential_cache(master)
 +    if cache:
 +        cache_args = ["--use-krb5-ccache", cache]
 +
     # Detect whether rpcclient supports -k or --use-kerberos option
     res = master.run_command(['rpcclient', '-h'], raiseonerr=False)
     if "--use-kerberos" in res.stderr_text:
         rpcclient_krb5_knob = "--use-kerberos=desired"
     else:
         rpcclient_krb5_knob = "-k"
 -    master.run_command(['rpcclient', rpcclient_krb5_knob, ad_hostname,
 -                        '-c', 'deletetrustdom {}'.format(master.domain.name)],
 -                       raiseonerr=False)
 +    cmd_args = ['rpcclient', rpcclient_krb5_knob, ad_hostname]
 +    cmd_args.extend(cache_args)
 +    cmd_args.extend(['-c', 'deletetrustdom {}'.format(master.domain.name)])
 +    master.run_command(cmd_args, raiseonerr=False)
 def configure_auth_to_local_rule(master, ad):
@@ -1086,6 +1093,16 @@ def kinit_admin(host, raiseonerr=True):
                       raiseonerr=raiseonerr)
 +def get_credential_cache(host):
 +    # Return the credential cache currently in use on host or None
 +    result = host.run_command(["klist"]).stdout_text
 +    pattern = re.compile(r'Ticket cache: (?P<cache>.*)\n')
 +    res = pattern.search(result)
 +    if res:
 +        return res['cache']
 +    return None
 +
 +
 def uninstall_master(host, ignore_topology_disconnect=True,
                      ignore_last_of_role=True, clean=True, verbose=False):
     uninstall_cmd = ['ipa-server-install', '--uninstall', '-U']
 -- 
 2.46.2
--- a/0015-test_adtrust_install-add-use-krb5-ccache-to-smbclien.patch
+++ b/0015-test_adtrust_install-add-use-krb5-ccache-to-smbclien.patch
@ -0,0 +1,60 @@
 From 743c7b46e463bef666dc84e9f513eb7dee7f59f6 Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Tue, 17 Sep 2024 14:48:58 +0200
 Subject: [PATCH] test_adtrust_install: add --use-krb5-ccache to smbclient
 command
 With samba 4.20.4 the smbclient commands needs a ccache otherwise it
 prompts for a password.
 Fixes: https://pagure.io/freeipa/issue/9666
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 .../test_integration/test_adtrust_install.py  | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)
 diff --git a/ipatests/test_integration/test_adtrust_install.py b/ipatests/test_integration/test_adtrust_install.py
 index de252db1705ad940c3b5ee4df967d7c17a4203a7..79a91dfaa61276de74b10777c6d44b5942ed1be0 100644
 --- a/ipatests/test_integration/test_adtrust_install.py
 +++ b/ipatests/test_integration/test_adtrust_install.py
@@ -873,17 +873,25 @@ class TestIpaAdTrustInstall(IntegrationTest):
              "path", "/freeipa4234"])
         self.master.run_command(["touch", "before"])
         self.master.run_command(["touch", "after"])
 -        self.master.run_command(
 -            ["smbclient", "--use-kerberos=desired",
 -             "-c=put before", "//{}/share".format(
 -                 self.master.hostname)]
 -        )
 +        # Find cache for the admin user
 +        cache_args = []
 +        cache = tasks.get_credential_cache(self.master)
 +        if cache:
 +            cache_args = ["--use-krb5-ccache", cache]
 +
 +        cmd_args = ["smbclient", "--use-kerberos=desired"]
 +        cmd_args.extend(cache_args)
 +        cmd_args.extend([
 +            "-c=put before", "//{}/share".format(self.master.hostname)
 +        ])
 +        self.master.run_command(cmd_args)
         self.master.run_command(
             ["net", "conf", "setparm", "share",
              "valid users", "@admins"])
 -        result = self.master.run_command(
 -            ["smbclient", "--use-kerberos=desired",
 -             "-c=put after", "//{}/share".format(
 -                 self.master.hostname)]
 -        )
 +        cmd_args = ["smbclient", "--use-kerberos=desired"]
 +        cmd_args.extend(cache_args)
 +        cmd_args.extend([
 +            "-c=put after", "//{}/share".format(self.master.hostname)
 +        ])
 +        result = self.master.run_command(cmd_args)
         assert msg not in result.stdout_text
 -- 
 2.46.2
--- a/0016-Don-t-rely-on-removing-the-CA-to-uninstall-the-ACME-.patch
+++ b/0016-Don-t-rely-on-removing-the-CA-to-uninstall-the-ACME-.patch
@ -0,0 +1,209 @@
 From a785d0c561b8e22bd9d56739481095e07e0a7eb7 Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Mon, 30 Sep 2024 13:30:46 -0400
 Subject: [PATCH] Don't rely on removing the CA to uninstall the ACME depoyment
 There has always been a pki-server commnd acme-remove. We were
 not aware that it should be called prior to removing a CA. In
 11.5.0 this is strongly encouraged by the PKI team. In 11.6.0
 ACME is treated as a full subsystem so will be removed in the
 future using pkidestroy -s ACME
 The new class acmeinstance.ACMEInstance is introduced so its
 uninstallation can be handled in a similar way as the other
 PKI services via DogtagInstance. It is, right now, a pretty
 thin wrapper.
 We can discuss moving the ACME installation routines here at
 some point. It would be ok as long as we don't have to introduce
 another PKI restart as part of it.
 In PKI 11.6.0 pkidestroy has new options to ensure a clean
 uninstall: --remove-conf --remove-logs. Pass those options
 into pkidestroy calls for 11.6.0+.
 Clean up an additional IPA-generated file that needs to be
 cleaned up during uninstall: /root/kracert.p12. 11.6.0 is
 more sensitive to leftover files than previous versions.
 Fixes: https://pagure.io/freeipa/issue/9673
 Fixes: https://pagure.io/freeipa/issue/9674
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipaserver/install/acmeinstance.py             | 31 +++++++++++++
 ipaserver/install/ca.py                       |  5 ++-
 ipaserver/install/cainstance.py               |  1 +
 ipaserver/install/dogtaginstance.py           | 44 +++++++++++++------
 .../test_integration/test_uninstallation.py   | 21 +++++++++
 5 files changed, 87 insertions(+), 15 deletions(-)
 create mode 100644 ipaserver/install/acmeinstance.py
 diff --git a/ipaserver/install/acmeinstance.py b/ipaserver/install/acmeinstance.py
 new file mode 100644
 index 0000000000000000000000000000000000000000..0027c314545f384d9b6ee24b279479e5360d8bef
 --- /dev/null
 +++ b/ipaserver/install/acmeinstance.py
@@ -0,0 +1,31 @@
 +#
 +# Copyright (C) 2024  FreeIPA Contributors see COPYING for license
 +#
 +
 +import logging
 +
 +from ipaserver.install.dogtaginstance import DogtagInstance
 +
 +logger = logging.getLogger(__name__)
 +
 +
 +class ACMEInstance(DogtagInstance):
 +    """
 +    ACME is deployed automatically with a CA subsystem but it is the
 +    responsibility of IPA to uninstall the service.
 +
 +    This is mostly a placeholder for the uninstaller. We can
 +    eventually move the ACME installation routines into this class
 +    if we want but it might result in an extra PKI restart which
 +    would be slow.
 +    """
 +    def __init__(self, realm=None, host_name=None):
 +        super(ACMEInstance, self).__init__(
 +            realm=realm,
 +            subsystem="ACME",
 +            service_desc="ACME server",
 +            host_name=host_name
 +        )
 +
 +    def uninstall(self):
 +        DogtagInstance.uninstall(self)
 diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
 index ffcb5268399ce71128fc8de5f54d433d35e99dd2..520e3fc5de1084e7c22c0cf7eaa86e1d3c421373 100644
 --- a/ipaserver/install/ca.py
 +++ b/ipaserver/install/ca.py
@@ -22,7 +22,7 @@ from ipaplatform.constants import constants
 from ipaserver.install import sysupgrade
 from ipapython.install import typing
 from ipapython.install.core import group, knob, extend_knob
 -from ipaserver.install import cainstance, bindinstance, dsinstance
 +from ipaserver.install import acmeinstance, cainstance, bindinstance, dsinstance
 from ipapython import ipautil, certdb
 from ipapython import ipaldap
 from ipapython.admintool import ScriptError
@@ -715,6 +715,9 @@ def install_step_1(standalone, replica_config, options, custodia):
 def uninstall():
 +    acme = acmeinstance.ACMEInstance(api.env.realm)
 +    acme.uninstall()
 +
     ca_instance = cainstance.CAInstance(api.env.realm)
     ca_instance.stop_tracking_certificates()
     ipautil.remove_file(paths.RA_AGENT_PEM)
 diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
 index 5dac2c0441752e7bb569cde1fc93bc17c3128cdf..5c2c9f8b981cf5d587865f7680e2b231eae655e2 100644
 --- a/ipaserver/install/cainstance.py
 +++ b/ipaserver/install/cainstance.py
@@ -1118,6 +1118,7 @@ class CAInstance(DogtagInstance):
         ipautil.remove_file(paths.DOGTAG_ADMIN_P12)
         ipautil.remove_file(paths.CACERT_P12)
 +        ipautil.remove_file(paths.ADMIN_CERT_PATH)
     def unconfigure_certmonger_renewal_guard(self):
         if not self.is_configured():
 diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
 index e89492312deb8ca20668a62fd7a2a20e2866a3fb..4b0f4d274b0c33140ed6f939f1a3fd8b75930ff9 100644
 --- a/ipaserver/install/dogtaginstance.py
 +++ b/ipaserver/install/dogtaginstance.py
@@ -304,21 +304,37 @@ class DogtagInstance(service.Service):
         if self.is_installed():
             self.print_msg("Unconfiguring %s" % self.subsystem)
 -        args = [paths.PKIDESTROY,
 -                "-i", "pki-tomcat", "--force",
 -                "-s", self.subsystem]
 -
 -        # specify --log-file <path> on PKI 11.0.0 or later
 -
 +        args = []
         pki_version = pki.util.Version(pki.specification_version())
 -        if pki_version >= pki.util.Version("11.0.0"):
 -            timestamp = time.strftime(
 -                "%Y%m%d%H%M%S",
 -                time.localtime(time.time()))
 -            log_file = os.path.join(
 -                paths.VAR_LOG_PKI_DIR,
 -                "pki-%s-destroy.%s.log" % (self.subsystem.lower(), timestamp))
 -            args.extend(["--log-file", log_file])
 +        if self.subsystem == "ACME":
 +            if pki_version < pki.util.Version("11.0.0"):
 +                return
 +            elif (
 +                pki.util.Version("11.0.0") <= pki_version
 +                <= pki.util.Version("11.5.0")
 +            ):
 +                args = ['pki-server', 'acme-remove']
 +            else:
 +                # fall through for PKI >= 11.6.0
 +                pass
 +        if not args:
 +            args = [paths.PKIDESTROY,
 +                    "-i", "pki-tomcat", "--force",
 +                    "-s", self.subsystem]
 +
 +            # specify --log-file <path> on PKI 11.0.0 or later
 +
 +            if pki_version >= pki.util.Version("11.0.0"):
 +                timestamp = time.strftime(
 +                    "%Y%m%d%H%M%S",
 +                    time.localtime(time.time()))
 +                log_file = os.path.join(
 +                    paths.VAR_LOG_PKI_DIR,
 +                    "pki-%s-destroy.%s.log" %
 +                    (self.subsystem.lower(), timestamp))
 +                args.extend(["--log-file", log_file])
 +            if pki_version >= pki.util.Version("11.6.0"):
 +                args.extend(["--remove-conf", "--remove-logs"])
         try:
             ipautil.run(args)
 diff --git a/ipatests/test_integration/test_uninstallation.py b/ipatests/test_integration/test_uninstallation.py
 index 4f8f17ce3ad8d5376ecba11442f379e5691de7f7..049c50db536ae1070f5f958e76b12a1518da0aba 100644
 --- a/ipatests/test_integration/test_uninstallation.py
 +++ b/ipatests/test_integration/test_uninstallation.py
@@ -197,6 +197,7 @@ class TestUninstallCleanup(IntegrationTest):
             '/var/lib/sss/pubconf/krb5.include.d/localauth_plugin',
             '/var/named/dynamic/managed-keys.bind',
             '/var/named/dynamic/managed-keys.bind.jnl',
 +            '/var/lib/systemd/coredump/',
         ]
         leftovers = []
@@ -217,3 +218,23 @@ class TestUninstallCleanup(IntegrationTest):
                 leftovers.append(line)
         assert len(leftovers) == 0
 +
 +
 +class TestUninstallReinstall(IntegrationTest):
 +    """Test install, uninstall, re-install.
 +
 +       Reinstall with PKI 11.6.0 was failing
 +       https://pagure.io/freeipa/issue/9673
 +    """
 +
 +    num_replicas = 0
 +
 +    @classmethod
 +    def install(cls, mh):
 +        tasks.install_master(cls.master, setup_dns=False)
 +
 +    def test_uninstall_server(self):
 +        tasks.uninstall_master(self.master)
 +
 +    def test_reinstall_server(self):
 +        tasks.install_master(self.master, setup_dns=False)
 -- 
 2.46.2
--- a/0017-ipatests-Fixes-for-ipa-idrange-fix-testsuite.patch
+++ b/0017-ipatests-Fixes-for-ipa-idrange-fix-testsuite.patch
@ -0,0 +1,35 @@
 From ae4c2ad6cd966d48c063814f494dcc16cf0ccd4c Mon Sep 17 00:00:00 2001
 From: Sudhir Menon <sumenon@redhat.com>
 Date: Tue, 24 Sep 2024 13:46:48 +0530
 Subject: [PATCH] ipatests: Fixes for ipa-idrange-fix testsuite
 This patch adds the line tasks.install_master(cls.master).
 The kinit admin command fails with the below error as the
 IPA is not configured on the test system
 'ipa: ERROR: stderr: kinit: Configuration file does not specify default
 realm when parsing name admin'
 Signed-off-by: Sudhir Menon <sumenon@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipatests/test_integration/test_ipa_idrange_fix.py | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/ipatests/test_integration/test_ipa_idrange_fix.py b/ipatests/test_integration/test_ipa_idrange_fix.py
 index ff8fbdac9d028d26fc55f5e357f89af879a61723..0c915bd0931ed11a3aa86c533ee8748aa8a7ec07 100644
 --- a/ipatests/test_integration/test_ipa_idrange_fix.py
 +++ b/ipatests/test_integration/test_ipa_idrange_fix.py
@@ -17,6 +17,9 @@ logger = logging.getLogger(__name__)
 class TestIpaIdrangeFix(IntegrationTest):
 +
 +    topology = 'line'
 +
     @classmethod
     def install(cls, mh):
         super(TestIpaIdrangeFix, cls).install(mh)
 -- 
 2.46.2
--- a/0018-spec-Use-nodejs22-on-RHEL-10-and-ELN.patch
+++ b/0018-spec-Use-nodejs22-on-RHEL-10-and-ELN.patch
@ -0,0 +1,34 @@
 From 642af014d9e7de8e53934af4ca3970977957cba7 Mon Sep 17 00:00:00 2001
 From: Yaakov Selkowitz <yselkowi@redhat.com>
 Date: Tue, 8 Oct 2024 02:13:00 -0400
 Subject: [PATCH] spec: Use nodejs22 on RHEL 10 and ELN
 nodejs22 is now the default nodejs version in RHEL 10 as well as ELN.
 Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
 Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 freeipa.spec.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/freeipa.spec.in b/freeipa.spec.in
 index 171b6ad27b57553fdd46c7d041715949bb00b163..9b3d916f34c10a00070855578a593e299187bc44 100755
 --- a/freeipa.spec.in
 +++ b/freeipa.spec.in
@@ -308,10 +308,10 @@ BuildRequires:  libpwquality-devel
 BuildRequires:  libsss_idmap-devel
 BuildRequires:  libsss_certmap-devel
 BuildRequires:  libsss_nss_idmap-devel >= %{sssd_version}
 -%if 0%{?fedora} >= 41
 +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10
 # Do not use nodejs22 on fedora < 41, https://pagure.io/freeipa/issue/9643
 BuildRequires: nodejs(abi)
 -%elif 0%{?fedora} >= 39 || 0%{?rhel} >= 10
 +%elif 0%{?fedora} >= 39
 # Do not use nodejs20 on fedora < 39, https://pagure.io/freeipa/issue/9374
 BuildRequires:  nodejs(abi) < 127
 %else
 -- 
 2.46.2
--- a/0019-Do-not-let-user-with-an-expired-OTP-token-to-log-in-.patch
+++ b/0019-Do-not-let-user-with-an-expired-OTP-token-to-log-in-.patch
@ -0,0 +1,265 @@
 From 18303b94bea4e08a0c889fc357df6ba2f308fa0d Mon Sep 17 00:00:00 2001
 From: Mark Reynolds <mreynolds@redhat.com>
 Date: Wed, 2 Oct 2024 21:26:34 -0400
 Subject: [PATCH] Do not let user with an expired OTP token to log in if only
 OTP is allowed
 If only OTP authentication is allowed, and a user tries to login with an
 expired token, do not let them log in with their password. Forcing the
 admin to intervene. If the user does not have an OTP token then allow
 them to log in with a password until an OTP token is configured
 Fixes: https://pagure.io/freeipa/issue/9387
 Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Julien Rische <jrische@redhat.com>
 ---
 daemons/ipa-kdb/ipa_kdb_principals.c          | 63 +++++++++++--
 .../ipa-slapi-plugins/ipa-pwd-extop/prepost.c |  3 +-
 ipatests/test_integration/test_otp.py         | 94 ++++++++++++++++++-
 3 files changed, 151 insertions(+), 9 deletions(-)
 diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c
 index 14603e528b43acb29234c425e97ad297ac6724a7..114957b884786dd3ca3b01c47f6bb82e8a040beb 100644
 --- a/daemons/ipa-kdb/ipa_kdb_principals.c
 +++ b/daemons/ipa-kdb/ipa_kdb_principals.c
@@ -107,7 +107,6 @@ static char *std_principal_obj_classes[] = {
     "krbprincipal",
     "krbprincipalaux",
     "krbTicketPolicyAux",
 -
     NULL
 };
@@ -338,14 +337,16 @@ static void ipadb_validate_otp(struct ipadb_context *ipactx,
     if (dn == NULL)
         return;
     count = asprintf(&filter, ftmpl, dn, datetime, datetime);
 -    ldap_memfree(dn);
 -    if (count < 0)
 +    if (count < 0) {
 +        ldap_memfree(dn);
         return;
 +    }
     /* Fetch the active token list. */
     kerr = ipadb_simple_search(ipactx, ipactx->base, LDAP_SCOPE_SUBTREE,
                                filter, (char**) attrs, &res);
     free(filter);
 +    filter = NULL;
     if (kerr != 0 || res == NULL)
         return;
@@ -353,10 +354,60 @@ static void ipadb_validate_otp(struct ipadb_context *ipactx,
     count = ldap_count_entries(ipactx->lcontext, res);
     ldap_msgfree(res);
 -    /* If the user is configured for OTP, but has no active tokens, remove
 -     * OTP from the list since the user obviously can't log in this way. */
 -    if (count == 0)
 +    /*
 +     * If there are no valid tokens then we need to remove the OTP flag,
 +     * unless OTP is the only auth type allowed...
 +     */
 +    if (count == 0) {
 +        /* Remove the OTP flag for now */
         *ua &= ~IPADB_USER_AUTH_OTP;
 +
 +        if (*ua == 0) {
 +            /*
 +             * Ok, we "only" allow OTP, so if there is an expired/disabled
 +             * token then add back the OTP flag as the server will double
 +             * check the validity and reject the entire bind. Otherwise, this
 +             * is the first time the user is authenticating and the user
 +             * should be allowed to bind using its password
 +             */
 +            static const char *expired_ftmpl = "(&"
 +                "(objectClass=ipaToken)(ipatokenOwner=%s)"
 +                "(|(ipatokenNotAfter<=%s)(!(ipatokenNotAfter=*))"
 +                "(ipatokenDisabled=True))"
 +            ")";
 +            if (asprintf(&filter, expired_ftmpl, dn, datetime) < 0) {
 +                ldap_memfree(dn);
 +                return;
 +            }
 +
 +            krb5_klog_syslog(LOG_INFO,
 +                "Entry (%s) does not have a valid token and only OTP "
 +                "authentication is supported, checking for expired tokens...",
 +                dn);
 +
 +            kerr = ipadb_simple_search(ipactx, ipactx->base, LDAP_SCOPE_SUBTREE,
 +                                       filter, (char**) attrs, &res);
 +            free(filter);
 +            if (kerr != 0 || res == NULL) {
 +                ldap_memfree(dn);
 +                return;
 +            }
 +
 +            if (ldap_count_entries(ipactx->lcontext, res) > 0) {
 +                /*
 +                 * Ok we only allow OTP, and there are expired/disabled tokens
 +                 * so add the OTP flag back, and the server will reject the
 +                 * bind
 +                 */
 +                krb5_klog_syslog(LOG_INFO,
 +                    "Entry (%s) does have an expired/disabled token so this "
 +                    "user can not fall through to password auth", dn);
 +                *ua |= IPADB_USER_AUTH_OTP;
 +            }
 +            ldap_msgfree(res);
 +        }
 +    }
 +    ldap_memfree(dn);
 }
 static void ipadb_validate_radius(struct ipadb_context *ipactx,
 diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/prepost.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/prepost.c
 index c967e2cfffbd920280639f3188783ec150523b47..1c1340e31ac30cb01412a7065ea339cb5461e839 100644
 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/prepost.c
 +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/prepost.c
@@ -1528,7 +1528,8 @@ static int ipapwd_pre_bind(Slapi_PBlock *pb)
     if (!syncreq && (otpreq == OTP_IS_NOT_REQUIRED)) {
         ret = ipapwd_gen_checks(pb, &errMesg, &krbcfg, IPAPWD_CHECK_ONLY_CONFIG);
         if (ret != 0) {
 -            LOG_FATAL("ipapwd_gen_checks failed!?\n");
 +            LOG_FATAL("ipapwd_gen_checks failed for '%s': %s\n",
 +                      slapi_sdn_get_dn(sdn), errMesg);
             slapi_entry_free(entry);
             slapi_sdn_free(&sdn);
             return 0;
 diff --git a/ipatests/test_integration/test_otp.py b/ipatests/test_integration/test_otp.py
 index 350371bfe1e4c1cc6dcc89f6584f813fcb0d32a0..878b4fb560ba8d7768ead54b065656462545babd 100644
 --- a/ipatests/test_integration/test_otp.py
 +++ b/ipatests/test_integration/test_otp.py
@@ -10,6 +10,7 @@ import re
 import time
 import textwrap
 from urllib.parse import urlparse, parse_qs
 +from paramiko import AuthenticationException
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
@@ -83,7 +84,7 @@ def kinit_otp(host, user, *, password, otp, success=True):
     )
 -def ssh_2f(hostname, username, answers_dict, port=22):
 +def ssh_2f(hostname, username, answers_dict, port=22, unwanted_prompt=""):
     """
     :param hostname: hostname
     :param username: username
@@ -103,6 +104,10 @@ def ssh_2f(hostname, username, answers_dict, port=22):
             logger.info("Prompt is: '%s'", prmpt_str)
             logger.info(
                 "Answer to ssh prompt is: '%s'", answers_dict[prmpt_str])
 +            if unwanted_prompt and prmpt_str == unwanted_prompt:
 +                # We should not see this prompt
 +                raise ValueError("We got an unwanted prompt: "
 +                                 + answers_dict[prmpt_str])
         return resp
     import paramiko
@@ -193,7 +198,8 @@ class TestOTPToken(IntegrationTest):
         # skipping too many OTP fails
         otp1 = hotp.generate(10).decode("ascii")
 -        kinit_otp(self.master, USER, password=PASSWORD, otp=otp1, success=False)
 +        kinit_otp(self.master, USER, password=PASSWORD, otp=otp1,
 +                  success=False)
         # Now the token is desynchronized
         yield (otpuid, hotp)
@@ -536,3 +542,87 @@ class TestOTPToken(IntegrationTest):
         finally:
             master.run_command(['ipa', 'pwpolicy-mod', '--minlife', '1'])
             master.run_command(['ipa', 'user-del', USER1])
 +
 +    def test_totp_expired_ldap(self):
 +        master = self.master
 +        basedn = master.domain.basedn
 +        USER1 = 'user-expired-otp'
 +        TMP_PASSWORD = 'Secret1234509'
 +        binddn = DN(f"uid={USER1},cn=users,cn=accounts,{basedn}")
 +        controls = [
 +            BooleanControl(
 +                controlType="2.16.840.1.113730.3.8.10.7",
 +                booleanValue=True)
 +        ]
 +
 +        tasks.kinit_admin(master)
 +        master.run_command(['ipa', 'pwpolicy-mod', '--minlife', '0'])
 +        tasks.user_add(master, USER1, password=TMP_PASSWORD)
 +        # Enforce use of OTP token for this user
 +        master.run_command(['ipa', 'user-mod', USER1,
 +                            '--user-auth-type=otp'])
 +        try:
 +            # Change initial password through the IPA endpoint
 +            url = f'https://{master.hostname}/ipa/session/change_password'
 +            master.run_command(['curl', '-d', f'user={USER1}',
 +                                '-d', f'old_password={TMP_PASSWORD}',
 +                                '-d', f'new_password={PASSWORD}',
 +                                '--referer', f'https://{master.hostname}/ipa',
 +                                url])
 +            conn = master.ldap_connect()
 +            # First, attempt authenticating with a password but without LDAP
 +            # control to enforce OTP presence and without server-side
 +            # enforcement of the OTP presence check.
 +            conn.simple_bind(binddn, f"{PASSWORD}")
 +
 +            # Add an OTP token and then modify it to be expired
 +            otpuid, totp = add_otptoken(master, USER1, otptype="totp")
 +
 +            # Make sure OTP auth is working
 +            otpvalue = totp.generate(int(time.time())).decode("ascii")
 +            conn = master.ldap_connect()
 +            conn.simple_bind(binddn, f"{PASSWORD}{otpvalue}",
 +                             client_controls=controls)
 +            conn.unbind()
 +
 +            # Modfy token so that is now expired
 +            args = [
 +                "ipa",
 +                "otptoken-mod",
 +                otpuid,
 +                "--not-after",
 +                "20241001010000Z",
 +            ]
 +            master.run_command(args)
 +
 +            # Next, authenticate with Password+OTP again and with the LDAP
 +            # control this operation should now fail
 +            time.sleep(45)
 +            otpvalue = totp.generate(int(time.time())).decode("ascii")
 +
 +            conn = master.ldap_connect()
 +            with pytest.raises(errors.ACIError):
 +                conn.simple_bind(binddn, f"{PASSWORD}{otpvalue}",
 +                                 client_controls=controls)
 +
 +            # Sleep to make sure we are going to use a different token value
 +            time.sleep(45)
 +
 +            # Use OTP token again but authenticate over ssh and make sure it
 +            # doesn't fallthrough to asking for a password
 +            otpvalue = totp.generate(int(time.time())).decode("ascii")
 +            answers = {
 +                'Enter first factor:': PASSWORD,
 +                'Enter second factor:': otpvalue
 +            }
 +            with pytest.raises(AuthenticationException):
 +                # ssh should fail and NOT ask for a password
 +                ssh_2f(master.hostname, USER1, answers,
 +                       unwanted_prompt="Password:")
 +
 +            # Remove token
 +            del_otptoken(self.master, otpuid)
 +
 +        finally:
 +            master.run_command(['ipa', 'pwpolicy-mod', '--minlife', '1'])
 +            master.run_command(['ipa', 'user-del', USER1])
 -- 
 2.46.2
--- a/0020-ipatests-Activate-ssh-in-sssd.conf.patch
+++ b/0020-ipatests-Activate-ssh-in-sssd.conf.patch
@ -0,0 +1,41 @@
 From 761647f842567713032709753b6d63467d9871a6 Mon Sep 17 00:00:00 2001
 From: Sudhir Menon <sumenon@redhat.com>
 Date: Mon, 23 Sep 2024 14:05:43 +0530
 Subject: [PATCH] ipatests: Activate ssh in sssd.conf
 This testcase checks that services: ssh
 is included in the sssd.conf file when
 ipa-client-install is successful.
 Ref: https://pagure.io/freeipa/issue/9649
 Signed-off-by: Sudhir Menon <sumenon@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipatests/test_integration/test_installation_client.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 diff --git a/ipatests/test_integration/test_installation_client.py b/ipatests/test_integration/test_installation_client.py
 index f8567b39eead4dffd522aad504fa72a086969257..884bff2f2f3e49f66da391424e128d8e31b82a8a 100644
 --- a/ipatests/test_integration/test_installation_client.py
 +++ b/ipatests/test_integration/test_installation_client.py
@@ -94,6 +94,16 @@ class TestInstallClient(IntegrationTest):
         ).encode() not in krb5_cfg
         tasks.uninstall_client(self.clients[0])
 +    def test_check_ssh_service_is_activated(self):
 +        """
 +        This test checks all default services are activated
 +        in sssd.conf including ssh
 +        """
 +        tasks.install_client(self.master, self.clients[0])
 +        sssd_cfg = self.clients[0].get_file_contents(paths.SSSD_CONF)
 +        assert 'services = nss, pam, ssh, sudo' in sssd_cfg.decode()
 +        tasks.uninstall_client(self.clients[0])
 +
     def test_install_with_automount(self):
         """Test that installation with automount is successful"""
         tasks.install_client(self.master, self.clients[0],
 -- 
 2.46.2
--- a/0021-ipa-migrate-man-page-fix-typos-and-errors.patch
+++ b/0021-ipa-migrate-man-page-fix-typos-and-errors.patch
@ -0,0 +1,131 @@
 From f978fa05e3ed9d4ad9d20493c05c77fb9b4976a7 Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Tue, 15 Oct 2024 17:04:55 +0200
 Subject: [PATCH] ipa-migrate man page: fix typos and errors
 ipa-migrate man page mentions non-existing option --hostname.
 Fix the SYNOPSIS and various typos.
 Fixes: https://pagure.io/freeipa/issue/9681
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Mark Reynolds <mreynolds@redhat.com>
 ---
 install/tools/man/ipa-migrate.1 | 38 +++++++++++++++------------------
 1 file changed, 17 insertions(+), 21 deletions(-)
 diff --git a/install/tools/man/ipa-migrate.1 b/install/tools/man/ipa-migrate.1
 index 47ae47ea4afa3a5a6fe25dd9bbd14c27ab5f1fdb..5106f4f0f5b5928909ccd5abcef3bb6d1586f5df 100644
 --- a/install/tools/man/ipa-migrate.1
 +++ b/install/tools/man/ipa-migrate.1
@@ -5,11 +5,11 @@
 .SH "NAME"
 ipa\-migrate \- Migrate an IPA server from one machine to another
 .SH "SYNOPSIS"
 -ipa\-migrate
 +\fBipa\-migrate\fR [OPTIONS] \fBprod\-mode\fR|\fBstage\-mode\fR \fIhostname\fR
 .SH "DESCRIPTION"
 Use the \fIipa-migrate\fR command to migrate one
 -IPA server to an existing local IPA server installation.
 +IPA server \fIhostname\fR to an existing local IPA server installation.
 Migrate IPA schema, configuration, and database to a local IPA server.  This
 migration can be done online, where the tool will query the remote server. Or,
@@ -19,7 +19,6 @@ and then use an exported LDIF file for the database migration portion (this
 might be more useful for very large databases as you don't need to worry about
 network interruptions)
 -.SH POSITIONAL ARGUMENTS
 .TP
 \fBprod\-mode\fR
 In this mode everything will be migrated including the current user SIDs and
@@ -28,13 +27,10 @@ DNA ranges
 \fBstage\-mode\fR
 In this mode, SIDs & DNA ranges are not migrated, and DNA attributes are reset
 -.SH "COMMANDS"
 +.SH "OPTIONS"
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 -Use verbose output while running the migration tool.
 -.TP
 -\fB\-e\fR, \fB\-\-hostname=HOSTNAME\fR
 -The host name of the remote IPA server that is being migrated from.
 +Use verbose output while running the migration tool
 .TP
 \fB\-D\fR, \fB\-\-bind\-dn=BIND_DN\fR
 The Bind DN (Distinguished Name) or an LDAP entry to bind to the remote IPA server with.
@@ -43,10 +39,10 @@ access to read the userPassword attribute.  If ommitted the default is "cn=direc
 .TP
 \fB\-w\fR, \fB\-\-bind\-pw=PASSWORD\fR
 The password for the Bind DN that is authenticating against the remote IPA server.  If
 -a password is not provided then the tool with prompt for the password if needed.
 +a password is not provided then the tool with prompt for the password if needed
 .TP
 -\fB\-Just\fR, \fB\-\-bind\-pw\-file=FILE_PATH\fR
 -Path to a file containing the password for the Bind DN.
 +\fB\-j\fR, \fB\-\-bind\-pw\-file=FILE_PATH\fR
 +Path to a file containing the password for the Bind DN
 .TP
 \fB\-Z\fR, \fB\-\-cacertfile=FILE_PATH\fR
 Path to a file containing a CA Certificate that the remote server trusts
@@ -55,23 +51,23 @@ Path to a file containing a CA Certificate that the remote server trusts
 Path to a file containing the migration log.  By default the tool will use \fI/var/log/ipa-migrate.log\fR
 .TP
 \fB\-x\fR, \fB\-\-dryrun\fR
 -Go through the migration process but do not write and data to the new IPA server.
 +Go through the migration process but do not write any data to the new IPA server
 .TP
 \fB\-o\fR, \fB\-\-dryrun\-record=FILE_PATH\fR
 Go through the migration process but do not write any data to the new IPA server. However, write the
 -migration operations to an LDIF file which can be applied later or reused for multiple migrations.
 +migration operations to an LDIF file which can be applied later or reused for multiple migrations
 .TP
 \fB\-r\fR, \fB\-\-reset\-range\fR
 Reset the ID range for migrated users/groups. In "stage-mode" this is done automatically
 .TP
 \fB\-F\fR, \fB\-\-force\fR
 -Ignore any errors and continue to proceed with migration effort.
 +Ignore any errors and continue to proceed with migration effort
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
 -Only log errors during the migration process.
 +Only log errors during the migration process
 .TP
 \fB\-B\fR, \fB\-\-migrate\-dns\fR
 -Migrate thr DNS records
 +Migrate the DNS records
 .TP
 \fB\-S\fR, \fB\-\-skip\-schema\fR
 Do not migrate the database schema
@@ -80,21 +76,21 @@ Do not migrate the database schema
 Do not migrate the database configuration (dse.ldif/cn=config)
 .TP
 \fB\-O\fR, \fB\-\-schema\-overwrite\fR
 -Overwrite existing schema definitions.  By default duplicate schema is skipped.
 +Overwrite existing schema definitions.  By default duplicate schema is skipped
 .TP
 \fB\-s\fR, \fB\-\-subtree=DN\fR
 Specifies a custom database subtree that should be included in the migration.
 This is only needed if non-default subtrees/branches were added to the database
 -outside of IPA.
 +outside of IPA
 .TP
 \fB\-f\fR, \fB\-\-db\-ldif=FILE_PATH\fR
 -LDIF file containing the entire backend. If omitted the tool will query the remote IPA server.
 +LDIF file containing the entire backend. If omitted the tool will query the remote IPA server
 .TP
 \fB\-m\fR, \fB\-\-schema\-ldif=FILE_PATH\fR
 -LDIF file containing the schema. If omitted the tool will query the remote IPA server.
 +LDIF file containing the schema. If omitted the tool will query the remote IPA server
 .TP
 \fB\-g\fR, \fB\-\-config\-ldif=FILE_PATH\fR
 -LDIF file containing the entire "cn=config" DIT. If omitted the tool will query the remote IPA server.
 +LDIF file containing the entire "cn=config" DIT. If omitted the tool will query the remote IPA server
 .TP
 \fB\-n\fR, \fB\-\-no\-prompt\fR
 Do not prompt for confirmation before starting migration.  Use at your own risk!
 -- 
 2.46.2
--- a/0022-ipatests-Test-for-ipa-hbac-rule-duplication.patch
+++ b/0022-ipatests-Test-for-ipa-hbac-rule-duplication.patch
@ -0,0 +1,61 @@
 From 7f4e7e1d6a2ae9d05a2dfcf620f4df07d09d9d2b Mon Sep 17 00:00:00 2001
 From: Sudhir Menon <sumenon@redhat.com>
 Date: Thu, 3 Oct 2024 18:45:31 +0530
 Subject: [PATCH] ipatests: Test for ipa hbac rule duplication
 This test checks that ipa-migrate is not creating duplicate default hbac rules
 for allow_all and allow_systemd-user rules.
 Related: https://pagure.io/freeipa/issue/9640
 Signed-off-by: Sudhir Menon <sumenon@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 ---
 .../test_ipa_ipa_migration.py                 | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 diff --git a/ipatests/test_integration/test_ipa_ipa_migration.py b/ipatests/test_integration/test_ipa_ipa_migration.py
 index 288165e8a83a96e6f6bd4e52866f98617f497c56..70c268951a0d7e40806742b16e62b764b2bae37b 100644
 --- a/ipatests/test_integration/test_ipa_ipa_migration.py
 +++ b/ipatests/test_integration/test_ipa_ipa_migration.py
@@ -9,6 +9,7 @@ from __future__ import absolute_import
 from ipatests.test_integration.base import IntegrationTest
 from ipatests.pytest_ipa.integration import tasks
 from ipaplatform.paths import paths
 +from collections import Counter
 import pytest
 import textwrap
@@ -920,3 +921,28 @@ class TestIPAMigrateScenario1(IntegrationTest):
         )
         assert result.returncode == 1
         assert ERR_MSG in result.stderr_text
 +
 +    def test_ipa_hbac_rule_duplication(self):
 +        """
 +        This testcase checks that default hbac rules
 +        are not duplicated on the local server when
 +        ipa-migrate command is run.
 +        """
 +        run_migrate(
 +            self.replicas[0],
 +            "prod-mode",
 +            self.master.hostname,
 +            "cn=Directory Manager",
 +            self.master.config.admin_password,
 +            extra_args=['-n']
 +        )
 +        result = self.replicas[0].run_command(
 +            ['ipa', 'hbacrule-find']
 +        )
 +        lines = result.stdout_text.splitlines()
 +        line = []
 +        for i in lines:
 +            line.append(i.strip())
 +        count = Counter(line)
 +        assert count.get('Rule name: allow_all') < 2
 +        assert count.get('Rule name: allow_systemd-user') < 2
 -- 
 2.46.2
--- a/0023-ipatests-refactor-password-file-handling-in-TestHSMI.patch
+++ b/0023-ipatests-refactor-password-file-handling-in-TestHSMI.patch
@ -0,0 +1,116 @@
 From 142f52fc981fe9f1d693b79a7b49506af2e98829 Mon Sep 17 00:00:00 2001
 From: Mohammad Rizwan <myusuf@redhat.com>
 Date: Mon, 19 Aug 2024 16:08:53 +0530
 Subject: [PATCH] ipatests: refactor password file handling in TestHSMInstall
 When token and associated certs are not being cleaned
 up properly, the subsequent installation fails. Hence
 Password file related scenarios moved out to new test class
 so that it have fresh installation.
 Signed-off-by: Mohammad Rizwan <myusuf@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 ---
 .../nightly_ipa-4-12_latest.yaml              | 12 ++++++++
 .../nightly_ipa-4-12_latest_selinux.yaml      | 13 ++++++++
 ipatests/test_integration/test_hsm.py         | 30 ++++++++++---------
 3 files changed, 41 insertions(+), 14 deletions(-)
 diff --git a/ipatests/prci_definitions/nightly_ipa-4-12_latest.yaml b/ipatests/prci_definitions/nightly_ipa-4-12_latest.yaml
 index 6d18e708fb0512ce21d8db68d4f1ab26849f40b7..07e2a8399ae4cc953adb415b975101ed20c67fd2 100644
 --- a/ipatests/prci_definitions/nightly_ipa-4-12_latest.yaml
 +++ b/ipatests/prci_definitions/nightly_ipa-4-12_latest.yaml
@@ -1950,6 +1950,18 @@ jobs:
         timeout: 6300
         topology: *master_3repl_1client
 +  fedora-latest-ipa-4-12/test_hsm_TestHSMInstallPasswordFile:
 +    requires: [fedora-latest-ipa-4-12/build]
 +    priority: 50
 +    job:
 +      class: RunPytest
 +      args:
 +        build_url: '{fedora-latest-ipa-4-12/build_url}'
 +        test_suite: test_integration/test_hsm.py::TestHSMInstallPasswordFile
 +        template: *ci-ipa-4-12-latest
 +        timeout: 6300
 +        topology: *master_1repl
 +
   fedora-latest-ipa-4-12/test_hsm_TestHSMInstallADTrustBase:
     requires: [fedora-latest-ipa-4-12/build]
     priority: 50
 diff --git a/ipatests/prci_definitions/nightly_ipa-4-12_latest_selinux.yaml b/ipatests/prci_definitions/nightly_ipa-4-12_latest_selinux.yaml
 index 52686df9713975c9590b8a99edb7c3442531fecc..11046be13fca1e7403d0fd74329a66ded3927a6c 100644
 --- a/ipatests/prci_definitions/nightly_ipa-4-12_latest_selinux.yaml
 +++ b/ipatests/prci_definitions/nightly_ipa-4-12_latest_selinux.yaml
@@ -2105,6 +2105,19 @@ jobs:
         timeout: 6300
         topology: *master_3repl_1client
 +  fedora-latest-ipa-4-12/test_hsm_TestHSMInstallPasswordFile:
 +    requires: [fedora-latest-ipa-4-12/build]
 +    priority: 50
 +    job:
 +      class: RunPytest
 +      args:
 +        build_url: '{fedora-latest-ipa-4-12/build_url}'
 +        selinux_enforcing: True
 +        test_suite: test_integration/test_hsm.py::TestHSMInstallPasswordFile
 +        template: *ci-ipa-4-12-latest
 +        timeout: 6300
 +        topology: *master_1repl
 +
   fedora-latest-ipa-4-12/test_hsm_TestHSMInstallADTrustBase:
     requires: [fedora-latest-ipa-4-12/build]
     priority: 50
 diff --git a/ipatests/test_integration/test_hsm.py b/ipatests/test_integration/test_hsm.py
 index 374f5c25fd3453cd45a15d2b0f20cee424282595..42895fcd60a7c02d3b6103c2f6751a367da30b2f 100644
 --- a/ipatests/test_integration/test_hsm.py
 +++ b/ipatests/test_integration/test_hsm.py
@@ -312,24 +312,26 @@ class TestHSMInstall(BaseHSMTest):
         assert returncode == 0
         assert output == "No issues found."
 -    def test_hsm_install_server_password_file(self):
 -        check_version(self.master)
 -        # cleanup before fresh install with password file
 -        for client in self.clients:
 -            tasks.uninstall_client(client)
 -        for replica in self.replicas:
 -            tasks.uninstall_master(replica)
 +class TestHSMInstallPasswordFile(BaseHSMTest):
 -        tasks.uninstall_master(self.master)
 +    num_replicas = 1
 -        delete_hsm_token([self.master] + self.replicas, self.token_name)
 -        self.token_name, self.token_password = get_hsm_token(self.master)
 -        self.master.put_file_contents(self.token_password_file,
 -                                      self.token_password)
 -        self.replicas[0].put_file_contents(self.token_password_file,
 -                                           self.token_password)
 +    @classmethod
 +    def install(cls, mh):
 +        check_version(cls.master)
 +        # Enable pkiuser to read softhsm tokens
 +        cls.master.run_command(['usermod', 'pkiuser', '-a', '-G', 'ods'])
 +        cls.token_name, cls.token_password = get_hsm_token(cls.master)
 +        cls.master.put_file_contents(
 +            cls.token_password_file, cls.token_password
 +        )
 +        cls.replicas[0].put_file_contents(
 +            cls.token_password_file, cls.token_password
 +        )
 +    def test_hsm_install_server_password_file(self):
 +        check_version(self.master)
         tasks.install_master(
             self.master, setup_dns=self.master_with_dns,
             setup_kra=self.master_with_kra,
 -- 
 2.46.2
--- a/0024-ipatests-2FA-test-cases.patch
+++ b/0024-ipatests-2FA-test-cases.patch
@ -0,0 +1,276 @@
 From 6ac11ae003740faf19f3c75bf542ec44f717114f Mon Sep 17 00:00:00 2001
 From: Madhuri Upadhye <mupadhye@redhat.com>
 Date: Tue, 23 Jul 2024 18:14:36 +0530
 Subject: [PATCH] ipatests: 2FA test cases
 Added following:
 Added 'ssh_2fa_with_cmd' method for authentication,
 as for '\n' with paramiko did not work. In a test case
 need to just press `Enter` for `second factor`.
 Advantage of above function is no having paramiko
 dependancy.
 We can run the any command in same session after
 authentication of user.
 Test cases:
 1. Authenticate the user only with password,
 just press enter at `Second factor` and check tgt after auth.
 when User authentication types: otp, password
 2. Authenticate the user with password and otpvalues and
 check tgt of user after auth when
 User authentication types: otp, password
 related: https://github.com/SSSD/sssd/pull/7500
 Signed-off-by: Madhuri Upadhye <mupadhye@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 ipatests/test_integration/test_otp.py | 192 ++++++++++++++++++++++++--
 1 file changed, 181 insertions(+), 11 deletions(-)
 diff --git a/ipatests/test_integration/test_otp.py b/ipatests/test_integration/test_otp.py
 index 878b4fb560ba8d7768ead54b065656462545babd..0babb45897c6107bf354477dbb0d3a805a3116f5 100644
 --- a/ipatests/test_integration/test_otp.py
 +++ b/ipatests/test_integration/test_otp.py
@@ -5,26 +5,27 @@
 """
 import base64
 import logging
 -import pytest
 import re
 -import time
 +import tempfile
 import textwrap
 -from urllib.parse import urlparse, parse_qs
 -from paramiko import AuthenticationException
 +import time
 +from urllib.parse import parse_qs, urlparse
 +import pytest
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.twofactor.hotp import HOTP
 from cryptography.hazmat.primitives.twofactor.totp import TOTP
 -
 -from ipatests.test_integration.base import IntegrationTest
 -from ipaplatform.paths import paths
 -from ipatests.pytest_ipa.integration import tasks
 -from ipapython.dn import DN
 -
 from ldap.controls.simple import BooleanControl
 +from paramiko import AuthenticationException
 from ipalib import errors
 +from ipaplatform.osinfo import osinfo
 +from ipaplatform.paths import paths
 +from ipapython.dn import DN
 +from ipatests.pytest_ipa.integration import tasks
 +from ipatests.test_integration.base import IntegrationTest
 +from ipatests.util import xfail_context
 PASSWORD = "DummyPassword123"
 USER = "opttestuser"
@@ -84,6 +85,65 @@ def kinit_otp(host, user, *, password, otp, success=True):
     )
 +def ssh_2fa_with_cmd(host, hostname, username, password, otpvalue,
 +                     command="exit 0"):
 +    """ ssh to user and in same session pass the command to check tgt of user
 +    :param host: host to ssh
 +    :param hostname: hostname to ssh
 +    :param str username: The name of user
 +    :param str password: password, usually the first factor
 +    :param str otpvalue: generated pin of user
 +    :param str command: command to execute in same session,
 +     by deafult set to "exit 0"
 +    :return: object class of expect command run
 +    """
 +    temp_conf = tempfile.NamedTemporaryFile(suffix='.exp', delete=False)
 +    with open(temp_conf.name, 'w') as tfile:
 +        tfile.write('proc exitmsg { msg code } {\n')
 +        tfile.write('\t# Close spawned program, if we are in the prompt\n')
 +        tfile.write('\tcatch close\n\n')
 +        tfile.write('\t# Wait for the exit code\n')
 +        tfile.write('\tlassign [wait] pid spawnid os_error_flag rc\n\n')
 +        tfile.write('\tputs ""\n')
 +        tfile.write('\tputs "expect result: $msg"\n')
 +        tfile.write('\tputs "expect exit code: $code"\n')
 +        tfile.write('\tputs "expect spawn exit code: $rc"\n')
 +        tfile.write('\texit $code\n')
 +        tfile.write('}\n')
 +        tfile.write('set timeout 60\n')
 +        tfile.write('set prompt ".*\\[#\\$>\\] $"\n')
 +        tfile.write(f'set password "{password}"\n')
 +        tfile.write(f'set otpvalue "{otpvalue}"\n')
 +        tfile.write(f'spawn ssh -o NumberOfPasswordPrompts=1 -o '
 +                    f'StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
 +                    f' -l {username} {hostname} {command}\n')
 +        tfile.write('expect {\n')
 +        tfile.write('"Enter first factor:*" {send -- "$password\r"}\n')
 +        tfile.write('timeout {exitmsg "Unexpected output" 201}\n')
 +        tfile.write('eof {exitmsg "Unexpected end of file" 202}\n')
 +        tfile.write('}\n')
 +        tfile.write('expect {\n')
 +        tfile.write('"Enter second factor:*" {send -- "$otpvalue\r"}\n')
 +        tfile.write('timeout {exitmsg "Unexpected output" 201}\n')
 +        tfile.write('eof {exitmsg "Unexpected end of file" 202}\n')
 +        tfile.write('}\n')
 +        tfile.write('expect {\n')
 +        tfile.write('"Authentication failure" '
 +                    '{exitmsg "Authentication failure" 1}\n')
 +        tfile.write('eof {exitmsg "Authentication successful" 0}\n')
 +        tfile.write('timeout {exitmsg "Unexpected output" 201}\n')
 +        tfile.write('}\n')
 +        tfile.write('expect {\n')
 +        tfile.write('exitmsg "Unexpected code path" 203\n')
 +        tfile.write('EOF\n')
 +        tfile.write('}')
 +    host.transport.put_file(temp_conf.name, '/tmp/ssh.exp')
 +    tasks.clear_sssd_cache(host)
 +    expect_cmd = 'expect -f /tmp/ssh.exp'
 +    cmd = host.run_command(expect_cmd, raiseonerr=False)
 +    return cmd
 +
 +
 def ssh_2f(hostname, username, answers_dict, port=22, unwanted_prompt=""):
     """
     :param hostname: hostname
@@ -91,6 +151,7 @@ def ssh_2f(hostname, username, answers_dict, port=22, unwanted_prompt=""):
     :param answers_dict: dictionary of options with prompt_message and value.
     :param port: port for ssh
     """
 +
     # Handler for server questions
     def answer_handler(title, instructions, prompt_list):
         resp = []
@@ -131,8 +192,9 @@ class TestOTPToken(IntegrationTest):
     @classmethod
     def install(cls, mh):
 -        super(TestOTPToken, cls).install(mh)
         master = cls.master
 +        tasks.install_packages(master, ['expect'])
 +        super(TestOTPToken, cls).install(mh)
         tasks.kinit_admin(master)
         # create service with OTP auth indicator
@@ -398,6 +460,114 @@ class TestOTPToken(IntegrationTest):
             self.master.run_command(['semanage', 'login', '-D'])
             sssd_conf_backup.restore()
 +    def test_2fa_only_with_password(self):
 +        """Test ssh with 2FA only with the password(first factor) when
 +        user-auth-type is opt and password.
 +
 +        Test for :  https://github.com/SSSD/sssd/pull/7500
 +
 +        Add the IPA user and user-auth-type set to opt and password.
 +        Authenticate the user only with password, just press enter
 +        at `Second factor`
 +        """
 +        master = self.master
 +        USER3 = 'sshuser3'
 +        sssd_conf_backup = tasks.FileBackup(master, paths.SSSD_CONF)
 +        first_prompt = 'Enter first factor:'
 +        second_prompt = 'Enter second factor:'
 +        add_contents = textwrap.dedent('''
 +            [prompting/2fa/sshd]
 +            single_prompt = False
 +            first_prompt = {0}
 +            second_prompt = {1}
 +            ''').format(first_prompt, second_prompt)
 +        set_sssd_conf(master, add_contents)
 +        tasks.create_active_user(master, USER3, PASSWORD)
 +        tasks.kinit_admin(master)
 +        master.run_command(['ipa', 'user-mod', USER3, '--user-auth-type=otp',
 +                            '--user-auth-type=password'])
 +        try:
 +            otpuid, totp = add_otptoken(master, USER3, otptype='totp')
 +            master.run_command(['ipa', 'otptoken-show', otpuid])
 +            totp.generate(int(time.time())).decode('ascii')
 +            otpvalue = "\n"
 +            tasks.clear_sssd_cache(self.master)
 +            github_ticket = "https://github.com/SSSD/sssd/pull/7500"
 +            sssd_version = tasks.get_sssd_version(master)
 +            rhel_fail = (
 +                osinfo.id == 'rhel'
 +                and sssd_version < tasks.parse_version("2.9.5")
 +            )
 +            fedora_fail = (
 +                osinfo.id == 'fedora'
 +                and sssd_version == tasks.parse_version("2.9.5")
 +            )
 +            with xfail_context(rhel_fail or fedora_fail, reason=github_ticket):
 +                result = ssh_2fa_with_cmd(master,
 +                                          self.master.external_hostname,
 +                                          USER3, PASSWORD, otpvalue=otpvalue,
 +                                          command="klist")
 +                print(result.stdout_text)
 +                assert ('Authentication successful') in result.stdout_text
 +                assert USER3 in result.stdout_text
 +                assert (f'Default principal: '
 +                        f'{USER3}@{self.master.domain.realm}' in
 +                        result.stdout_text)
 +                cmd = self.master.run_command(['semanage', 'login', '-l'])
 +                assert USER3 in cmd.stdout_text
 +        finally:
 +            master.run_command(['ipa', 'user-del', USER3])
 +            self.master.run_command(['semanage', 'login', '-D'])
 +            sssd_conf_backup.restore()
 +
 +    def test_2fa_with_otp_password(self):
 +        """Test ssh with 2FA only with password and otpvalue when
 +        user-auth-type is opt and password.
 +
 +        Test for :  https://github.com/SSSD/sssd/pull/7500
 +
 +        Add the IPA user and user-auth-type set to opt and password.
 +        Authenticate the user only with password and otpvalue.
 +        """
 +        master = self.master
 +        USER4 = 'sshuser4'
 +        sssd_conf_backup = tasks.FileBackup(master, paths.SSSD_CONF)
 +        first_prompt = 'Enter first factor:'
 +        second_prompt = 'Enter second factor:'
 +        add_contents = textwrap.dedent('''
 +            [prompting/2fa/sshd]
 +            single_prompt = False
 +            first_prompt = {0}
 +            second_prompt = {1}
 +            ''').format(first_prompt, second_prompt)
 +        set_sssd_conf(master, add_contents)
 +        tasks.create_active_user(master, USER4, PASSWORD)
 +        tasks.kinit_admin(master)
 +
 +        master.run_command(['ipa', 'user-mod', USER4, '--user-auth-type=otp',
 +                            '--user-auth-type=password'])
 +        try:
 +            otpuid, totp = add_otptoken(master, USER4, otptype='totp')
 +            master.run_command(['ipa', 'otptoken-show', otpuid])
 +            otpvalue = totp.generate(int(time.time())).decode('ascii')
 +            tasks.clear_sssd_cache(self.master)
 +            result = ssh_2fa_with_cmd(master,
 +                                      self.master.external_hostname,
 +                                      USER4, PASSWORD, otpvalue=otpvalue,
 +                                      command="klist")
 +            print(result.stdout_text)
 +            cmd = self.master.run_command(['semanage', 'login', '-l'])
 +            # check the output
 +            assert ('Authentication successful') in result.stdout_text
 +            assert USER4 in result.stdout_text
 +            assert (f'Default principal: {USER4}@'
 +                    f'{self.master.domain.realm}' in result.stdout_text)
 +            assert USER4 in cmd.stdout_text
 +        finally:
 +            master.run_command(['ipa', 'user-del', USER4])
 +            self.master.run_command(['semanage', 'login', '-D'])
 +            sssd_conf_backup.restore()
 +
     @pytest.fixture
     def setup_otp_nsslapd(self):
         check_services = self.master.run_command(
 -- 
 2.46.2
--- a/0025-Small-fixup-to-determine-which-ACME-uninstaller-to-u.patch
+++ b/0025-Small-fixup-to-determine-which-ACME-uninstaller-to-u.patch
@ -0,0 +1,34 @@
 From 9a2de23eb5e00efa72189c4a86d9db1fab52c2ca Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Thu, 24 Oct 2024 11:49:17 -0400
 Subject: [PATCH] Small fixup to determine which ACME uninstaller to use
 The conditional was <= 11.5.0 which it should have been
 < 11.6.0 to allow for small updates to the 11.5.0 branch.
 Fixes: https://pagure.io/freeipa/issue/9673
 Fixes: https://pagure.io/freeipa/issue/9674
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 ipaserver/install/dogtaginstance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
 index 4b0f4d274b0c33140ed6f939f1a3fd8b75930ff9..58421a1d8859e5dd1357e07fd605e84e49048951 100644
 --- a/ipaserver/install/dogtaginstance.py
 +++ b/ipaserver/install/dogtaginstance.py
@@ -311,7 +311,7 @@ class DogtagInstance(service.Service):
                 return
             elif (
                 pki.util.Version("11.0.0") <= pki_version
 -                <= pki.util.Version("11.5.0")
 +                < pki.util.Version("11.6.0")
             ):
                 args = ['pki-server', 'acme-remove']
             else:
 -- 
 2.47.0
--- a/0026-Fix-a-couple-of-instances-of-the-no-break-control-ch.patch
+++ b/0026-Fix-a-couple-of-instances-of-the-no-break-control-ch.patch
@ -0,0 +1,52 @@
 From 993f792f2e26f8a14a5e3691c06a6b15d57072e7 Mon Sep 17 00:00:00 2001
 From: Sam Morris <sam@robots.org.uk>
 Date: Tue, 17 Sep 2024 12:43:08 +0100
 Subject: [PATCH] Fix a couple of instances of the "no-break control character"
 being used inadvertently
 Fixes https://pagure.io/freeipa/issue/9665
 Signed-off-by: Sam Morris <sam@robots.org.uk>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 client/man/ipa-client-install.1 | 4 ++--
 client/man/ipa.1                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
 index 4a755ac33d35246304303b847a62cb3fc97680b7..725b114224781e2f7ec7c71eaf5b7be807008655 100644
 --- a/client/man/ipa-client-install.1
 +++ b/client/man/ipa-client-install.1
@@ -240,8 +240,8 @@ for more information. The option is mutually exclusive with
 \fB\-\-pkinit\-anchor\fR=\fIFILEDIR\fR
 Trust anchors (root and intermediate CA certs) for PKINIT. \fIFILEDIR\fR is
 either the absolute path to a PEM bundle (for example
 -'FILE:/etc/pki/tls/cert.pem') or to an OpenSSL hash directory (for example
 -'DIR:/etc/ssl/certs/'). The option can be used multiple times. PKINIT
 +\fIFILE:/etc/pki/tls/cert.pem\fR) or to an OpenSSL hash directory (for example
 +\fIDIR:/etc/ssl/certs/\fR). The option can be used multiple times. PKINIT
 requires the full trust chain of the Kerberos KDC server as well as the full
 trust chain of the identity certificate.
 diff --git a/client/man/ipa.1 b/client/man/ipa.1
 index 172c50d8a1f2ba137ea10d93343fb54efbdb765d..c404c5be36da78ebb4d08cd0e4b2b9ea27d9e71b 100644
 --- a/client/man/ipa.1
 +++ b/client/man/ipa.1
@@ -176,11 +176,11 @@ journal as journald records execution context. See systemd.journal\-fields(7)
 for details.
 The details of the individual logged messages can be explained with the help of
 -'\fBjournalctl -x\fR' command, while full set of logged properties can be
 -retrieved with '\fBjournalctl -o json-pretty\fR'. See journalctl(1) for details
 +\fBjournalctl -x\fR command, while full set of logged properties can be
 +retrieved with \fBjournalctl -o json-pretty\fR. See journalctl(1) for details
 on the systemd journal viewer.
 -For the sample message above, an explanation could be requested with '\fBjournalctl -x -g ldap2_140328582446688\fR' where LDAP backend connection instance identifier can be used to uniquely fetch that individual message.
 +For the sample message above, an explanation could be requested with \fBjournalctl -x -g ldap2_140328582446688\fR where LDAP backend connection instance identifier can be used to uniquely fetch that individual message.
 .SH "EXAMPLES"
 .TP
 -- 
 2.47.0
--- a/0027-ipa-migrate-dryrun-write-updates-crashes-when-removi.patch
+++ b/0027-ipa-migrate-dryrun-write-updates-crashes-when-removi.patch
@ -0,0 +1,35 @@
 From 3d0962014adda39b754c4274ccb5ca5d70963c33 Mon Sep 17 00:00:00 2001
 From: Mark Reynolds <mreynolds@redhat.com>
 Date: Mon, 21 Oct 2024 13:51:13 -0400
 Subject: [PATCH] ipa-migrate - dryrun write updates crashes when removing
 values
 When removing values the mod value list is None and that leads to a
 crash when trying to iterate it. Instead check that the vals are not
 None before looping.
 Fixes: https://pagure.io/freeipa/issue/9682
 Signed-off-by: MArk Reynolds <mreynolds@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipaserver/install/ipa_migrate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/ipaserver/install/ipa_migrate.py b/ipaserver/install/ipa_migrate.py
 index 38356aa23ea435e2a616f48356feaea7b50dd1e4..f35629378490d3d45ca97f2aa5b4390c67d660ed 100644
 --- a/ipaserver/install/ipa_migrate.py
 +++ b/ipaserver/install/ipa_migrate.py
@@ -622,7 +622,7 @@ class IPAMigrate():
                 else:
                     action = "replace"
                 ldif_entry += f"{action}: {attr}\n"
 -                for val in vals:
 +                for val in list(vals or []):
                     ldif_entry += get_ldif_attr_val(attr, val)
                 ldif_entry += "-\n"
             ldif_entry += "\n"
 -- 
 2.47.0
--- a/0028-ipa-migrate-should-migrate-dns-forward-zones.patch
+++ b/0028-ipa-migrate-should-migrate-dns-forward-zones.patch
@ -0,0 +1,30 @@
 From 6bdb8603054fc60e9479f6aaf8b6315dfe508891 Mon Sep 17 00:00:00 2001
 From: Mark Reynolds <mreynolds@redhat.com>
 Date: Tue, 22 Oct 2024 13:00:03 -0400
 Subject: [PATCH] ipa-migrate should migrate dns forward zones
 Fixes: https://pagure.io/freeipa/issue/9686
 Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipaserver/install/ipa_migrate_constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/ipaserver/install/ipa_migrate_constants.py b/ipaserver/install/ipa_migrate_constants.py
 index 250f1b5b01bf066d316a98489ab6153b89615173..c140414ea6c607a93e35ef0705480d1002b7945e 100644
 --- a/ipaserver/install/ipa_migrate_constants.py
 +++ b/ipaserver/install/ipa_migrate_constants.py
@@ -993,7 +993,7 @@ DB_OBJECTS = {
         'count': 0,
     },
     'dns_records': {
 -        'oc': ['idnsrecord', 'idnszone'],
 +        'oc': ['idnsrecord', 'idnszone', 'idnsforwardzone'],
         'subtree': ',cn=dns,$SUFFIX',
         'label': 'DNS Records',
         'mode': 'all',
 -- 
 2.47.0
--- a/0029-vault-handle-pyca-InternalError-exception-for-PKCS-1.patch
+++ b/0029-vault-handle-pyca-InternalError-exception-for-PKCS-1.patch
@ -0,0 +1,44 @@
 From dad2f06ed6854abbd81b747c26de6c13dfea327b Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Wed, 30 Oct 2024 10:48:50 +0200
 Subject: [PATCH] vault: handle pyca InternalError exception for PKCS#1 v1.5
 padding
 In FIPS mode one cannot use PKCS#1 v1.5 padding. OpenSSL did remove it
 from the FIPS provider and will report an error that PyCA cannot
 process, so it will raise its own InternalException.
 Handle it the same way as ValueError.
 Fixes: https://pagure.io/freeipa/issue/9689
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Francisco Trivino <ftrivino@redhat.com>
 ---
 ipaclient/plugins/vault.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/ipaclient/plugins/vault.py b/ipaclient/plugins/vault.py
 index 96edf09a2060e7b39e1e96c6fa65ae095ec18e73..75415c03a57242ae674636fa31a72db2fa56d6ea 100644
 --- a/ipaclient/plugins/vault.py
 +++ b/ipaclient/plugins/vault.py
@@ -37,6 +37,7 @@ from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.primitives.padding import PKCS7
 from cryptography.hazmat.primitives.serialization import (
     load_pem_public_key, load_pem_private_key)
 +from cryptography.exceptions import InternalError as CryptographyInternalError
 from ipaclient.frontend import MethodOverride
 from ipalib import x509
@@ -717,7 +718,7 @@ class ModVaultData(Local):
                     algo.key,
                     padding.PKCS1v15()
                 )
 -            except ValueError:
 +            except (ValueError, CryptographyInternalError):
                 wrapped_session_key = public_key.encrypt(
                     algo.key,
                     padding.OAEP(
 -- 
 2.47.0
--- a/0030-ipatests-Tests-for-ipa-migrate-tool.patch
+++ b/0030-ipatests-Tests-for-ipa-migrate-tool.patch
@ -0,0 +1,784 @@
 From 9da927c8eec7db6d1c75c296eef45beb93797e58 Mon Sep 17 00:00:00 2001
 From: Sudhir Menon <sumenon@redhat.com>
 Date: Thu, 1 Aug 2024 16:30:16 +0530
 Subject: [PATCH] ipatests: Tests for ipa-migrate tool
 This patch includes test to covers below scenarios
 1. hbac and sudo rules are migrated to local server
 2. uid for user migrated varies in stage/prod mode.
 3. subids are migrated to local server
 4. idranges are migrated to local server
 5. vaults are not migrated to local server.
 6. Ensure trust related data is also migrated to local server
 7. Added paths.IPA_MIGRATE_LOG in ipatests/pytest_ipa/integration/__init__.py
 Signed-off-by: Sudhir Menon <sumenon@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 ipatests/pytest_ipa/integration/__init__.py   |   2 +
 .../test_ipa_ipa_migration.py                 | 596 ++++++++++++++----
 2 files changed, 460 insertions(+), 138 deletions(-)
 diff --git a/ipatests/pytest_ipa/integration/__init__.py b/ipatests/pytest_ipa/integration/__init__.py
 index 34b6ef0fb1e49fbb9c86e7496de50cf5cda5e91e..eb032cd72d2aa2a5ed4c476e3cb04dc77f607eaa 100644
 --- a/ipatests/pytest_ipa/integration/__init__.py
 +++ b/ipatests/pytest_ipa/integration/__init__.py
@@ -88,6 +88,8 @@ CLASS_LOGFILES = [
     paths.VAR_LOG_AUDIT,
     # sssd
     paths.VAR_LOG_SSSD_DIR,
 +    # ipa-ipa-migration logs
 +    paths.IPA_MIGRATE_LOG,
     # system
     paths.RESOLV_CONF,
     paths.HOSTS,
 diff --git a/ipatests/test_integration/test_ipa_ipa_migration.py b/ipatests/test_integration/test_ipa_ipa_migration.py
 index 70c268951a0d7e40806742b16e62b764b2bae37b..d852ca63a6b3a7e7118d66ce1cd9bb98e56f1a73 100644
 --- a/ipatests/test_integration/test_ipa_ipa_migration.py
 +++ b/ipatests/test_integration/test_ipa_ipa_migration.py
@@ -12,6 +12,7 @@ from ipaplatform.paths import paths
 from collections import Counter
 import pytest
 +import re
 import textwrap
@@ -65,29 +66,7 @@ def prepare_ipa_server(master):
             "--secondary-rid-base=400000",
         ]
     )
 -
 -    # Add Automount locations and maps
 -    master.run_command(["ipa", "automountlocation-add", "baltimore"])
 -    master.run_command(["ipa", "automountmap-add", "baltimore", "auto.share"])
 -    master.run_command(
 -        [
 -            "ipa",
 -            "automountmap-add-indirect",
 -            "baltimore",
 -            "--parentmap=auto.share",
 -            "--mount=sub auto.man",
 -        ]
 -    )
 -    master.run_command(
 -        [
 -            "ipa",
 -            "automountkey-add",
 -            "baltimore",
 -            "auto.master",
 -            "--key=/share",
 -            "--info=auto.share",
 -        ]
 -    )
 +    master.run_command(["ipactl", "restart"])
     # Run ipa-adtrust-install
     master.run_command(["dnf", "install", "-y", "ipa-server-trust-ad"])
@@ -235,6 +214,17 @@ def prepare_ipa_server(master):
         ["ipa", "hbacrule-add-service", "--hbacsvcs=sshd", "testuser_sshd"]
     )
 +    # Add DNSForwardzone
 +    master.run_command(
 +        [
 +            "ipa",
 +            "dnsforwardzone-add",
 +            "forwardzone.test",
 +            "--forwarder",
 +            "10.11.12.13",
 +        ]
 +    )
 +
     # Vault addition
     master.run_command(
         [
@@ -244,6 +234,7 @@ def prepare_ipa_server(master):
             "vault1234",
             "--type",
             "symmetric",
 +            "testvault",
         ]
     )
@@ -260,7 +251,46 @@ def prepare_ipa_server(master):
     # Modify passkeyconfig
     master.run_command(
 -        ["ipa", "passkeyconfig-mod", "--require-user-verification=FALSE"]
 +        [
 +            "ipa", "passkeyconfig-mod",
 +            "--require-user-verification=FALSE"
 +        ]
 +    )
 +
 +    # Adding automountlocation, maps, keys
 +    master.run_command(
 +        [
 +            "ipa", "automountlocation-add",
 +            "baltimore"
 +        ]
 +    )
 +
 +    master.run_command(
 +        [
 +            "ipa", "automountmap-add",
 +            "baltimore",
 +            "auto.share"
 +        ]
 +    )
 +
 +    master.run_command(
 +        [
 +            "ipa", "automountmap-add-indirect",
 +            "baltimore",
 +            "--parentmap=auto.share",
 +            "--mount=sub",
 +            "auto.man",
 +        ]
 +    )
 +
 +    master.run_command(
 +        [
 +            "ipa", "automountkey-add",
 +            "baltimore",
 +            "auto.master",
 +            "--key=/share",
 +            "--info=auto.share",
 +        ]
     )
@@ -288,12 +318,24 @@ def run_migrate(
     return result
 -class TestIPAMigrateScenario1(IntegrationTest):
 +@pytest.fixture()
 +def empty_log_file(request):
     """
 -    Tier-1 tests for ipa-migrate tool with DNS enabled on
 -    local and remote server
 +    This fixture empties the log file before ipa-migrate tool
 +    is run since the log is appended everytime the tool is run.
     """
 +    request.cls.replicas[0].run_command(
 +        ["truncate", "-s", "0", paths.IPA_MIGRATE_LOG]
 +    )
 +    yield
 +
 +class MigrationTest(IntegrationTest):
 +    """
 +    This class will help setup remote IPA server(cls.master)
 +    and local IPA server(cls.replicas[0]) and it will
 +    also prepare the remote IPA before migration actually begins.
 +    """
     num_replicas = 1
     num_clients = 1
     topology = "line"
@@ -303,14 +345,14 @@ class TestIPAMigrateScenario1(IntegrationTest):
         tasks.install_master(cls.master, setup_dns=True, setup_kra=True)
         prepare_ipa_server(cls.master)
         tasks.install_client(cls.master, cls.clients[0], nameservers=None)
 +        tasks.install_master(cls.replicas[0], setup_dns=True, setup_kra=True)
 -    def test_remote_server(self):
 -        """
 -        This test installs IPA server instead of replica on
 -        system under test with the same realm and domain name.
 -        """
 -        tasks.install_master(self.replicas[0], setup_dns=True, setup_kra=True)
 +class TestIPAMigrateCLIOptions(MigrationTest):
 +    """
 +    Tests to check CLI options for ipa-migrate tool with
 +    DNS enabled on local and remote server.
 +    """
     def test_ipa_migrate_without_kinit_as_admin(self):
         """
         This test checks that ipa-migrate tool displays
@@ -417,7 +459,7 @@ class TestIPAMigrateScenario1(IntegrationTest):
         """
         ldif_file = "/tmp/test.ldif"
         param = ['-x', '-o', ldif_file]
 -        run_migrate(
 +        result = run_migrate(
             self.replicas[0],
             "stage-mode",
             self.master.hostname,
@@ -426,45 +468,21 @@ class TestIPAMigrateScenario1(IntegrationTest):
             extra_args=param,
         )
         assert self.replicas[0].transport.file_exists("/tmp/test.ldif")
 +        assert result.returncode == 0
 -    @pytest.fixture()
 -    def empty_log_file(self):
 -        """
 -        This fixture empties the log file before ipa-migrate tool
 -        is run since the log is appended everytime the tool is run.
 -        """
 -        self.replicas[0].run_command(
 -            ["truncate", "-s", "0", paths.IPA_MIGRATE_LOG]
 -        )
 -        yield
 -
 -    def test_ipa_sigden_plugin_fail_error(self, empty_log_file):
 -        """
 -        This testcase checks that sidgen plugin fail error is
 -        not seen during migrate prod-mode
 -        """
 -        SIDGEN_ERR_MSG = "SIDGEN task failed: \n"
 -        run_migrate(
 -            self.replicas[0],
 -            "stage-mode",
 -            self.master.hostname,
 -            "cn=Directory Manager",
 -            self.master.config.admin_password,
 -            extra_args=['-x'],
 -        )
 -        error_msg = self.replicas[0].get_file_contents(
 -            paths.IPA_MIGRATE_LOG, encoding="utf-8"
 -        )
 -        assert SIDGEN_ERR_MSG not in error_msg
 -
 -    def test_ipa_migrate_stage_mode_dry_run(self, empty_log_file):
 +    def test_ipa_migrate_stage_mode_dry_run(self):
         """
         Test ipa-migrate stage mode with dry-run option
 +        This test also checks SIDGEN task failure is
 +        not seen in ipa migrate log.
         """
         tasks.kinit_admin(self.master)
         tasks.kinit_admin(self.replicas[0])
 +        SIDGEN_ERR_MSG = "SIDGEN task failed: \n"
         IPA_MIGRATE_STAGE_DRY_RUN_LOG = "--dryrun=True\n"
 -        IPA_SERVER_UPRGADE_LOG = "Skipping ipa-server-upgrade in dryrun mode.\n"
 +        IPA_SERVER_UPRGADE_LOG = (
 +            "Skipping ipa-server-upgrade in dryrun mode.\n"
 +        )
         IPA_SKIP_SIDGEN_LOG = "Skipping SIDGEN task in dryrun mode."
         result = run_migrate(
             self.replicas[0],
@@ -481,6 +499,7 @@ class TestIPAMigrateScenario1(IntegrationTest):
         assert IPA_MIGRATE_STAGE_DRY_RUN_LOG in install_msg
         assert IPA_SERVER_UPRGADE_LOG in install_msg
         assert IPA_SKIP_SIDGEN_LOG in install_msg
 +        assert SIDGEN_ERR_MSG not in install_msg
     def test_ipa_migrate_prod_mode_dry_run(self, empty_log_file):
         """
@@ -509,7 +528,7 @@ class TestIPAMigrateScenario1(IntegrationTest):
         assert IPA_SERVER_UPRGADE_LOG in install_msg
         assert IPA_SIDGEN_LOG in install_msg
 -    def test_ipa_migrate_with_skip_schema_option_dry_run(self, empty_log_file):
 +    def test_ipa_migrate_skip_schema_dry_run(self, empty_log_file):
         """
         This test checks that ipa-migrate tool works
         with -S(schema) options in stage mode
@@ -532,7 +551,7 @@ class TestIPAMigrateScenario1(IntegrationTest):
         )
         assert SKIP_SCHEMA_MSG_LOG in install_msg
 -    def test_ipa_migrate_with_skip_config_option_dry_run(self, empty_log_file):
 +    def test_ipa_migrate_skip_config_dry_run(self, empty_log_file):
         """
         This test checks that ipa-migrate tool works
         with -C(config) options in stage mode
@@ -579,7 +598,7 @@ class TestIPAMigrateScenario1(IntegrationTest):
         )
         assert RESET_RANGE_LOG in install_msg
 -    def test_ipa_migrate_stage_mode_dry_override_schema(self, empty_log_file):
 +    def test_ipa_migrate_stage_mode_override_schema(self, empty_log_file):
         """
         This test checks that -O option (override schema) works
         in dry mode
@@ -601,70 +620,6 @@ class TestIPAMigrateScenario1(IntegrationTest):
         )
         assert SCHEMA_OVERRIDE_LOG in install_msg
 -    def test_ipa_migrate_stage_mode(self, empty_log_file):
 -        """
 -        This test checks that ipa-migrate is successful
 -        in dry run mode
 -        """
 -        tasks.kinit_admin(self.master)
 -        tasks.kinit_admin(self.replicas[0])
 -        MIGRATION_SCHEMA_LOG_MSG = "Migrating schema ...\n"
 -        MIGRATION_CONFIG_LOG_MSG = "Migrating configuration ...\n"
 -        IPA_UPGRADE_LOG_MSG = (
 -            "Running ipa-server-upgrade ... (this may take a while)\n"
 -        )
 -        SIDGEN_TASK_LOG_MSG = "Running SIDGEN task ...\n"
 -        MIGRATION_COMPLETE_LOG_MSG = "Migration complete!\n"
 -        result = run_migrate(
 -            self.replicas[0],
 -            "stage-mode",
 -            self.master.hostname,
 -            "cn=Directory Manager",
 -            self.master.config.admin_password,
 -            extra_args=['-n'],
 -        )
 -        install_msg = self.replicas[0].get_file_contents(
 -            paths.IPA_MIGRATE_LOG, encoding="utf-8"
 -        )
 -        assert result.returncode == 0
 -        assert MIGRATION_SCHEMA_LOG_MSG in install_msg
 -        assert MIGRATION_CONFIG_LOG_MSG in install_msg
 -        assert IPA_UPGRADE_LOG_MSG in install_msg
 -        assert SIDGEN_TASK_LOG_MSG in install_msg
 -        assert MIGRATION_COMPLETE_LOG_MSG in install_msg
 -
 -    def test_ipa_migrate_prod_mode(self, empty_log_file):
 -        """
 -        This test checks that ipa-migrate is successful
 -        in prod run mode
 -        """
 -        tasks.kinit_admin(self.master)
 -        tasks.kinit_admin(self.replicas[0])
 -        MIGRATION_SCHEMA_LOG_MSG = "Migrating schema ...\n"
 -        MIGRATION_DATABASE_LOG_MSG = (
 -            "Migrating database ... (this may take a while)\n"
 -        )
 -        IPA_UPGRADE_LOG_MSG = (
 -            "Running ipa-server-upgrade ... (this may take a while)\n"
 -        )
 -        SIDGEN_TASK_LOG_MSG = "Running SIDGEN task ...\n"
 -        result = run_migrate(
 -            self.replicas[0],
 -            "prod-mode",
 -            self.master.hostname,
 -            "cn=Directory Manager",
 -            self.master.config.admin_password,
 -            extra_args=['-n'],
 -        )
 -        install_msg = self.replicas[0].get_file_contents(
 -            paths.IPA_MIGRATE_LOG, encoding="utf-8"
 -        )
 -        assert result.returncode == 0
 -        assert MIGRATION_SCHEMA_LOG_MSG in install_msg
 -        assert MIGRATION_DATABASE_LOG_MSG in install_msg
 -        assert IPA_UPGRADE_LOG_MSG in install_msg
 -        assert SIDGEN_TASK_LOG_MSG in install_msg
 -
     def test_ipa_migrate_with_bind_pwd_file_option(self, empty_log_file):
         """
         This testcase checks that ipa-migrate tool
@@ -801,6 +756,9 @@ class TestIPAMigrateScenario1(IntegrationTest):
     @pytest.fixture()
     def modify_dns_zone(self):
 +        """
 +        This fixture adds dnszone and then removes the zone.
 +        """
         zone_name = 'ipatest.test'
         self.master.run_command(
             ["ipa", "dnszone-add", zone_name, "--force"]
@@ -844,6 +802,20 @@ class TestIPAMigrateScenario1(IntegrationTest):
         assert DNS_LOG2 in install_msg
         assert DNS_LOG3 in install_msg
 +    def test_ipa_migrate_dns_forwardzone(self):
 +        """
 +        This testcase checks that DNS forwardzone is
 +        also migrated in prod-mode
 +        """
 +        zone_name = "forwardzone.test"
 +        result = self.replicas[0].run_command(
 +            ["ipa", "dnsforwardzone-show", zone_name]
 +        )
 +        assert 'Zone name: {}'.format(zone_name) in result.stdout_text
 +        assert 'Active zone: True' in result.stdout_text
 +        assert 'Zone forwarders: 10.11.12.13' in result.stdout_text
 +        assert 'Forward policy: first' in result.stdout_text
 +
     def test_ipa_migrate_version_option(self):
         """
         The -V option has been removed.
@@ -922,20 +894,179 @@ class TestIPAMigrateScenario1(IntegrationTest):
         assert result.returncode == 1
         assert ERR_MSG in result.stderr_text
 -    def test_ipa_hbac_rule_duplication(self):
 +
 +class TestIPAMigrationStageMode(MigrationTest):
 +    """
 +    Tests for ipa-migrate tool in stage mode
 +    """
 +    def test_ipa_migrate_stage_mode(self, empty_log_file):
         """
 -        This testcase checks that default hbac rules
 -        are not duplicated on the local server when
 -        ipa-migrate command is run.
 +        This test checks that ipa-migrate is successful
 +        in dry run mode
         """
 +        tasks.kinit_admin(self.master)
 +        tasks.kinit_admin(self.replicas[0])
 +        MIGRATION_SCHEMA_LOG_MSG = "Migrating schema ...\n"
 +        MIGRATION_CONFIG_LOG_MSG = "Migrating configuration ...\n"
 +        IPA_UPGRADE_LOG_MSG = (
 +            "Running ipa-server-upgrade ... (this may take a while)\n"
 +        )
 +        SIDGEN_TASK_LOG_MSG = "Running SIDGEN task ...\n"
 +        MIGRATION_COMPLETE_LOG_MSG = "Migration complete!\n"
         run_migrate(
 +            self.replicas[0],
 +            "stage-mode",
 +            self.master.hostname,
 +            "cn=Directory Manager",
 +            self.master.config.admin_password,
 +            extra_args=['-n'],
 +        )
 +        install_msg = self.replicas[0].get_file_contents(
 +            paths.IPA_MIGRATE_LOG, encoding="utf-8"
 +        )
 +        assert MIGRATION_SCHEMA_LOG_MSG in install_msg
 +        assert MIGRATION_CONFIG_LOG_MSG in install_msg
 +        assert IPA_UPGRADE_LOG_MSG in install_msg
 +        assert SIDGEN_TASK_LOG_MSG in install_msg
 +        assert MIGRATION_COMPLETE_LOG_MSG in install_msg
 +
 +    def test_ipa_migrate_stage_mode_new_user(self):
 +        """
 +        This testcase checks that when a new user is added and
 +        ipa-migrate is run in stage-mode, uid/gid of the
 +        migrated user is not preserved i.e we have different
 +        uid/gid for user on remote and local IPA server.
 +        """
 +        username = 'testuser4'
 +        base_dn = str(self.master.domain.basedn)
 +        LOG_MSG1 = (
 +            "DEBUG Resetting the DNA range for new entry: "
 +            "uid={},cn=users,cn=accounts,{}\n"
 +        ).format(username, base_dn)
 +        install_msg = self.replicas[0].get_file_contents(
 +            paths.IPA_MIGRATE_LOG, encoding="utf-8"
 +        )
 +        assert LOG_MSG1 not in install_msg
 +        tasks.clear_sssd_cache(self.master)
 +        self.master.run_command(['ipa', 'user-show', username])
 +        cmd1 = self.master.run_command(['id', username])
 +        tasks.clear_sssd_cache(self.replicas[0])
 +        self.replicas[0].run_command(['ipa', 'user-show', username])
 +        cmd2 = self.replicas[0].run_command(['id', username])
 +        assert cmd1.stdout_text != cmd2.stdout_text
 +
 +
 +class TestIPAMigrationProdMode(MigrationTest):
 +    """
 +    Tests for ipa-migrate tool in prod mode
 +    """
 +    def test_ipa_migrate_prod_mode(self, empty_log_file):
 +        """
 +        This test checks that ipa-migrate is successful
 +        in prod run mode
 +        """
 +        tasks.kinit_admin(self.master)
 +        tasks.kinit_admin(self.replicas[0])
 +        MIGRATION_SCHEMA_LOG_MSG = "Migrating schema ...\n"
 +        MIGRATION_DATABASE_LOG_MSG = (
 +            "Migrating database ... (this may take a while)\n"
 +        )
 +        IPA_UPGRADE_LOG_MSG = (
 +            "Running ipa-server-upgrade ... (this may take a while)\n"
 +        )
 +        SIDGEN_TASK_LOG_MSG = "Running SIDGEN task ...\n"
 +        result = run_migrate(
             self.replicas[0],
             "prod-mode",
             self.master.hostname,
             "cn=Directory Manager",
             self.master.config.admin_password,
 -            extra_args=['-n']
 +            extra_args=['-n'],
         )
 +        install_msg = self.replicas[0].get_file_contents(
 +            paths.IPA_MIGRATE_LOG, encoding="utf-8"
 +        )
 +        assert result.returncode == 0
 +        assert MIGRATION_SCHEMA_LOG_MSG in install_msg
 +        assert MIGRATION_DATABASE_LOG_MSG in install_msg
 +        assert IPA_UPGRADE_LOG_MSG in install_msg
 +        assert SIDGEN_TASK_LOG_MSG in install_msg
 +
 +    def test_ipa_migrate_prod_mode_hbac_rule(self):
 +        """
 +        This testcase checks that hbac rule is migrated from
 +        remote server to local server in prod mode.
 +        """
 +        hbac_rule_name1 = 'test1'
 +        hbac_rule_name2 = 'testuser_sshd'
 +        tasks.kinit_admin(self.replicas[0])
 +        cmd1 = self.replicas[0].run_command(
 +            ["ipa", "hbacrule-find", hbac_rule_name1])
 +        cmd2 = self.replicas[0].run_command(
 +            ["ipa", "hbacrule-find", hbac_rule_name2])
 +        assert hbac_rule_name1 in cmd1.stdout_text
 +        assert hbac_rule_name2 in cmd2.stdout_text
 +
 +    def test_ipa_migrate_prod_mode_sudo_rule(self):
 +        """
 +        This testcase checks that sudo cmd and rules are
 +        migrated from remote server to local server in prod mode.
 +        """
 +        sudorule = 'readfiles'
 +        sudocmd = '/usr/bin/less'
 +        tasks.kinit_admin(self.replicas[0])
 +        cmd1 = self.replicas[0].run_command(
 +            ["ipa", "sudorule-find", sudorule])
 +        cmd2 = self.replicas[0].run_command(
 +            ["ipa", "sudocmd-find", sudocmd])
 +        assert 'Rule name: readfiles\n' in cmd1.stdout_text
 +        assert 'Sudo Command: /usr/bin/less\n' in cmd2.stdout_text
 +
 +    def test_ipa_migrate_prod_mode_new_user_sid(self):
 +        """
 +        This testcase checks that in prod-mode uid/gid of the
 +        migrated user is preserved i.e we have same
 +        uid/gid for user on remote and local IPA server.
 +        """
 +        username = 'testuser4'
 +        tasks.clear_sssd_cache(self.master)
 +        result1 = self.master.run_command(['id', username])
 +        tasks.clear_sssd_cache(self.replicas[0])
 +        result2 = self.replicas[0].run_command(['id', username])
 +        assert result1.stdout_text == result2.stdout_text
 +
 +    def test_check_vault_is_not_migrated(self):
 +        """
 +        This testcase checks that vault is
 +        not migrated
 +        """
 +        vault_name = "testvault"
 +        CMD_OUTPUT = "Number of entries returned 0"
 +        cmd = self.replicas[0].run_command(
 +            ["ipa", "vault-find", vault_name], raiseonerr=False)
 +        assert cmd.returncode != 0
 +        assert CMD_OUTPUT in cmd.stdout_text
 +
 +    def test_ipa_migrate_subids(self):
 +        """
 +        This testcase checks that subids for users are migrated
 +        to the local server from the remote server
 +        """
 +        user_name = 'admin'
 +        CMD_MSG = "1 subordinate id matched"
 +        cmd = self.replicas[0].run_command(
 +            ['ipa', 'subid-find',
 +             '--owner', user_name]
 +        )
 +        assert cmd.returncode == 0
 +        assert CMD_MSG in cmd.stdout_text
 +
 +    def test_ipa_hbac_rule_duplication(self):
 +        """
 +        This testcase checks that default hbac rules
 +        are not duplicated on the local server when
 +        ipa-migrate command is run.
 +        """
         result = self.replicas[0].run_command(
             ['ipa', 'hbacrule-find']
         )
@@ -946,3 +1077,192 @@ class TestIPAMigrateScenario1(IntegrationTest):
         count = Counter(line)
         assert count.get('Rule name: allow_all') < 2
         assert count.get('Rule name: allow_systemd-user') < 2
 +
 +    def test_ipa_migrate_otptoken(self):
 +        """
 +        This testcase checks that the otptoken
 +        is migrated for the user.
 +        """
 +        owner = "testuser1"
 +        CMD_OUTPUT = "1 OTP token matched"
 +        result = self.replicas[0].run_command([
 +            "ipa", "otptoken-find"
 +        ])
 +        assert CMD_OUTPUT in result.stdout_text
 +        assert 'Type: TOTP' in result.stdout_text
 +        assert 'Owner: {}'.format(owner) in result.stdout_text
 +
 +    def test_ipa_migrate_check_passkey_config(self):
 +        """
 +        This testcase checks that passkey config
 +        is migrated
 +        """
 +        CMD_OUTPUT = "Require user verification: False"
 +        result = self.replicas[0].run_command([
 +            "ipa", "passkeyconfig-show"
 +        ])
 +        assert CMD_OUTPUT in result.stdout_text
 +
 +    def test_ipa_migrate_check_service_status(self):
 +        """
 +        This testcase checks that ipactl and sssd
 +        services are running post ipa-migrate tool
 +        successful runs completed
 +        """
 +        cmd1 = self.replicas[0].run_command([
 +            "ipactl", "status"
 +        ])
 +        assert cmd1.returncode == 0
 +        cmd2 = self.replicas[0].run_command([
 +            "systemctl", "status", "sssd"
 +        ])
 +        assert cmd2.returncode == 0
 +
 +    def test_custom_idrange_is_migrated(self):
 +        """
 +        This testcase checks that custom idrange is migrated
 +        from remote server to local server in production
 +        mode.
 +        """
 +        range_name = "testrange"
 +        CMD_OUTPUT = (
 +            "---------------\n"
 +            "1 range matched\n"
 +            "---------------\n"
 +            "  Range name: testrange\n"
 +            "  First Posix ID of the range: 10000\n"
 +            "  Number of IDs in the range: 10000\n"
 +            "  First RID of the corresponding RID range: 300000\n"
 +            "  First RID of the secondary RID range: 400000\n"
 +            "  Range type: local domain range\n"
 +            "----------------------------\n"
 +            "Number of entries returned 1\n"
 +            "----------------------------\n"
 +        )
 +        cmd = self.replicas[0].run_command(
 +            ["ipa", "idrange-find", range_name])
 +        assert CMD_OUTPUT in cmd.stdout_text
 +
 +    def test_automountlocation_is_migrated(self):
 +        """
 +        This testcase checks that automount location/maps
 +        and keys are migrated.
 +        """
 +        base_dn = str(self.master.domain.basedn)
 +        automount_cn = "automount"
 +        loc_name = "baltimore"
 +        auto_map_name = "auto.share"
 +        DEBUG_LOG = (
 +            "Added entry: cn={},cn={},{}\n"
 +        ).format(loc_name, automount_cn, base_dn)
 +        CMD1_OUTPUT = (
 +            "  Location: baltimore\n"
 +        )
 +        CMD2_OUTPUT = (
 +            "  Map: auto.share\n"
 +        )
 +        CMD3_OUTPUT = (
 +            "-----------------------\n"
 +            "1 automount key matched\n"
 +            "-----------------------\n"
 +            "  Key: sub\n"
 +            "  Mount information: -fstype=autofs ldap:auto.man\n"
 +        )
 +        cmd1 = self.replicas[0].run_command(
 +            ["ipa", "automountlocation-show", loc_name])
 +        cmd2 = self.replicas[0].run_command(
 +            ["ipa", "automountmap-find", loc_name])
 +        cmd3 = self.replicas[0].run_command(
 +            ["ipa", "automountkey-find", loc_name, auto_map_name]
 +        )
 +        install_msg = self.replicas[0].get_file_contents(
 +            paths.IPA_MIGRATE_LOG, encoding="utf-8"
 +        )
 +        assert CMD1_OUTPUT in cmd1.stdout_text
 +        assert CMD2_OUTPUT in cmd2.stdout_text
 +        assert CMD3_OUTPUT in cmd3.stdout_text
 +        assert DEBUG_LOG in install_msg
 +
 +
 +class TestIPAMigrationWithADtrust(IntegrationTest):
 +    """
 +    Test for ipa-migrate tool with IPA Master having trust setup
 +    with Windows AD.
 +    """
 +    topology = "line"
 +    num_ad_domains = 1
 +    num_replicas = 1
 +
 +    @classmethod
 +    def install(cls, mh):
 +        tasks.install_master(
 +            cls.master, setup_dns=True, extra_args=['--no-dnssec-validation']
 +        )
 +        cls.ad = cls.ads[0]
 +        cls.ad_domain = cls.ad.domain.name
 +        tasks.install_adtrust(cls.master)
 +        tasks.configure_dns_for_trust(cls.master, cls.ad)
 +        tasks.establish_trust_with_ad(cls.master, cls.ad.domain.name)
 +
 +    def test_install_local_server(self):
 +        """
 +        This test installs local IPA Server() i.e new IPA server with
 +        the same realm and domain name that will receive the migration data.
 +        """
 +        tasks.install_master(
 +            self.replicas[0], setup_dns=True,
 +            extra_args=['--no-dnssec-validation']
 +        )
 +        tasks.install_adtrust(self.replicas[0])
 +
 +    def test_check_ad_attributes_migrate_prod_mode(self):
 +        """
 +        This test checks that IPA-AD trust related attributes
 +        are migrated to local server.
 +        """
 +        result = run_migrate(
 +            self.replicas[0],
 +            "prod-mode",
 +            self.master.hostname,
 +            "cn=Directory Manager",
 +            self.master.config.admin_password,
 +            extra_args=['-n']
 +        )
 +        assert result.returncode == 0
 +        trust1 = self.master.run_command(
 +            ['ipa', 'trust-show', self.ad_domain]
 +        ).stdout_text
 +        trust2 = self.replicas[0].run_command(
 +            ['ipa', 'trust-show', self.ad_domain]).stdout_text
 +        assert trust1 == trust2
 +
 +    def test_check_domain_sid_is_migrated(self):
 +        """
 +        This testcase checks that domain sid is
 +        migrated from a remote server having trust with AD
 +        to local server and is displayed in the
 +        ipa trustconfig-show command
 +        """
 +        regexp = (r'Security Identifier: (.*)$')
 +        cmd1 = self.master.run_command(["ipa", "trustconfig-show"])
 +        sid1 = re.findall(regexp, cmd1.stdout_text, re.MULTILINE)
 +        cmd2 = self.replicas[0].run_command(
 +            ["ipa", "trustconfig-show"]
 +        )
 +        sid2 = re.findall(regexp, cmd2.stdout_text, re.MULTILINE)
 +        assert sid1 == sid2
 +
 +    def test_check_ad_idrange_is_migrated(self):
 +        """
 +        This testcase checks AD idrange is migrated
 +        from remote IPA server having trust with AD
 +        to local IPA server
 +        """
 +        ad_domain_name = self.ad.domain.name.upper()
 +        cmd1 = self.master.run_command(
 +            ["ipa", "idrange-show", ad_domain_name + "_id_range"]
 +        )
 +        cmd2 = self.replicas[0].run_command(
 +            ["ipa", "idrange-show", ad_domain_name + "_id_range"]
 +        )
 +        assert cmd1.stdout_text == cmd2.stdout_text
 -- 
 2.47.0
--- a/0031-Fix-Organization-field-in-Okta-not-required.patch
+++ b/0031-Fix-Organization-field-in-Okta-not-required.patch
@ -0,0 +1,34 @@
 From c64c098e1d0ae492499caa83a1b73532da511f84 Mon Sep 17 00:00:00 2001
 From: Carla Martinez <carlmart@redhat.com>
 Date: Tue, 29 Oct 2024 15:23:55 +0100
 Subject: [PATCH] Fix: 'Organization' field in Okta not required
 Although the 'Organization' field is not required
 when using the Okta template, the WebUI requires it
 in order to create a new IDP. If this is not provided,
 an error is shown.
 Fixes: https://pagure.io/freeipa/issue/9687
 Signed-off-by: Carla Martinez <carlmart@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 install/ui/src/freeipa/idp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/install/ui/src/freeipa/idp.js b/install/ui/src/freeipa/idp.js
 index ada09c0754f5a51575831e127deb81d1f27f44d1..04daad591a8e94ea9b8c146c12e0c84aaad6cee4 100644
 --- a/install/ui/src/freeipa/idp.js
 +++ b/install/ui/src/freeipa/idp.js
@@ -41,7 +41,7 @@ idp.templates = [
       fields: ['ipaidporg']},
     { value: 'okta',
       label: text.get('@i18n:objects.idp.template_okta'),
 -      fields: ['ipaidporg', 'ipaidpbaseurl']}
 +      fields: ['ipaidpbaseurl']}
 ];
 -- 
 2.47.0
--- a/0032-Use-OpenSSL-provider-with-BIND-for-Fedora-41-and-RHE.patch
+++ b/0032-Use-OpenSSL-provider-with-BIND-for-Fedora-41-and-RHE.patch
@ -0,0 +1,363 @@
 From ace726cb83320d7fcb051751591817fd419a8f6b Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Wed, 6 Nov 2024 09:59:23 +0200
 Subject: [PATCH] Use OpenSSL provider with BIND for Fedora 41+ and RHEL10+
 OpenSSL Engine API is deprecated and ability to compile against it is
 removed in RHEL10. OpenSSL provider API is the future.
 Fedora 41+ also defaults to OpenSSL provider. With pkcs11-provider, the
 same PKCS#11 modules can be loaded transparently like with OpenSSL
 engines. Thus, we can update configuration to use the provider API.
 TODO:
 - dnssec-keyfromlabel does not work without engine, needs backport from
   bind 9.20
 Fixes: https://pagure.io/freeipa/issue/9696
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 freeipa.spec.in                               | 12 +++-
 install/share/Makefile.am                     |  2 +
 .../share/bind.openssl.provider.cnf.template  | 19 +++++++
 .../bind.openssl.provider.crp.cnf.template    | 25 +++++++++
 ipaplatform/base/constants.py                 |  1 +
 ipaplatform/fedora/constants.py               |  9 ++-
 ipaplatform/rhel/constants.py                 |  7 ++-
 ipaserver/dnssec/bindmgr.py                   | 21 ++++---
 ipaserver/install/dnskeysyncinstance.py       | 55 +++++++++++++++----
 ipaserver/install/server/upgrade.py           | 12 ++--
 10 files changed, 136 insertions(+), 27 deletions(-)
 create mode 100644 install/share/bind.openssl.provider.cnf.template
 create mode 100644 install/share/bind.openssl.provider.crp.cnf.template
 diff --git a/freeipa.spec.in b/freeipa.spec.in
 index 72d7013a6c49873f4a59734c684c6c5510e669d0..3f6b133eee4ec40193b618882ad0813971beb5ec 100755
 --- a/freeipa.spec.in
 +++ b/freeipa.spec.in
@@ -158,12 +158,20 @@
 # BIND employs 'pkcs11' OpenSSL engine instead of native PKCS11
 # Fedora 31+ uses OpenSSL engine, as well as Fedora ELN (RHEL9)
 -%if 0%{?fedora} || 0%{?rhel} >= 9
 +# Howevever, Fedora 40+ and RHEL10+ use OpenSSL provider
 +%if 0%{?fedora} < 40 || 0%{?rhel} == 9
     %global openssl_pkcs11_version 0.4.10-6
 +    %global openssl_pkcs11_name openssl-pkcs11
     %global softhsm_version 2.5.0-4
 +%else
 +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
 +    %global openssl_pkcs11_version 0.3
 +    %global openssl_pkcs11_name pkcs11-provider
 +    %global softhsm_version 2.6.1
 %else
     %global with_bind_pkcs11 1
 %endif
 +%endif
 %if 0%{?rhel} == 8
 # Make sure to use PKI versions that work with 389-ds fix for https://github.com/389ds/389-ds-base/issues/4609
@@ -623,7 +631,7 @@ Requires: bind-dnssec-utils >= %{bind_version}
 Requires: bind-pkcs11 >= %{bind_version}
 %else
 Requires: softhsm >= %{softhsm_version}
 -Requires: openssl-pkcs11 >= %{openssl_pkcs11_version}
 +Requires: %{openssl_pkcs11_name} >= %{openssl_pkcs11_version}
 %endif
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1825812
 # RHEL 8.3+ and Fedora 32+ have 2.1
 diff --git a/install/share/Makefile.am b/install/share/Makefile.am
 index 24664ca3bacb01fa4c57e9d7a5ea4ab48cfbdd90..0adebf8a3b0e01dbf62fe4b86190e60a3fbfea3b 100644
 --- a/install/share/Makefile.am
 +++ b/install/share/Makefile.am
@@ -50,6 +50,8 @@ dist_app_DATA =				\
 	bind.named.conf.template	\
 	bind.openssl.cnf.template	\
 	bind.openssl.cryptopolicy.cnf.template	\
 +	bind.openssl.provider.cnf.template	\
 +	bind.openssl.provider.crp.cnf.template	\
 	certmap.conf.template		\
 	kdc.conf.template		\
 	kdc_extensions.template		\
 diff --git a/install/share/bind.openssl.provider.cnf.template b/install/share/bind.openssl.provider.cnf.template
 new file mode 100644
 index 0000000000000000000000000000000000000000..1bd5599cd32f9601416cbaca815dc73fca22b560
 --- /dev/null
 +++ b/install/share/bind.openssl.provider.cnf.template
@@ -0,0 +1,19 @@
 +# OpenSSL configuration file
 +# File generated by IPA instalation
 +openssl_conf = openssl_init
 +
 +[openssl_init]
 +providers = provider_section
 +
 +[provider_sect]
 +default = default_sect
 +pkcs11 = pkcs11_bind_sect
 +
 +[default_sect]
 +activate = 1
 +
 +[pkcs11_bind_sect]
 +pkcs11-module-path = $SOFTHSM_MODULE
 +pkcs11-module-token-pin = file:$SOFTHSM_PIN
 +activate = 1
 +
 diff --git a/install/share/bind.openssl.provider.crp.cnf.template b/install/share/bind.openssl.provider.crp.cnf.template
 new file mode 100644
 index 0000000000000000000000000000000000000000..b52175e8f9971fa1a25a6c1c7a7121b2fc4c8c36
 --- /dev/null
 +++ b/install/share/bind.openssl.provider.crp.cnf.template
@@ -0,0 +1,25 @@
 +# OpenSSL configuration file
 +# File generated by IPA instalation
 +openssl_conf = openssl_init
 +
 +[openssl_init]
 +ssl_conf = ssl_configuration
 +providers = provider_sect
 +
 +[ssl_configuration]
 +system_default = crypto_policy
 +
 +[crypto_policy]
 +.include $CRYPTO_POLICY_FILE
 +
 +[provider_sect]
 +default = default_sect
 +pkcs11 = pkcs11_bind_sect
 +
 +[default_sect]
 +activate = 1
 +
 +[pkcs11_bind_sect]
 +pkcs11-module-path = $SOFTHSM_MODULE
 +pkcs11-module-token-pin = file:$SOFTHSM_PIN
 +activate = 1
 diff --git a/ipaplatform/base/constants.py b/ipaplatform/base/constants.py
 index 1689efe52466f00fd8b014f720e1d21ebdbf2504..3f607ecbf961fbd78d78e05bcc1af3cd15a549d5 100644
 --- a/ipaplatform/base/constants.py
 +++ b/ipaplatform/base/constants.py
@@ -120,6 +120,7 @@ class BaseConstantsNamespace:
     NAMED_DATA_DIR = "data/"
     NAMED_OPTIONS_VAR = "OPTIONS"
     NAMED_OPENSSL_ENGINE = None
 +    NAMED_OPENSSL_PROVIDER = None
     NAMED_ZONE_COMMENT = ""
     PKI_USER = User("pkiuser")
     PKI_GROUP = Group("pkiuser")
 diff --git a/ipaplatform/fedora/constants.py b/ipaplatform/fedora/constants.py
 index 896e6f60737a904b06ac5fba6c1d1711577c79ec..78a53db28755d5394441ed6d5350648c80de54df 100644
 --- a/ipaplatform/fedora/constants.py
 +++ b/ipaplatform/fedora/constants.py
@@ -19,6 +19,10 @@ from ipaplatform.osinfo import osinfo
 # Fedora 29 has both
 HAS_NFS_CONF = osinfo.version_number >= (30,)
 +# Fedora 40 and later deprecated OpenSSL engine and recommend using OpenSSL
 +# provider API.
 +HAS_OPENSSL_PROVIDER = osinfo.version_number >= (40,)
 +
 __all__ = ("constants", "User", "Group")
@@ -32,6 +36,9 @@ class FedoraConstantsNamespace(RedHatConstantsNamespace):
     if HAS_NFS_CONF:
         SECURE_NFS_VAR = None
 -    NAMED_OPENSSL_ENGINE = "pkcs11"
 +    if HAS_OPENSSL_PROVIDER:
 +        NAMED_OPENSSL_PROVIDER = True
 +    else:
 +        NAMED_OPENSSL_ENGINE = "pkcs11"
 constants = FedoraConstantsNamespace()
 diff --git a/ipaplatform/rhel/constants.py b/ipaplatform/rhel/constants.py
 index bc8c65a5d35af9afd27bc728768e49cd937e79a5..f4b50352190811db9dc780e3cec9d02cc0cab354 100644
 --- a/ipaplatform/rhel/constants.py
 +++ b/ipaplatform/rhel/constants.py
@@ -18,8 +18,11 @@ from ipaplatform.osinfo import osinfo
 # RHEL 8 uses /etc/nfs.conf
 HAS_NFS_CONF = osinfo.version_number >= (8,)
 # RHEL 9 uses pkcs11 as openssl engine
 -HAS_PKCS11_OPENSSL_ENGINE = osinfo.version_number >= (9,)
 +HAS_PKCS11_OPENSSL_ENGINE = osinfo.version_number == (9,)
 +# RHEL 10 and later deprecated OpenSSL engine and recommend using OpenSSL
 +# provider API.
 +HAS_OPENSSL_PROVIDER = osinfo.version_number >= (10,)
 __all__ = ("constants", "User", "Group")
@@ -31,5 +34,7 @@ class RHELConstantsNamespace(RedHatConstantsNamespace):
         SECURE_NFS_VAR = None
     if HAS_PKCS11_OPENSSL_ENGINE:
         NAMED_OPENSSL_ENGINE = "pkcs11"
 +    if HAS_OPENSSL_PROVIDER:
 +        NAMED_OPENSSL_PROVIDER = True
 constants = RHELConstantsNamespace()
 diff --git a/ipaserver/dnssec/bindmgr.py b/ipaserver/dnssec/bindmgr.py
 index 0c79cc03d404f0fb54bc3c6ab591206127c5870c..aeb8b919c64361fd8175366827fecba9705af3c3 100644
 --- a/ipaserver/dnssec/bindmgr.py
 +++ b/ipaserver/dnssec/bindmgr.py
@@ -121,17 +121,24 @@ class BINDMgr:
         assert attrs.get('idnsseckeyzone', [b'FALSE'])[0] == b'TRUE', \
             b'object %s is not a DNS zone key' % attrs['dn']
 -        uri = b"%s;pin-source=%s" % (
 -            attrs['idnsSecKeyRef'][0],
 -            paths.DNSSEC_SOFTHSM_PIN.encode('utf-8')
 -        )
 +        uri = None
 +        if platformconstants.NAMED_OPENSSL_ENGINE is not None:
 +            uri = "%s;pin-source=%s" % (
 +                attrs['idnsSecKeyRef'][0],
 +                paths.DNSSEC_SOFTHSM_PIN.encode('utf-8')
 +            )
 +        elif platformconstants.NAMED_OPENSSL_PROVIDER is not None:
 +            uri = "%s;token=%s" % (
 +                attrs['idnsSecKeyRef'][0],
 +                ipalib.constants.SOFTHSM_DNSSEC_TOKEN_LABEL.encode('utf-8')
 +            )
         cmd = [
             paths.DNSSEC_KEYFROMLABEL,
 -            '-E', 'pkcs11',
             '-K', workdir,
 -            '-a', attrs['idnsSecAlgorithm'][0],
 -            '-l', uri
 +            '-a', attrs['idnsSecAlgorithm'][0].encode('utf-8'),
         ]
 +        if uri is not None:
 +            cmd.extend(['-l', uri])
         cmd.extend(self.dates2params(attrs))
         if attrs.get('idnsSecKeySep', [b'FALSE'])[0].upper() == b'TRUE':
             cmd.extend(['-f', 'KSK'])
 diff --git a/ipaserver/install/dnskeysyncinstance.py b/ipaserver/install/dnskeysyncinstance.py
 index 36524655265130fca910eceb63fd4793ccc60d48..1979a472dd882a70cb0a41d782689debc66017a9 100644
 --- a/ipaserver/install/dnskeysyncinstance.py
 +++ b/ipaserver/install/dnskeysyncinstance.py
@@ -155,21 +155,36 @@ class DNSKeySyncInstance(service.Service):
         return False
     def setup_named_openssl_conf(self):
 +        opensslcnf_tmpl = None
 +        conf_file_dict = {
 +            'CRYPTO_POLICY_FILE': paths.CRYPTO_POLICY_OPENSSLCNF_FILE,
 +            'SOFTHSM_MODULE': paths.LIBSOFTHSM2_SO,
 +            'SOFTHSM_PIN': paths.DNSSEC_SOFTHSM_PIN,
 +        }
         if constants.NAMED_OPENSSL_ENGINE is not None:
 -            logger.debug("Setup OpenSSL config for BIND")
 -            # setup OpenSSL config for BIND,
 -            # this one is needed because FreeIPA installation
 -            # disables p11-kit-proxy PKCS11 module
 -            conf_file_dict = {
 -                'OPENSSL_ENGINE': constants.NAMED_OPENSSL_ENGINE,
 -                'SOFTHSM_MODULE': paths.LIBSOFTHSM2_SO,
 -                'CRYPTO_POLICY_FILE': paths.CRYPTO_POLICY_OPENSSLCNF_FILE,
 -            }
 +            # Traditional configuration using OpenSSL engine API
 +            # requires openssl-pkcs11 engine to load PKCS#11 token
 +            # provided by SoftHSMv2
 +            conf_file_dict['OPENSSL_ENGINE'] = constants.NAMED_OPENSSL_ENGINE
             if paths.CRYPTO_POLICY_OPENSSLCNF_FILE is None:
                 opensslcnf_tmpl = "bind.openssl.cnf.template"
             else:
                 opensslcnf_tmpl = "bind.openssl.cryptopolicy.cnf.template"
 +        elif constants.NAMED_OPENSSL_PROVIDER is not None:
 +            # OpenSSL provider API is preferred and requires
 +            # pkcs11-provider to load PKCS#11 token provided by SoftHSMv2
 +            if paths.CRYPTO_POLICY_OPENSSLCNF_FILE is None:
 +                opensslcnf_tmpl = "bind.openssl.provider.cnf.template"
 +            else:
 +                opensslcnf_tmpl = "bind.openssl.provider.crp.cnf.template"
 +        else:
 +            conf_file_dict = None
 +        if opensslcnf_tmpl is not None and conf_file_dict is not None:
 +            logger.debug("Setup OpenSSL config for BIND")
 +            # setup OpenSSL config for BIND,
 +            # this one is needed because FreeIPA installation
 +            # disables p11-kit-proxy PKCS11 module
             named_openssl_txt = ipautil.template_file(
                 os.path.join(paths.USR_SHARE_IPA_DIR, opensslcnf_tmpl),
                 conf_file_dict
@@ -189,7 +204,8 @@ class DNSKeySyncInstance(service.Service):
             'SOFTHSM2_CONF', paths.DNSSEC_SOFTHSM2_CONF,
             quotes=False, separator='=')
 -        if constants.NAMED_OPENSSL_ENGINE is not None:
 +        if any([constants.NAMED_OPENSSL_ENGINE is not None,
 +                constants.NAMED_OPENSSL_PROVIDER is not None]):
             directivesetter.set_directive(
                 sysconfig,
                 'OPENSSL_CONF', paths.DNSSEC_OPENSSL_CONF,
@@ -200,9 +216,23 @@ class DNSKeySyncInstance(service.Service):
                 constants.NAMED_OPTIONS_VAR,
                 separator="="
             ) or ''
 -            if not self._are_named_options_configured(options):
 +            new_options = None
 +            if all([constants.NAMED_OPENSSL_ENGINE is not None,
 +                    not self._are_named_options_configured(options)]):
                 engine_cmd = "-E {}".format(constants.NAMED_OPENSSL_ENGINE)
                 new_options = ' '.join([options, engine_cmd])
 +            # Remove '-E pkcs11' from the options in the OpenSSL provider case
 +            if all([constants.NAMED_OPENSSL_ENGINE is None,
 +                    self._are_named_options_configured(options)]):
 +                lst_options = options.split()
 +                try:
 +                    idx = lst_options.index('-E')
 +                    lst_options.pop(idx)
 +                    lst_options.pop(idx)
 +                    new_options = ' '.join(lst_options)
 +                except ValueError:
 +                    pass
 +            if new_options is not None:
                 directivesetter.set_directive(
                     sysconfig,
                     constants.NAMED_OPTIONS_VAR, new_options,
@@ -216,7 +246,8 @@ class DNSKeySyncInstance(service.Service):
             'SOFTHSM2_CONF', paths.DNSSEC_SOFTHSM2_CONF,
             quotes=False, separator='=')
 -        if constants.NAMED_OPENSSL_ENGINE is not None:
 +        if any([constants.NAMED_OPENSSL_ENGINE is not None,
 +                constants.NAMED_OPENSSL_PROVIDER is not None]):
             directivesetter.set_directive(
                 sysconfig,
                 'OPENSSL_CONF', paths.DNSSEC_OPENSSL_CONF,
 diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
 index fb71df81a6bf8ecbb1631ca8f0a5fe55cc222782..e2aabb2845602aacda1ca3289b7d7e338bd2dba3 100644
 --- a/ipaserver/install/server/upgrade.py
 +++ b/ipaserver/install/server/upgrade.py
@@ -549,15 +549,19 @@ def ca_initialize_hsm_state(ca):
 def dnssec_set_openssl_engine(dnskeysyncd):
     """
 -    Setup OpenSSL engine for BIND
 +    Setup OpenSSL engine or provider for BIND
     """
 -    if constants.NAMED_OPENSSL_ENGINE is None:
 +    if all([constants.NAMED_OPENSSL_ENGINE is None,
 +            constants.NAMED_OPENSSL_PROVIDER is None]):
         return False
 -    if sysupgrade.get_upgrade_state('dns', 'openssl_engine'):
 +    # Nothing to do if we are using OpenSSL engine already and not on the OS
 +    # that requires OpenSSL provider instead.
 +    if all([sysupgrade.get_upgrade_state('dns', 'openssl_engine'),
 +            constants.NAMED_OPENSSL_PROVIDER is None]):
         return False
 -    logger.info('[Set OpenSSL engine for BIND]')
 +    logger.info('[Set OpenSSL engine or provider for BIND]')
     dnskeysyncd.setup_named_openssl_conf()
     dnskeysyncd.setup_named_sysconfig()
     dnskeysyncd.setup_ipa_dnskeysyncd_sysconfig()
 -- 
 2.47.0
--- a/SOURCES/1001-Change-branding-to-IPA-and-Identity-Management.patch
+++ b/SOURCES/1001-Change-branding-to-IPA-and-Identity-Management.patch
--- a/SOURCES/0001-Handle-samba-exception-type-change_rhel#17623.patch
+++ b/SOURCES/0001-Handle-samba-exception-type-change_rhel#17623.patch
@ -1,73 +0,0 @@
 From 06b4c61b4484efe2093501caf21b03f1fc14093b Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Thu, 19 Oct 2023 12:47:03 +0200
 Subject: [PATCH] group-add-member fails with an external member
 The command ipa group-add-member --external aduser@addomain.test
 fails with an internal error when used with samba 4.19.
 The command internally calls samba.security.dom_sid(sid) which
 used to raise a TypeError but now raises a ValueError
 (commit 9abdd67 on https://github.com/samba-team/samba).
 IPA source code needs to handle properly both exception types.
 Fixes: https://pagure.io/freeipa/issue/9466
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipaserver/dcerpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
 index c1db2f9a499..ee0a229d1f0 100644
 --- a/ipaserver/dcerpc.py
 +++ b/ipaserver/dcerpc.py
@@ -303,7 +303,7 @@ def get_domain_by_sid(self, sid, exact_match=False):
         # Parse sid string to see if it is really in a SID format
         try:
             test_sid = security.dom_sid(sid)
 -        except TypeError:
 +        except (TypeError, ValueError):
             raise errors.ValidationError(name='sid',
                                          error=_('SID is not valid'))
 From aa3397378acf1a03fc8bbe34b9fae33e84588b34 Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Fri, 20 Oct 2023 10:20:57 +0200
 Subject: [PATCH] Handle samba changes in samba.security.dom_sid()
 samba.security.dom_sid() in 4.19 now raises ValueError instead of
 TypeError. Fix the expected exception.
 Related: https://pagure.io/freeipa/issue/9466
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipaserver/dcerpc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
 index ee0a229d1f0..3e4c71d9976 100644
 --- a/ipaserver/dcerpc.py
 +++ b/ipaserver/dcerpc.py
@@ -97,7 +97,7 @@
 def is_sid_valid(sid):
     try:
         security.dom_sid(sid)
 -    except TypeError:
 +    except (TypeError, ValueError):
         return False
     else:
         return True
@@ -457,7 +457,7 @@ def get_trusted_domain_object_sid(self, object_name,
         try:
             test_sid = security.dom_sid(sid)
             return unicode(test_sid)
 -        except TypeError:
 +        except (TypeError, ValueError):
             raise errors.ValidationError(name=_('trusted domain object'),
                                          error=_('Trusted domain did not '
                                                  'return a valid SID for '
--- a/SOURCES/0002-Check-the-HTTP-Referer-header-on-all-requests.patch
+++ b/SOURCES/0002-Check-the-HTTP-Referer-header-on-all-requests.patch
@ -1,121 +0,0 @@
 From ae006b436cfb4ccee5972cf1db0a309fcd80e669 Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Fri, 6 Oct 2023 20:16:29 +0000
 Subject: [PATCH] Check the HTTP Referer header on all requests
 The referer was only checked in WSGIExecutioner classes:
 - jsonserver
 - KerberosWSGIExecutioner
 - xmlserver
 - jsonserver_kerb
 This left /i18n_messages, /session/login_kerberos,
 /session/login_x509, /session/login_password,
 /session/change_password and /session/sync_token unprotected
 against CSRF attacks.
 CVE-2023-5455
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 ---
 ipaserver/rpcserver.py | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)
 diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
 index 4e8a08b66..3555014ca 100644
 --- a/ipaserver/rpcserver.py
 +++ b/ipaserver/rpcserver.py
@@ -156,6 +156,19 @@ _success_template = """<html>
 </html>"""
 class HTTP_Status(plugable.Plugin):
 +    def check_referer(self, environ):
 +        if "HTTP_REFERER" not in environ:
 +            logger.error("Rejecting request with missing Referer")
 +            return False
 +        if (not environ["HTTP_REFERER"].startswith(
 +                "https://%s/ipa" % self.api.env.host)
 +                and not self.env.in_tree):
 +            logger.error("Rejecting request with bad Referer %s",
 +                         environ["HTTP_REFERER"])
 +            return False
 +        logger.debug("Valid Referer %s", environ["HTTP_REFERER"])
 +        return True
 +
     def not_found(self, environ, start_response, url, message):
         """
         Return a 404 Not Found error.
@@ -331,9 +344,6 @@ class wsgi_dispatch(Executioner, HTTP_Status):
         self.__apps[key] = app
 -
 -
 -
 class WSGIExecutioner(Executioner):
     """
     Base class for execution backends with a WSGI application interface.
@@ -897,6 +907,9 @@ class jsonserver_session(jsonserver, KerberosSession):
         logger.debug('WSGI jsonserver_session.__call__:')
 +        if not self.check_referer(environ):
 +            return self.bad_request(environ, start_response, 'denied')
 +
         # Redirect to login if no Kerberos credentials
         ccache_name = self.get_environ_creds(environ)
         if ccache_name is None:
@@ -949,6 +962,9 @@ class KerberosLogin(Backend, KerberosSession):
     def __call__(self, environ, start_response):
         logger.debug('WSGI KerberosLogin.__call__:')
 +        if not self.check_referer(environ):
 +            return self.bad_request(environ, start_response, 'denied')
 +
         # Redirect to login if no Kerberos credentials
         user_ccache_name = self.get_environ_creds(environ)
         if user_ccache_name is None:
@@ -967,6 +983,9 @@ class login_x509(KerberosLogin):
     def __call__(self, environ, start_response):
         logger.debug('WSGI login_x509.__call__:')
 +        if not self.check_referer(environ):
 +            return self.bad_request(environ, start_response, 'denied')
 +
         if 'KRB5CCNAME' not in environ:
             return self.unauthorized(
                 environ, start_response, 'KRB5CCNAME not set',
@@ -1015,6 +1034,9 @@ class login_password(Backend, KerberosSession):
         logger.debug('WSGI login_password.__call__:')
 +        if not self.check_referer(environ):
 +            return self.bad_request(environ, start_response, 'denied')
 +
         # Get the user and password parameters from the request
         content_type = environ.get('CONTENT_TYPE', '').lower()
         if not content_type.startswith('application/x-www-form-urlencoded'):
@@ -1147,6 +1169,9 @@ class change_password(Backend, HTTP_Status):
     def __call__(self, environ, start_response):
         logger.info('WSGI change_password.__call__:')
 +        if not self.check_referer(environ):
 +            return self.bad_request(environ, start_response, 'denied')
 +
         # Get the user and password parameters from the request
         content_type = environ.get('CONTENT_TYPE', '').lower()
         if not content_type.startswith('application/x-www-form-urlencoded'):
@@ -1364,6 +1389,9 @@ class xmlserver_session(xmlserver, KerberosSession):
         logger.debug('WSGI xmlserver_session.__call__:')
 +        if not self.check_referer(environ):
 +            return self.bad_request(environ, start_response, 'denied')
 +
         ccache_name = environ.get('KRB5CCNAME')
         # Redirect to /ipa/xml if no Kerberos credentials
 -- 
 2.41.0
--- a/SOURCES/0003-Integration-tests-for-verifying-Referer-header-in-th.patch
+++ b/SOURCES/0003-Integration-tests-for-verifying-Referer-header-in-th.patch
@ -1,359 +0,0 @@
 From f1f8b16def3e809f5773bb8aa40aefb21699347b Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Thu, 12 Oct 2023 20:34:01 +0000
 Subject: [PATCH] Integration tests for verifying Referer header in the UI
 Validate that the change_password and login_password endpoints
 verify the HTTP Referer header. There is some overlap in the
 tests: belt and suspenders.
 All endpoints except session/login_x509 are covered, sometimes
 having to rely on expected bad results (see the i18n endpoint).
 session/login_x509 is not tested yet as it requires significant
 additional setup in order to associate a user certificate with
 a user entry, etc.
 This can be manually verified by modifying /etc/httpd/conf.d/ipa.conf
 and adding:
 Satisfy Any
 Require all granted
 Then comment out Auth and SSLVerify, etc. and restart httpd.
 With a valid Referer will fail with a 401 and log that there is no
 KRB5CCNAME. This comes after the referer check.
 With an invalid Referer it will fail with a 400 Bad Request as
 expected.
 CVE-2023-5455
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 ---
 ipatests/test_ipaserver/httptest.py           |   7 +-
 ipatests/test_ipaserver/test_changepw.py      |  12 +-
 .../test_ipaserver/test_login_password.py     |  88 ++++++++++++
 ipatests/test_ipaserver/test_referer.py       | 136 ++++++++++++++++++
 ipatests/util.py                              |   4 +-
 5 files changed, 242 insertions(+), 5 deletions(-)
 create mode 100644 ipatests/test_ipaserver/test_login_password.py
 create mode 100644 ipatests/test_ipaserver/test_referer.py
 diff --git a/ipatests/test_ipaserver/httptest.py b/ipatests/test_ipaserver/httptest.py
 index 6cd034a71..8924798fc 100644
 --- a/ipatests/test_ipaserver/httptest.py
 +++ b/ipatests/test_ipaserver/httptest.py
@@ -36,7 +36,7 @@ class Unauthorized_HTTP_test:
     content_type = 'application/x-www-form-urlencoded'
     accept_language = 'en-us'
 -    def send_request(self, method='POST', params=None):
 +    def send_request(self, method='POST', params=None, host=None):
         """
         Send a request to HTTP server
@@ -45,7 +45,10 @@ class Unauthorized_HTTP_test:
         if params is not None:
             if self.content_type == 'application/x-www-form-urlencoded':
                 params = urllib.parse.urlencode(params, True)
 -        url = 'https://' + self.host + self.app_uri
 +        if host:
 +            url = 'https://' + host + self.app_uri
 +        else:
 +            url = 'https://' + self.host + self.app_uri
         headers = {'Content-Type': self.content_type,
                    'Accept-Language': self.accept_language,
 diff --git a/ipatests/test_ipaserver/test_changepw.py b/ipatests/test_ipaserver/test_changepw.py
 index c3a47ab26..df38ddb3d 100644
 --- a/ipatests/test_ipaserver/test_changepw.py
 +++ b/ipatests/test_ipaserver/test_changepw.py
@@ -53,10 +53,11 @@ class test_changepw(XMLRPC_test, Unauthorized_HTTP_test):
         request.addfinalizer(fin)
 -    def _changepw(self, user, old_password, new_password):
 +    def _changepw(self, user, old_password, new_password, host=None):
         return self.send_request(params={'user': str(user),
                                   'old_password' : str(old_password),
                                   'new_password' : str(new_password)},
 +                                 host=host
                                  )
     def _checkpw(self, user, password):
@@ -89,6 +90,15 @@ class test_changepw(XMLRPC_test, Unauthorized_HTTP_test):
         # make sure that password is NOT changed
         self._checkpw(testuser, old_password)
 +    def test_invalid_referer(self):
 +        response = self._changepw(testuser, old_password, new_password,
 +                                  'attacker.test')
 +
 +        assert_equal(response.status, 400)
 +
 +        # make sure that password is NOT changed
 +        self._checkpw(testuser, old_password)
 +
     def test_pwpolicy_error(self):
         response = self._changepw(testuser, old_password, '1')
 diff --git a/ipatests/test_ipaserver/test_login_password.py b/ipatests/test_ipaserver/test_login_password.py
 new file mode 100644
 index 000000000..9425cb797
 --- /dev/null
 +++ b/ipatests/test_ipaserver/test_login_password.py
@@ -0,0 +1,88 @@
 +# Copyright (C) 2023  Red Hat
 +# see file 'COPYING' for use and warranty information
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation, either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +import os
 +import pytest
 +import uuid
 +
 +from ipatests.test_ipaserver.httptest import Unauthorized_HTTP_test
 +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
 +from ipatests.util import assert_equal
 +from ipalib import api, errors
 +from ipapython.ipautil import run
 +
 +testuser = u'tuser'
 +password = u'password'
 +
 +
 +@pytest.mark.tier1
 +class test_login_password(XMLRPC_test, Unauthorized_HTTP_test):
 +    app_uri = '/ipa/session/login_password'
 +
 +    @pytest.fixture(autouse=True)
 +    def login_setup(self, request):
 +        ccache = os.path.join('/tmp', str(uuid.uuid4()))
 +        try:
 +            api.Command['user_add'](uid=testuser, givenname=u'Test', sn=u'User')
 +            api.Command['passwd'](testuser, password=password)
 +            run(['kinit', testuser], stdin='{0}\n{0}\n{0}\n'.format(password),
 +                env={"KRB5CCNAME": ccache})
 +        except errors.ExecutionError as e:
 +            pytest.skip(
 +                'Cannot set up test user: %s' % e
 +            )
 +
 +        def fin():
 +            try:
 +                api.Command['user_del']([testuser])
 +            except errors.NotFound:
 +                pass
 +            os.unlink(ccache)
 +
 +        request.addfinalizer(fin)
 +
 +    def _login(self, user, password, host=None):
 +        return self.send_request(params={'user': str(user),
 +                                 'password' : str(password)},
 +                                 host=host)
 +
 +    def test_bad_options(self):
 +        for params in (
 +            None,                             # no params
 +            {"user": "foo"},                  # missing options
 +            {"user": "foo", "password": ""},  # empty option
 +        ):
 +            response = self.send_request(params=params)
 +            assert_equal(response.status, 400)
 +            assert_equal(response.reason, 'Bad Request')
 +
 +    def test_invalid_auth(self):
 +        response = self._login(testuser, 'wrongpassword')
 +
 +        assert_equal(response.status, 401)
 +        assert_equal(response.getheader('X-IPA-Rejection-Reason'),
 +                     'invalid-password')
 +
 +    def test_invalid_referer(self):
 +        response = self._login(testuser, password, 'attacker.test')
 +
 +        assert_equal(response.status, 400)
 +
 +    def test_success(self):
 +        response = self._login(testuser, password)
 +
 +        assert_equal(response.status, 200)
 +        assert response.getheader('X-IPA-Rejection-Reason') is None
 diff --git a/ipatests/test_ipaserver/test_referer.py b/ipatests/test_ipaserver/test_referer.py
 new file mode 100644
 index 000000000..4eade8bba
 --- /dev/null
 +++ b/ipatests/test_ipaserver/test_referer.py
@@ -0,0 +1,136 @@
 +# Copyright (C) 2023  Red Hat
 +# see file 'COPYING' for use and warranty information
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation, either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +import os
 +import pytest
 +import uuid
 +
 +from ipatests.test_ipaserver.httptest import Unauthorized_HTTP_test
 +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
 +from ipatests.util import assert_equal
 +from ipalib import api, errors
 +from ipapython.ipautil import run
 +
 +testuser = u'tuser'
 +password = u'password'
 +
 +
 +@pytest.mark.tier1
 +class test_referer(XMLRPC_test, Unauthorized_HTTP_test):
 +
 +    @pytest.fixture(autouse=True)
 +    def login_setup(self, request):
 +        ccache = os.path.join('/tmp', str(uuid.uuid4()))
 +        tokenid = None
 +        try:
 +            api.Command['user_add'](uid=testuser, givenname=u'Test', sn=u'User')
 +            api.Command['passwd'](testuser, password=password)
 +            run(['kinit', testuser], stdin='{0}\n{0}\n{0}\n'.format(password),
 +                env={"KRB5CCNAME": ccache})
 +            result = api.Command["otptoken_add"](
 +                type='HOTP', description='testotp',
 +                ipatokenotpalgorithm='sha512', ipatokenowner=testuser,
 +                ipatokenotpdigits='6')
 +            tokenid = result['result']['ipatokenuniqueid'][0]
 +        except errors.ExecutionError as e:
 +            pytest.skip(
 +                'Cannot set up test user: %s' % e
 +            )
 +
 +        def fin():
 +            try:
 +                api.Command['user_del']([testuser])
 +                api.Command['otptoken_del']([tokenid])
 +            except errors.NotFound:
 +                pass
 +            os.unlink(ccache)
 +
 +        request.addfinalizer(fin)
 +
 +    def _request(self, params={}, host=None):
 +        # implicit is that self.app_uri is set to the appropriate value
 +        return self.send_request(params=params, host=host)
 +
 +    def test_login_password_valid(self):
 +        """Valid authentication of a user"""
 +        self.app_uri = "/ipa/session/login_password"
 +        response = self._request(
 +            params={'user': 'tuser', 'password': password})
 +        assert_equal(response.status, 200, self.app_uri)
 +
 +    def test_change_password_valid(self):
 +        """This actually changes the user password"""
 +        self.app_uri = "/ipa/session/change_password"
 +        response = self._request(
 +            params={'user': 'tuser',
 +                    'old_password': password,
 +                    'new_password': 'new_password'}
 +        )
 +        assert_equal(response.status, 200, self.app_uri)
 +
 +    def test_sync_token_valid(self):
 +        """We aren't testing that sync works, just that we can get there"""
 +        self.app_uri = "/ipa/session/sync_token"
 +        response = self._request(
 +            params={'user': 'tuser',
 +                    'first_code': '1234',
 +                    'second_code': '5678',
 +                    'password': 'password'})
 +        assert_equal(response.status, 200, self.app_uri)
 +
 +    def test_i18n_messages_valid(self):
 +        # i18n_messages requires a valid JSON request and we send
 +        # nothing. If we get a 500 error then it got past the
 +        # referer check.
 +        self.app_uri = "/ipa/i18n_messages"
 +        response = self._request()
 +        assert_equal(response.status, 500, self.app_uri)
 +
 +    # /ipa/session/login_x509 is not tested yet as it requires
 +    # significant additional setup.
 +    # This can be manually verified by adding
 +    # Satisfy Any and Require all granted to the configuration
 +    # section and comment out all Auth directives. The request
 +    # will fail and log that there is no KRB5CCNAME which comes
 +    # after the referer check.
 +
 +    def test_endpoints_auth_required(self):
 +        """Test endpoints that require pre-authorization which will
 +           fail before we even get to the Referer check
 +        """
 +        self.endpoints = {
 +            "/ipa/xml",
 +            "/ipa/session/login_kerberos",
 +            "/ipa/session/json",
 +            "/ipa/session/xml"
 +        }
 +        for self.app_uri in self.endpoints:
 +            response = self._request(host="attacker.test")
 +
 +            # referer is checked after auth
 +            assert_equal(response.status, 401, self.app_uri)
 +
 +    def notest_endpoints_invalid(self):
 +        """Pass in a bad Referer, expect a 400 Bad Request"""
 +        self.endpoints = {
 +            "/ipa/session/login_password",
 +            "/ipa/session/change_password",
 +            "/ipa/session/sync_token",
 +        }
 +        for self.app_uri in self.endpoints:
 +            response = self._request(host="attacker.test")
 +
 +            assert_equal(response.status, 400, self.app_uri)
 diff --git a/ipatests/util.py b/ipatests/util.py
 index 5c0152b90..c69d98790 100644
 --- a/ipatests/util.py
 +++ b/ipatests/util.py
@@ -163,12 +163,12 @@ class ExceptionNotRaised(Exception):
         return self.msg % self.expected.__name__
 -def assert_equal(val1, val2):
 +def assert_equal(val1, val2, msg=''):
     """
     Assert ``val1`` and ``val2`` are the same type and of equal value.
     """
     assert type(val1) is type(val2), '%r != %r' % (val1, val2)
 -    assert val1 == val2, '%r != %r' % (val1, val2)
 +    assert val1 == val2, '%r != %r %r' % (val1, val2, msg)
 def assert_not_equal(val1, val2):
 -- 
 2.41.0
--- a/SOURCES/0004-ipa-kdb-Detect-and-block-Bronze-Bit-attacks.patch
+++ b/SOURCES/0004-ipa-kdb-Detect-and-block-Bronze-Bit-attacks.patch
@ -1,265 +0,0 @@
 From 013be398bced31f567ef01ac2471cb7529789b4a Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Mon, 9 Oct 2023 15:47:03 +0200
 Subject: [PATCH] ipa-kdb: Detect and block Bronze-Bit attacks
 The C8S/RHEL8 version of FreeIPA is vulnerable to the Bronze-Bit attack
 because it does not implement PAC ticket signature to protect the
 "forwardable" flag. However, it does implement the PAC extended KDC
 signature, which protects against PAC spoofing.
 Based on information available in the PAC and the
 "ok-to-auth-as-delegate" attribute in the database. It is possible to
 detect and reject requests where the "forwardable" flag was flipped by
 the attacker in the evidence ticket.
 ---
 daemons/ipa-kdb/ipa_kdb.h           |  13 +++
 daemons/ipa-kdb/ipa_kdb_kdcpolicy.c |   6 +
 daemons/ipa-kdb/ipa_kdb_mspac.c     | 173 ++++++++++++++++++++++++++++
 ipaserver/install/server/install.py |   8 ++
 4 files changed, 200 insertions(+)
 diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h
 index 7aa5be494..02b2cb631 100644
 --- a/daemons/ipa-kdb/ipa_kdb.h
 +++ b/daemons/ipa-kdb/ipa_kdb.h
@@ -367,6 +367,19 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
                                                   const char *test_realm, size_t size,
                                                   char **trusted_realm);
 +/* Try to detect a Bronze-Bit attack based on the content of the request and
 + * data from the KDB.
 + *
 + *   context     krb5 context
 + *   request     KDB request
 + *   detected    Set to "true" if a bronze bit attack is detected and the
 + *               pointer is not NULL. Remains unset otherwise.
 + *   status      If the call fails and the pointer is not NULL, set it with a
 + *               message describing the cause of the failure. */
 +krb5_error_code
 +ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
 +                                  bool *detected, const char **status);
 +
 /* DELEGATION CHECKS */
 krb5_error_code ipadb_check_allowed_to_delegate(krb5_context kcontext,
 diff --git a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 index f2804c9b2..1032dff0b 100644
 --- a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 +++ b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
@@ -185,6 +185,12 @@ ipa_kdcpolicy_check_tgs(krb5_context context, krb5_kdcpolicy_moddata moddata,
                         const char **status, krb5_deltat *lifetime_out,
                         krb5_deltat *renew_lifetime_out)
 {
 +    krb5_error_code kerr;
 +
 +    kerr = ipadb_check_for_bronze_bit_attack(context, request, NULL, status);
 +    if (kerr)
 +        return KRB5KDC_ERR_POLICY;
 +
     *status = NULL;
     *lifetime_out = 0;
     *renew_lifetime_out = 0;
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index 83cb9914d..b4e22d431 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -3298,3 +3298,176 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
 	return KRB5_KDB_NOENTRY;
 }
 +
 +krb5_error_code
 +ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
 +                                  bool *detected, const char **status)
 +{
 +    krb5_error_code kerr;
 +    const char *st = NULL;
 +    size_t i, j;
 +    krb5_ticket *evidence_tkt;
 +    krb5_authdata **authdata, **ifrel = NULL;
 +    krb5_pac pac = NULL;
 +    TALLOC_CTX *tmpctx = NULL;
 +    krb5_data fullsign = { 0, 0, NULL }, linfo_blob = { 0, 0, NULL };
 +    DATA_BLOB linfo_data;
 +    struct PAC_LOGON_INFO_CTR linfo;
 +    enum ndr_err_code ndr_err;
 +    struct dom_sid asserted_identity_sid;
 +    bool evtkt_is_s4u2self = false;
 +    krb5_db_entry *proxy_entry = NULL;
 +
 +    /* If no additional ticket, this is not a constrained delegateion request.
 +     * Skip checks. */
 +    if (!(request->kdc_options & KDC_OPT_CNAME_IN_ADDL_TKT)) {
 +        kerr = 0;
 +        goto end;
 +    }
 +
 +    evidence_tkt = request->second_ticket[0];
 +
 +    /* No need to check the Forwardable flag. If it was not set, this request
 +     * would have failed earlier. */
 +
 +    /* We only support general constrained delegation (not RBCD), which is not
 +     * available for cross-realms. */
 +    if (!krb5_realm_compare(context, evidence_tkt->server, request->server)) {
 +        st = "S4U2PROXY_NOT_SUPPORTED_FOR_CROSS_REALMS";
 +        kerr = ENOTSUP;
 +        goto end;
 +    }
 +
 +    authdata = evidence_tkt->enc_part2->authorization_data;
 +
 +    /* Search for the PAC. */
 +    for (i = 0; authdata != NULL && authdata[i] != NULL; i++) {
 +        if (authdata[i]->ad_type != KRB5_AUTHDATA_IF_RELEVANT)
 +            continue;
 +
 +        kerr = krb5_decode_authdata_container(context,
 +                                              KRB5_AUTHDATA_IF_RELEVANT,
 +                                              authdata[i], &ifrel);
 +        if (kerr) {
 +            st = "S4U2PROXY_CANNOT_DECODE_EVIDENCE_TKT_AUTHDATA";
 +            goto end;
 +        }
 +
 +        for (j = 0; ifrel[j] != NULL; j++) {
 +            if (ifrel[j]->ad_type == KRB5_AUTHDATA_WIN2K_PAC)
 +                break;
 +        }
 +        if (ifrel[j] != NULL)
 +            break;
 +
 +        krb5_free_authdata(context, ifrel);
 +        ifrel = NULL;
 +    }
 +
 +    if (ifrel == NULL) {
 +        st = "S4U2PROXY_EVIDENCE_TKT_WITHOUT_PAC";
 +        kerr = ENOENT;
 +        goto end;
 +    }
 +
 +    /* Parse the PAC. */
 +    kerr = krb5_pac_parse(context, ifrel[j]->contents, ifrel[j]->length, &pac);
 +    if (kerr) {
 +        st = "S4U2PROXY_CANNOT_DECODE_EVICENCE_TKT_PAC";
 +        goto end;
 +    }
 +
 +    /* Check that the PAC extanded KDC signature is present. If it is, it was
 +     * already tested.
 +     * If absent, the context of the PAC cannot be trusted. */
 +    kerr = krb5_pac_get_buffer(context, pac, KRB5_PAC_FULL_CHECKSUM, &fullsign);
 +    if (kerr) {
 +        st = "S4U2PROXY_MISSING_EXTENDED_KDC_SIGN_IN_EVIDENCE_TKT_PAC";
 +        goto end;
 +    }
 +
 +    /* Get the PAC Logon Info. */
 +    kerr = krb5_pac_get_buffer(context, pac, KRB5_PAC_LOGON_INFO, &linfo_blob);
 +    if (kerr) {
 +        st = "S4U2PROXY_NO_PAC_LOGON_INFO_IN_EVIDENCE_TKT";
 +        goto end;
 +    }
 +
 +    /* Parse the PAC Logon Info. */
 +    tmpctx = talloc_new(NULL);
 +    if (!tmpctx) {
 +        st = "OUT_OF_MEMORY";
 +        kerr = ENOMEM;
 +        goto end;
 +    }
 +
 +    linfo_data.length = linfo_blob.length;
 +    linfo_data.data = (uint8_t *)linfo_blob.data;
 +    ndr_err = ndr_pull_union_blob(&linfo_data, tmpctx, &linfo,
 +                                  PAC_TYPE_LOGON_INFO,
 +                                  (ndr_pull_flags_fn_t)ndr_pull_PAC_INFO);
 +    if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 +        st = "S4U2PROXY_CANNOT_PARSE_ENVIDENCE_TKT_PAC_LOGON_INFO";
 +        kerr = EINVAL;
 +        goto end;
 +    }
 +
 +    /* Check that the extra SIDs array is not empty. */
 +    if (linfo.info->info3.sidcount == 0) {
 +        st = "S4U2PROXY_NO_EXTRA_SID";
 +        kerr = ENOENT;
 +        goto end;
 +    }
 +
 +    /* Search for the S-1-18-2 domain SID, which indicates the ticket was
 +     * obtained using S4U2Self */
 +    kerr = ipadb_string_to_sid("S-1-18-2", &asserted_identity_sid);
 +    if (kerr) {
 +        st = "S4U2PROXY_CANNOT_CREATE_ASSERTED_IDENTITY_SID";
 +        goto end;
 +    }
 +
 +    for (i = 0; i < linfo.info->info3.sidcount; i++) {
 +        if (dom_sid_check(&asserted_identity_sid,
 +                          linfo.info->info3.sids[0].sid, true)) {
 +            evtkt_is_s4u2self = true;
 +            break;
 +        }
 +    }
 +
 +    /* If the ticket was obtained using S4U2Self, the proxy principal entry must
 +     * have the "ok_to_auth_as_delegate" attribute set to true. */
 +    if (evtkt_is_s4u2self) {
 +        kerr = ipadb_get_principal(context, evidence_tkt->server, 0,
 +                                   &proxy_entry);
 +        if (kerr) {
 +            st = "S4U2PROXY_CANNOT_FIND_PROXY_PRINCIPAL";
 +            goto end;
 +        }
 +
 +        if (!(proxy_entry->attributes & KRB5_KDB_OK_TO_AUTH_AS_DELEGATE)) {
 +            /* This evidence ticket cannot be forwardable given the privileges
 +             * of the proxy principal.
 +             * This is a Bronze Bit attack. */
 +            if (detected)
 +                *detected = true;
 +            st = "S4U2PROXY_BRONZE_BIT_ATTACK_DETECTED";
 +            kerr = EBADE;
 +            goto end;
 +        }
 +    }
 +
 +    kerr = 0;
 +
 +end:
 +    if (st && status)
 +        *status = st;
 +
 +    krb5_free_authdata(context, ifrel);
 +    krb5_pac_free(context, pac);
 +    krb5_free_data_contents(context, &linfo_blob);
 +    krb5_free_data_contents(context, &fullsign);
 +    talloc_free(tmpctx);
 +    ipadb_free_principal(context, proxy_entry);
 +    return kerr;
 +}
 diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
 index 4e4076410..bfbb83bcb 100644
 --- a/ipaserver/install/server/install.py
 +++ b/ipaserver/install/server/install.py
@@ -981,6 +981,14 @@ def install(installer):
     # Set the admin user kerberos password
     ds.change_admin_password(admin_password)
 +    # Force KDC to refresh the cached value of ipaKrbAuthzData by restarting.
 +    # ipaKrbAuthzData has to be set with "MS-PAC" to trigger PAC generation,
 +    # which is required to handle S4U2Proxy with the Bronze-Bit fix.
 +    # Not doing so would cause API malfunction for around a minute, which is
 +    # long enough to cause the hereafter client installation to fail.
 +    service.print_msg("Restarting the KDC")
 +    krb.restart()
 +
     # Call client install script
     service.print_msg("Configuring client side components")
     try:
 -- 
 2.41.0
--- a/SOURCES/0005-Improve-server-affinity-for-ca-less-deployments_rhel#22283.patch
+++ b/SOURCES/0005-Improve-server-affinity-for-ca-less-deployments_rhel#22283.patch
@ -1,212 +0,0 @@
 From 3add9ba03a0af913d03b1f5ecaa8e48e46a93f91 Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Jan 15 2024 13:42:08 +0000
 Subject: Server affinity: Retain user-requested remote server
 We want to avoid splitting a replica server installation between
 two hosts where possible so if a CA or KRA is requested then
 we only try to install against a remote server that also provides
 those capabilities. This avoids race conditions.
 If a CA or KRA is not requested and the user has provided a
 server to install against then use that instead of overriding it.
 Extend the logic of picking the remote Custodia mode
 (KRA, CA, *MASTER*) to include considering whether the
 CA and KRA services are requested. If the service(s) are
 not requested the the associated hostname may not be
 reliable.
 Fixes: https://pagure.io/freeipa/issue/9491
 Related: https://pagure.io/freeipa/issue/9289
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
 index 27fbdef..8096b6a 100644
 --- a/ipaserver/install/server/replicainstall.py
 +++ b/ipaserver/install/server/replicainstall.py
@@ -782,6 +782,7 @@ def promotion_check_host_principal_auth_ind(conn, hostdn):
 def remote_connection(config):
 +    logger.debug("Creating LDAP connection to %s", config.master_host_name)
     ldapuri = 'ldaps://%s' % ipautil.format_netloc(config.master_host_name)
     xmlrpc_uri = 'https://{}/ipa/xml'.format(
         ipautil.format_netloc(config.master_host_name))
@@ -1087,7 +1088,7 @@ def promote_check(installer):
             'CA', conn, preferred_cas
         )
         if ca_host is not None:
 -            if config.master_host_name != ca_host:
 +            if options.setup_ca and config.master_host_name != ca_host:
                 conn.disconnect()
                 del remote_api
                 config.master_host_name = ca_host
@@ -1096,8 +1097,7 @@ def promote_check(installer):
                 conn = remote_api.Backend.ldap2
                 conn.connect(ccache=installer._ccache)
             config.ca_host_name = ca_host
 -            config.master_host_name = ca_host
 -            ca_enabled = True
 +            ca_enabled = True  # There is a CA somewhere in the topology
             if options.dirsrv_cert_files:
                 logger.error("Certificates could not be provided when "
                              "CA is present on some master.")
@@ -1135,7 +1135,7 @@ def promote_check(installer):
             'KRA', conn, preferred_kras
         )
         if kra_host is not None:
 -            if config.master_host_name != kra_host:
 +            if options.setup_kra and config.master_host_name != kra_host:
                 conn.disconnect()
                 del remote_api
                 config.master_host_name = kra_host
@@ -1143,10 +1143,9 @@ def promote_check(installer):
                 installer._remote_api = remote_api
                 conn = remote_api.Backend.ldap2
                 conn.connect(ccache=installer._ccache)
 -            config.kra_host_name = kra_host
 -            config.ca_host_name = kra_host
 -            config.master_host_name = kra_host
 -            kra_enabled = True
 +                config.kra_host_name = kra_host
 +                config.ca_host_name = kra_host
 +            kra_enabled = True  # There is a KRA somewhere in the topology
             if options.setup_kra and options.server and \
                kra_host != options.server:
                 # Installer was provided with a specific master
@@ -1372,10 +1371,10 @@ def install(installer):
     otpd.create_instance('OTPD', config.host_name,
                          ipautil.realm_to_suffix(config.realm_name))
 -    if kra_enabled:
 +    if options.setup_kra and kra_enabled:
         # A KRA peer always provides a CA, too.
         mode = custodiainstance.CustodiaModes.KRA_PEER
 -    elif ca_enabled:
 +    elif options.setup_ca and ca_enabled:
         mode = custodiainstance.CustodiaModes.CA_PEER
     else:
         mode = custodiainstance.CustodiaModes.MASTER_PEER
 From 701339d4fed539713eb1a13495992879f56a6daa Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Jan 18 2024 14:53:28 +0000
 Subject: Server affinity: Don't rely just on [ca|kra]_enabled for installs
 ca_enable and kra_enabled are intended to be used to identify that
 a CA or KRA is available in the topology. It was also being used
 to determine whether a CA or KRA service is desired on a replica
 install, rather than options.setup_[ca|kra]
 Fixes: https://pagure.io/freeipa/issue/9510
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
 index 8096b6a..191913d 100644
 --- a/ipaserver/install/server/replicainstall.py
 +++ b/ipaserver/install/server/replicainstall.py
@@ -1143,7 +1143,8 @@ def promote_check(installer):
                 installer._remote_api = remote_api
                 conn = remote_api.Backend.ldap2
                 conn.connect(ccache=installer._ccache)
 -                config.kra_host_name = kra_host
 +            config.kra_host_name = kra_host
 +            if options.setup_kra:  # only reset ca_host if KRA is requested
                 config.ca_host_name = kra_host
             kra_enabled = True  # There is a KRA somewhere in the topology
             if options.setup_kra and options.server and \
@@ -1381,7 +1382,7 @@ def install(installer):
     custodia = custodiainstance.get_custodia_instance(config, mode)
     custodia.create_instance()
 -    if ca_enabled:
 +    if options.setup_ca and ca_enabled:
         options.realm_name = config.realm_name
         options.domain_name = config.domain_name
         options.host_name = config.host_name
@@ -1397,7 +1398,7 @@ def install(installer):
     service.print_msg("Finalize replication settings")
     ds.finalize_replica_config()
 -    if kra_enabled:
 +    if options.setup_kra and kra_enabled:
         kra.install(api, config, options, custodia=custodia)
     service.print_msg("Restarting the KDC")
 From e6014a5c1996528b255480b67fe2937203bff81b Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Jan 23 2024 15:32:58 +0000
 Subject: Server affinity: call ca.install() if there is a CA in the topology
 This should not have been gated on options.setup_ca because we need
 the RA agent on all servers if there is a CA in the topology otherwise
 the non-CA servers won't be able to communicate with the CA.
 Fixes: https://pagure.io/freeipa/issue/9510
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
 index c93ae1f..187f803 100644
 --- a/ipaserver/install/ca.py
 +++ b/ipaserver/install/ca.py
@@ -387,9 +387,10 @@ def install_step_0(standalone, replica_config, options, custodia):
         promote = False
     else:
         cafile = os.path.join(replica_config.dir, 'cacert.p12')
 -        custodia.get_ca_keys(
 -            cafile,
 -            replica_config.dirman_password)
 +        if replica_config.setup_ca:
 +            custodia.get_ca_keys(
 +                cafile,
 +                replica_config.dirman_password)
         ca_signing_algorithm = None
         ca_type = None
 diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
 index f8d4733..4c1c07c 100644
 --- a/ipaserver/install/server/replicainstall.py
 +++ b/ipaserver/install/server/replicainstall.py
@@ -1359,11 +1359,13 @@ def install(installer):
     custodia = custodiainstance.get_custodia_instance(config, mode)
     custodia.create_instance()
 -    if options.setup_ca and ca_enabled:
 +    if ca_enabled:
         options.realm_name = config.realm_name
         options.domain_name = config.domain_name
         options.host_name = config.host_name
         options.dm_password = config.dirman_password
 +        # Always call ca.install() if there is a CA in the topology
 +        # to ensure the RA agent is present.
         ca.install(False, config, options, custodia=custodia)
     # configure PKINIT now that all required services are in place
@@ -1375,7 +1377,8 @@ def install(installer):
     service.print_msg("Finalize replication settings")
     ds.finalize_replica_config()
 -    if options.setup_kra and kra_enabled:
 +    if kra_enabled:
 +        # The KRA installer checks for itself the status of setup_kra
         kra.install(api, config, options, custodia=custodia)
     service.print_msg("Restarting the KDC")
--- a/SOURCES/0006-host-update-System-Manage-Host-Keytab-permission_rhel#22286.patch
+++ b/SOURCES/0006-host-update-System-Manage-Host-Keytab-permission_rhel#22286.patch
@ -1,97 +0,0 @@
 From 3842116185de6ae8714f30b57bd75c7eddde53d8 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Jan 15 2024 13:50:10 +0000
 Subject: host: update System: Manage Host Keytab permission
 Since commit 5c0e7a5fb420377dcc06a956695afdcb35196444, a new extended
 operation to get a keytab is supposed to be used. This keytab
 setting/retrieval extended operation checks access rights of the bound
 DN to write to a virtual attribute 'ipaProtectedOperation;write_keys'.
 If the write isn't allowed, the operation is rejected and ipa-getkeytab
 tool falls back to an older code that generates the keytab on the client
 and forcibly sets to the LDAP entry. For the latter, a check is done to
 make sure the bound DN is allowed to write to 'krbPrincipalKey' attribute.
 This fallback should never happen for newer deployments. When enrollemnt
 operation is delegated to non-administrative user with the help of 'Host
 Enrollment' role, a host can be pre-created or created at enrollment
 time, if this non-administrative user has 'Host Administrators' role. In
 the latter case a system permission 'System: Manage Host Keytab' grants
 write access to 'krbPrincipalKey' attribute but lacks any access to the
 virtual attributes expected by the new extended operation.
 There is a second virtual attribute, 'ipaProtectedOperation;read_keys',
 that allows to retrieve existing keys for a host. However, during
 initial enrollment we do not allow to retrieve and reuse existing
 Kerberos key: while 'ipa-getkeytab -r' would give ability to retrieve
 the existing key, 'ipa-join' has no way to trigger that operation.
 Hence, permission 'System: Manage Host Keytab' will not grant the right
 to read the Kerberos key via extended operation used by 'ipa-getkeytab
 -r'. Such operation can be done later by utilizing 'ipa
 service/host-allow-retrieve-keytab' commands.
 Fix 'System: Manage Host Keytab' permission and extend a permission test
 to see that we do not fallback to the old extended operation.
 Fixes: https://pagure.io/freeipa/issue/9496
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 diff --git a/ACI.txt b/ACI.txt
 index e6d6e3d..236bb43 100644
 --- a/ACI.txt
 +++ b/ACI.txt
@@ -147,7 +147,7 @@ aci: (targetattr = "usercertificate")(targetfilter = "(objectclass=ipahost)")(ve
 dn: cn=computers,cn=accounts,dc=ipa,dc=example
 aci: (targetattr = "userpassword")(targetfilter = "(objectclass=ipahost)")(version 3.0;acl "permission:System: Manage Host Enrollment Password";allow (write) groupdn = "ldap:///cn=System: Manage Host Enrollment Password,cn=permissions,cn=pbac,dc=ipa,dc=example";)
 dn: cn=computers,cn=accounts,dc=ipa,dc=example
 -aci: (targetattr = "krblastpwdchange || krbprincipalkey")(targetfilter = "(&(!(memberOf=cn=ipaservers,cn=hostgroups,cn=accounts,dc=ipa,dc=example))(objectclass=ipahost))")(version 3.0;acl "permission:System: Manage Host Keytab";allow (write) groupdn = "ldap:///cn=System: Manage Host Keytab,cn=permissions,cn=pbac,dc=ipa,dc=example";)
 +aci: (targetattr = "ipaprotectedoperation;write_keys || krblastpwdchange || krbprincipalkey")(targetfilter = "(&(!(memberOf=cn=ipaservers,cn=hostgroups,cn=accounts,dc=ipa,dc=example))(objectclass=ipahost))")(version 3.0;acl "permission:System: Manage Host Keytab";allow (write) groupdn = "ldap:///cn=System: Manage Host Keytab,cn=permissions,cn=pbac,dc=ipa,dc=example";)
 dn: cn=computers,cn=accounts,dc=ipa,dc=example
 aci: (targetattr = "createtimestamp || entryusn || ipaallowedtoperform;read_keys || ipaallowedtoperform;write_keys || modifytimestamp || objectclass")(targetfilter = "(objectclass=ipahost)")(version 3.0;acl "permission:System: Manage Host Keytab Permissions";allow (compare,read,search,write) groupdn = "ldap:///cn=System: Manage Host Keytab Permissions,cn=permissions,cn=pbac,dc=ipa,dc=example";)
 dn: cn=computers,cn=accounts,dc=ipa,dc=example
 diff --git a/ipaserver/plugins/host.py b/ipaserver/plugins/host.py
 index 3ef510e..b02c8b5 100644
 --- a/ipaserver/plugins/host.py
 +++ b/ipaserver/plugins/host.py
@@ -409,7 +409,8 @@ class host(LDAPObject):
                                         api.env.container_hostgroup,
                                         api.env.basedn),
             ],
 -            'ipapermdefaultattr': {'krblastpwdchange', 'krbprincipalkey'},
 +            'ipapermdefaultattr': {'krblastpwdchange', 'krbprincipalkey',
 +                                   'ipaprotectedoperation;write_keys'},
             'replaces': [
                 '(targetattr = "krbprincipalkey || krblastpwdchange")(target = "ldap:///fqdn=*,cn=computers,cn=accounts,$SUFFIX")(version 3.0;acl "permission:Manage host keytab";allow (write) groupdn = "ldap:///cn=Manage host keytab,cn=permissions,cn=pbac,$SUFFIX";)',
             ],
 diff --git a/ipatests/test_integration/test_user_permissions.py b/ipatests/test_integration/test_user_permissions.py
 index 3333a4f..cd1096f 100644
 --- a/ipatests/test_integration/test_user_permissions.py
 +++ b/ipatests/test_integration/test_user_permissions.py
@@ -277,6 +277,9 @@ class TestInstallClientNoAdmin(IntegrationTest):
         self.master.run_command(['ipa', 'privilege-add-permission',
                                  '--permissions', 'System: Add Hosts',
                                  'Add Hosts'])
 +        self.master.run_command(['ipa', 'privilege-add-permission',
 +                                 '--permissions', 'System: Manage Host Keytab',
 +                                 'Add Hosts'])
         self.master.run_command(['ipa', 'role-add-privilege', 'useradmin',
                                  '--privileges', 'Host Enrollment'])
@@ -301,6 +304,10 @@ class TestInstallClientNoAdmin(IntegrationTest):
                                                encoding='utf-8')
         assert msg in install_log
 +        # Make sure we do not fallback to an old keytab retrieval method anymore
 +        msg = "Retrying with pre-4.0 keytab retrieval method..."
 +        assert msg not in install_log
 +
         # check that user is able to request a host cert, too
         result = tasks.run_certutil(client, ['-L'], paths.IPA_NSSDB_DIR)
         assert 'Local IPA host' in result.stdout_text
--- a/SOURCES/0007-adtrustinstance-make-sure-NetBIOS-name-defaults-are-set-properly_rhel#21938.patch
+++ b/SOURCES/0007-adtrustinstance-make-sure-NetBIOS-name-defaults-are-set-properly_rhel#21938.patch
@ -1,32 +0,0 @@
 From 2f17319df6147832dceff7c06154363f8d58b194 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Jan 18 2024 09:07:31 +0000
 Subject: adtrustinstance: make sure NetBIOS name defaults are set properly
 Some tools may pass None as NetBIOS name if not put explicitly by a
 user. This meant to use default NetBIOS name generator based on the
 domain (realm) name. However, this wasn't done properly, so None is
 passed later to python-ldap and it rejects such LDAP entry.
 Fixes: https://pagure.io/freeipa/issue/9514
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
 index bf0cc3b..bb5b61a 100644
 --- a/ipaserver/install/adtrustinstance.py
 +++ b/ipaserver/install/adtrustinstance.py
@@ -189,6 +189,8 @@ class ADTRUSTInstance(service.Service):
         self.fqdn = self.fqdn or api.env.host
         self.host_netbios_name = make_netbios_name(self.fqdn)
         self.realm = self.realm or api.env.realm
 +        if not self.netbios_name:
 +            self.netbios_name = make_netbios_name(self.realm)
         self.suffix = ipautil.realm_to_suffix(self.realm)
         self.ldapi_socket = "%%2fvar%%2frun%%2fslapd-%s.socket" % \
--- a/SOURCES/0008-ipatests-Fix-healthcheck-report-when-nsslapd-accesslog-logbuffering-is-set-to-off_rhel#19672.patch
+++ b/SOURCES/0008-ipatests-Fix-healthcheck-report-when-nsslapd-accesslog-logbuffering-is-set-to-off_rhel#19672.patch
@ -1,175 +0,0 @@
 From 5afda72afc6fd626359411b55f092989fdd7d82d Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Jan 15 2024 13:39:21 +0000
 Subject: ipatests: ignore nsslapd-accesslog-logbuffering WARN in healthcheck
 Log buffering is disabled in the integration tests so we can have all
 the logs at the end. This is causing a warning to show in the 389-ds
 checks and causing tests to fail that expect all SUCCESS.
 Add an exclude for this specific key so tests will pass again.
 We may eventually want a more sophisiticated mechanism to handle
 excludes, or updating the config in general, but this is fine for now.
 Fixes: https://pagure.io/freeipa/issue/9400
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Michal Polovka <mpolovka@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Michal Polovka <mpolovka@redhat.com>
 ---
 diff --git a/ipatests/test_integration/test_ipahealthcheck.py b/ipatests/test_integration/test_ipahealthcheck.py
 index 7fb8e40..14fba26 100644
 --- a/ipatests/test_integration/test_ipahealthcheck.py
 +++ b/ipatests/test_integration/test_ipahealthcheck.py
@@ -9,6 +9,7 @@ from __future__ import absolute_import
 from configparser import RawConfigParser, NoOptionError
 from datetime import datetime, timedelta
 +import io
 import json
 import os
 import re
@@ -208,6 +209,28 @@ def run_healthcheck(host, source=None, check=None, output_type="json",
     return result.returncode, data
 +def set_excludes(host, option, value,
 +                 config_file='/etc/ipahealthcheck/ipahealthcheck.conf'):
 +    """Mark checks that should be excluded from the results
 +
 +       This will set in the [excludes] section on host:
 +           option=value
 +    """
 +    EXCLUDES = "excludes"
 +
 +    conf = host.get_file_contents(config_file, encoding='utf-8')
 +    cfg = RawConfigParser()
 +    cfg.read_string(conf)
 +    if not cfg.has_section(EXCLUDES):
 +        cfg.add_section(EXCLUDES)
 +    if not cfg.has_option(EXCLUDES, option):
 +        cfg.set(EXCLUDES, option, value)
 +    out = io.StringIO()
 +    cfg.write(out)
 +    out.seek(0)
 +    host.put_file_contents(config_file, out.read())
 +
 +
 @pytest.fixture
 def restart_service():
     """Shut down and restart a service as a fixture"""
@@ -265,6 +288,7 @@ class TestIpaHealthCheck(IntegrationTest):
             setup_dns=True,
             extra_args=['--no-dnssec-validation']
         )
 +        set_excludes(cls.master, "key", "DSCLE0004")
     def test_ipa_healthcheck_install_on_master(self):
         """
@@ -552,6 +576,7 @@ class TestIpaHealthCheck(IntegrationTest):
                               setup_dns=True,
                               extra_args=['--no-dnssec-validation']
                               )
 +        set_excludes(self.replicas[0], "key", "DSCLE0004")
         # Init a user on replica to assign a DNA range
         tasks.kinit_admin(self.replicas[0])
@@ -692,6 +717,7 @@ class TestIpaHealthCheck(IntegrationTest):
                 'output_type=human'
             ])
         )
 +        set_excludes(self.master, "key", "DSCLE0004", config_file)
         returncode, output = run_healthcheck(
             self.master, failures_only=True, config=config_file
         )
@@ -707,6 +733,7 @@ class TestIpaHealthCheck(IntegrationTest):
                 'output_file=%s' % HC_LOG,
             ])
         )
 +        set_excludes(self.master, "key", "DSCLE0004")
         returncode, _unused = run_healthcheck(
             self.master, config=config_file
         )
@@ -2396,6 +2423,7 @@ class TestIpaHealthCLI(IntegrationTest):
             cls.master, setup_dns=True, extra_args=['--no-dnssec-validation']
         )
         tasks.install_packages(cls.master, HEALTHCHECK_PKG)
 +        set_excludes(cls.master, "key", "DSCLE0004")
     def test_indent(self):
         """
 diff --git a/ipatests/test_integration/test_replica_promotion.py b/ipatests/test_integration/test_replica_promotion.py
 index d477c3a..b71f2d5 100644
 --- a/ipatests/test_integration/test_replica_promotion.py
 +++ b/ipatests/test_integration/test_replica_promotion.py
@@ -13,7 +13,7 @@ import pytest
 from ipatests.test_integration.base import IntegrationTest
 from ipatests.test_integration.test_ipahealthcheck import (
 -    run_healthcheck, HEALTHCHECK_PKG
 +    run_healthcheck, set_excludes, HEALTHCHECK_PKG
 )
 from ipatests.pytest_ipa.integration import tasks
 from ipatests.pytest_ipa.integration.tasks import (
@@ -983,6 +983,9 @@ class TestHiddenReplicaPromotion(IntegrationTest):
         # manually install KRA to verify that hidden state is synced
         tasks.install_kra(cls.replicas[0])
 +        set_excludes(cls.master, "key", "DSCLE0004")
 +        set_excludes(cls.replicas[0], "key", "DSCLE0004")
 +
     def _check_dnsrecords(self, hosts_expected, hosts_unexpected=()):
         domain = DNSName(self.master.domain.name).make_absolute()
         rset = [
 From f1cfe7d9ff2489dbb6cad70999b0e1bd433c0537 Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Jan 15 2024 13:39:21 +0000
 Subject: ipatests: fix expected output for ipahealthcheck.ipa.host
 ipa-healthcheck commit e69589d5 changed the output when a service
 keytab is missing to not report the GSSAPI error but to report
 that the keytab doesn't exist at all. This distinguishes from real
 Kerberos issues like kvno.
 Fixes: https://pagure.io/freeipa/issue/9482
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Michal Polovka <mpolovka@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Michal Polovka <mpolovka@redhat.com>
 ---
 diff --git a/ipatests/test_integration/test_ipahealthcheck.py b/ipatests/test_integration/test_ipahealthcheck.py
 index 14fba26..8aae9fa 100644
 --- a/ipatests/test_integration/test_ipahealthcheck.py
 +++ b/ipatests/test_integration/test_ipahealthcheck.py
@@ -629,9 +629,15 @@ class TestIpaHealthCheck(IntegrationTest):
         ipahealthcheck.ipa.host when GSSAPI credentials cannot be obtained
         from host's keytab.
         """
 -        msg = (
 -            "Minor (2529639107): No credentials cache found"
 -        )
 +        version = tasks.get_healthcheck_version(self.master)
 +        if parse_version(version) >= parse_version("0.15"):
 +            msg = (
 +                "Service {service} keytab {path} does not exist."
 +            )
 +        else:
 +            msg = (
 +                "Minor (2529639107): No credentials cache found"
 +            )
         with tasks.FileBackup(self.master, paths.KRB5_KEYTAB):
             self.master.run_command(["rm", "-f", paths.KRB5_KEYTAB])
--- a/SOURCES/0009-kdb-PAC-generator-do-not-fail-if-canonical-principal-is-missing_rhel#23630.patch
+++ b/SOURCES/0009-kdb-PAC-generator-do-not-fail-if-canonical-principal-is-missing_rhel#23630.patch
@ -1,45 +0,0 @@
 From dcb9d6edc7ae4278cd552e87f644705faa13d558 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Jan 31 2024 08:31:13 +0000
 Subject: kdb: PAC generator: do not fail if canonical principal is missing
 krbCanonicalName is mandatory for services but IPA services created
 before commit e6ff83e (FreeIPA 4.4.0, ~2016) had no normalization done
 to set krbCanonicalName; services created after that version were
 upgraded to do have krbCanonicalName.
 Accept krbPrincipalName alone since they have no alias either */
 Fixes: https://pagure.io/freeipa/issue/9465
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>
 ---
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index 9e1431c..8035036 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -496,8 +496,16 @@ static krb5_error_code ipadb_fill_info3(struct ipadb_context *ipactx,
         ret = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
                                      "krbCanonicalName", &strres);
         if (ret) {
 -            /* krbCanonicalName is mandatory for services */
 -            return ret;
 +            /* krbCanonicalName is mandatory for services but IPA services
 +             * created before commit e6ff83e (FreeIPA 4.4.0, ~2016) had no
 +             * normalization to set krbCanonicalName; services created after
 +             * that version were upgraded to do have krbCanonicalName.
 +             *
 +             * Accept krbPrincipalName alone since they have no alias either */
 +            ret = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 +                                         "krbPrincipalName", &strres);
 +            if (ret)
 +                return ret;
         }
         ret = krb5_parse_name(ipactx->kcontext, strres, &princ);
--- a/SOURCES/0010-ipa-kdb-Fix-memory-leak-during-PAC-verification_rhel#22644.patch
+++ b/SOURCES/0010-ipa-kdb-Fix-memory-leak-during-PAC-verification_rhel#22644.patch
@ -1,89 +0,0 @@
 From bac601b7f35827236a106f7137f378e4888260da Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Jan 30 2024 15:17:44 +0000
 Subject: ipa-kdb: Fix memory leak during PAC verification
 Commit 0022bd70d93708d325855d5271516d6cd894d6e8 introduced a memory leak
 during the copy of some PAC buffers, because of an unfreed memory
 allocation context.
 Fixes: https://pagure.io/freeipa/issue/9520
 Signed-off-by: Julien Rische <jrische@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index a18beff..9e1431c 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -2316,6 +2316,7 @@ krb5_error_code ipadb_common_verify_pac(krb5_context context,
     size_t i;
     struct dom_sid *requester_sid = NULL;
     struct dom_sid req_sid;
 +    TALLOC_CTX *tmpctx = NULL;
     if (signing_krbtgt != NULL &&
         ipadb_is_cross_realm_krbtgt(signing_krbtgt->princ)) {
@@ -2371,6 +2372,12 @@ krb5_error_code ipadb_common_verify_pac(krb5_context context,
         goto done;
     }
 +    tmpctx = talloc_new(NULL);
 +    if (tmpctx == NULL) {
 +        kerr = ENOMEM;
 +        goto done;
 +    }
 +
     for (i = 0; i < num_buffers; i++) {
         if (types[i] == KRB5_PAC_SERVER_CHECKSUM ||
             types[i] == KRB5_PAC_PRIVSVR_CHECKSUM ||
@@ -2395,32 +2402,21 @@ krb5_error_code ipadb_common_verify_pac(krb5_context context,
             DATA_BLOB pac_attrs_data;
             krb5_boolean pac_requested;
 -            TALLOC_CTX *tmpctx = talloc_new(NULL);
 -            if (tmpctx == NULL) {
 -                kerr = ENOMEM;
 -                goto done;
 -            }
 -
             kerr = ipadb_client_requested_pac(context, old_pac, tmpctx, &pac_requested);
 -            if (kerr != 0) {
 -                talloc_free(tmpctx);
 +            if (kerr)
                 goto done;
 -            }
             kerr = ipadb_get_pac_attrs_blob(tmpctx, &pac_requested, &pac_attrs_data);
 -            if (kerr) {
 -                talloc_free(tmpctx);
 +            if (kerr)
                 goto done;
 -            }
 +
             data.magic = KV5M_DATA;
             data.data = (char *)pac_attrs_data.data;
             data.length = pac_attrs_data.length;
             kerr = krb5_pac_add_buffer(context, new_pac, PAC_TYPE_ATTRIBUTES_INFO, &data);
 -            if (kerr) {
 -                talloc_free(tmpctx);
 +            if (kerr)
                 goto done;
 -            }
             continue;
         }
@@ -2467,6 +2463,8 @@ done:
     if (kerr != 0 && (new_pac != *pac)) {
         krb5_pac_free(context, new_pac);
     }
 +    if (tmpctx)
 +        talloc_free(tmpctx);
     krb5_free_data_contents(context, &pac_blob);
     free(types);
     return kerr;
--- a/SOURCES/0011-Fix-session-cookie-access_rhel#23622.patch
+++ b/SOURCES/0011-Fix-session-cookie-access_rhel#23622.patch
@ -1,238 +0,0 @@
 From 381af470779ea87335f57038dcbe72cd042ae6bb Mon Sep 17 00:00:00 2001
 From: Stanislav Levin <slev@altlinux.org>
 Date: Jan 30 2024 15:11:05 +0000
 Subject: ipapython: Clean up krb5_error
 `krb5_error` has different definition in MIT krb.
 https://web.mit.edu/kerberos/krb5-latest/doc/appdev/refs/types/krb5_error.html
 > Error message structure.
 >
 > Declaration:
 > typedef struct _krb5_error krb5_error
 While `krb5_error_code`
 https://web.mit.edu/kerberos/www/krb5-latest/doc/appdev/refs/types/krb5_error_code.html#c.krb5_error_code
 > krb5_error_code
 > Used to convey an operation status.
 >
 > The value 0 indicates success; any other values are com_err codes. Use krb5_get_error_message() to obtain a string describing the error.
 >
 > Declaration
 > typedef krb5_int32 krb5_error_code
 And this is what was actually used.
 To prevent confusion of types `krb5_error` was replaced with
 `krb5_error_code`.
 Fixes: https://pagure.io/freeipa/issue/9519
 Signed-off-by: Stanislav Levin <slev@altlinux.org>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 diff --git a/ipapython/session_storage.py b/ipapython/session_storage.py
 index c43ef7d..371cf15 100644
 --- a/ipapython/session_storage.py
 +++ b/ipapython/session_storage.py
@@ -111,7 +111,7 @@ class KRB5Error(Exception):
 def krb5_errcheck(result, func, arguments):
 -    """Error checker for krb5_error return value"""
 +    """Error checker for krb5_error_code return value"""
     if result != 0:
         raise KRB5Error(result, func.__name__, arguments)
@@ -119,14 +119,13 @@ def krb5_errcheck(result, func, arguments):
 krb5_context = ctypes.POINTER(_krb5_context)
 krb5_ccache = ctypes.POINTER(_krb5_ccache)
 krb5_data_p = ctypes.POINTER(_krb5_data)
 -krb5_error = ctypes.c_int32
 krb5_creds = _krb5_creds
 krb5_pointer = ctypes.c_void_p
 krb5_cc_cursor = krb5_pointer
 krb5_init_context = LIBKRB5.krb5_init_context
 krb5_init_context.argtypes = (ctypes.POINTER(krb5_context), )
 -krb5_init_context.restype = krb5_error
 +krb5_init_context.restype = krb5_error_code
 krb5_init_context.errcheck = krb5_errcheck
 krb5_free_context = LIBKRB5.krb5_free_context
@@ -143,30 +142,30 @@ krb5_free_data_contents.restype = None
 krb5_cc_default = LIBKRB5.krb5_cc_default
 krb5_cc_default.argtypes = (krb5_context, ctypes.POINTER(krb5_ccache), )
 -krb5_cc_default.restype = krb5_error
 +krb5_cc_default.restype = krb5_error_code
 krb5_cc_default.errcheck = krb5_errcheck
 krb5_cc_close = LIBKRB5.krb5_cc_close
 krb5_cc_close.argtypes = (krb5_context, krb5_ccache, )
 -krb5_cc_close.restype = krb5_error
 +krb5_cc_close.restype = krb5_error_code
 krb5_cc_close.errcheck = krb5_errcheck
 krb5_parse_name = LIBKRB5.krb5_parse_name
 krb5_parse_name.argtypes = (krb5_context, ctypes.c_char_p,
                             ctypes.POINTER(krb5_principal), )
 -krb5_parse_name.restype = krb5_error
 +krb5_parse_name.restype = krb5_error_code
 krb5_parse_name.errcheck = krb5_errcheck
 krb5_cc_set_config = LIBKRB5.krb5_cc_set_config
 krb5_cc_set_config.argtypes = (krb5_context, krb5_ccache, krb5_principal,
                                ctypes.c_char_p, krb5_data_p, )
 -krb5_cc_set_config.restype = krb5_error
 +krb5_cc_set_config.restype = krb5_error_code
 krb5_cc_set_config.errcheck = krb5_errcheck
 krb5_cc_get_principal = LIBKRB5.krb5_cc_get_principal
 krb5_cc_get_principal.argtypes = (krb5_context, krb5_ccache,
                                   ctypes.POINTER(krb5_principal), )
 -krb5_cc_get_principal.restype = krb5_error
 +krb5_cc_get_principal.restype = krb5_error_code
 krb5_cc_get_principal.errcheck = krb5_errcheck
 # krb5_build_principal is a variadic function but that can't be expressed
@@ -177,26 +176,26 @@ krb5_build_principal.argtypes = (krb5_context, ctypes.POINTER(krb5_principal),
                                  ctypes.c_uint, ctypes.c_char_p,
                                  ctypes.c_char_p, ctypes.c_char_p,
                                  ctypes.c_char_p, ctypes.c_char_p, )
 -krb5_build_principal.restype = krb5_error
 +krb5_build_principal.restype = krb5_error_code
 krb5_build_principal.errcheck = krb5_errcheck
 krb5_cc_start_seq_get = LIBKRB5.krb5_cc_start_seq_get
 krb5_cc_start_seq_get.argtypes = (krb5_context, krb5_ccache,
                                   ctypes.POINTER(krb5_cc_cursor), )
 -krb5_cc_start_seq_get.restype = krb5_error
 +krb5_cc_start_seq_get.restype = krb5_error_code
 krb5_cc_start_seq_get.errcheck = krb5_errcheck
 krb5_cc_next_cred = LIBKRB5.krb5_cc_next_cred
 krb5_cc_next_cred.argtypes = (krb5_context, krb5_ccache,
                               ctypes.POINTER(krb5_cc_cursor),
                               ctypes.POINTER(krb5_creds), )
 -krb5_cc_next_cred.restype = krb5_error
 +krb5_cc_next_cred.restype = krb5_error_code
 krb5_cc_next_cred.errcheck = krb5_errcheck
 krb5_cc_end_seq_get = LIBKRB5.krb5_cc_end_seq_get
 krb5_cc_end_seq_get.argtypes = (krb5_context, krb5_ccache,
                                 ctypes.POINTER(krb5_cc_cursor), )
 -krb5_cc_end_seq_get.restype = krb5_error
 +krb5_cc_end_seq_get.restype = krb5_error_code
 krb5_cc_end_seq_get.errcheck = krb5_errcheck
 krb5_free_cred_contents = LIBKRB5.krb5_free_cred_contents
@@ -212,7 +211,7 @@ krb5_principal_compare.restype = krb5_boolean
 krb5_unparse_name = LIBKRB5.krb5_unparse_name
 krb5_unparse_name.argtypes = (krb5_context, krb5_principal,
                               ctypes.POINTER(ctypes.c_char_p), )
 -krb5_unparse_name.restype = krb5_error
 +krb5_unparse_name.restype = krb5_error_code
 krb5_unparse_name.errcheck = krb5_errcheck
 krb5_free_unparsed_name = LIBKRB5.krb5_free_unparsed_name
 From 2a4bad8bb3295c5c0f5a760ecd41871c4c5a0c56 Mon Sep 17 00:00:00 2001
 From: Stanislav Levin <slev@altlinux.org>
 Date: Jan 30 2024 15:11:05 +0000
 Subject: ipapython: Correct return type of krb5_free_cred_contents
 According to https://web.mit.edu/kerberos/krb5-latest/doc/appdev/refs/api/krb5_free_cred_contents.html
 > krb5_free_cred_contents - Free the contents of a krb5_creds structure.
 >
 > void krb5_free_cred_contents(krb5_context context, krb5_creds * val)
 > param:
 > [in] context - Library context
 >
 > [in] val - Credential structure to free contents of
 >
 > This function frees the contents of val , but not the structure itself.
 https://github.com/krb5/krb5/blob/5b00197227231943bd2305328c8260dd0b0dbcf0/src/lib/krb5/krb/kfree.c#L166
 This leads to undefined behavior and `krb5_free_cred_contents` can
 raise KRB5Error (because of garbage data) while actually its foreign
 function doesn't.
 Fixes: https://pagure.io/freeipa/issue/9519
 Signed-off-by: Stanislav Levin <slev@altlinux.org>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 diff --git a/ipapython/session_storage.py b/ipapython/session_storage.py
 index 371cf15..dc36f54 100644
 --- a/ipapython/session_storage.py
 +++ b/ipapython/session_storage.py
@@ -200,8 +200,7 @@ krb5_cc_end_seq_get.errcheck = krb5_errcheck
 krb5_free_cred_contents = LIBKRB5.krb5_free_cred_contents
 krb5_free_cred_contents.argtypes = (krb5_context, ctypes.POINTER(krb5_creds))
 -krb5_free_cred_contents.restype = krb5_error
 -krb5_free_cred_contents.errcheck = krb5_errcheck
 +krb5_free_cred_contents.restype = None
 krb5_principal_compare = LIBKRB5.krb5_principal_compare
 krb5_principal_compare.argtypes = (krb5_context, krb5_principal,
 From beb402afdbf32c01eed860e9416356f7b492ad74 Mon Sep 17 00:00:00 2001
 From: Stanislav Levin <slev@altlinux.org>
 Date: Jan 30 2024 15:11:05 +0000
 Subject: ipapython: Propagate KRB5Error exceptions on iterating ccache
 `ipapython.session_storage.get_data` iterates over
 credentials in a credential cache till `krb5_cc_next_cred` returns
 an error. This function doesn't expect any error on calling
 other kerberos foreign functions during iteration. But that can
 actually happen and KRB5Error exceptions stop an iteration while
 they should be propagated.
 With this change iteration will exactly stop on `krb5_cc_next_cred`
 error as it was supposed to be.
 Fixes: https://pagure.io/freeipa/issue/9519
 Signed-off-by: Stanislav Levin <slev@altlinux.org>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 diff --git a/ipapython/session_storage.py b/ipapython/session_storage.py
 index dc36f54..e890dc9 100644
 --- a/ipapython/session_storage.py
 +++ b/ipapython/session_storage.py
@@ -312,8 +312,12 @@ def get_data(princ_name, key):
                 checkcreds = krb5_creds()
                 # the next function will throw an error and break out of the
                 # while loop when we try to access past the last cred
 -                krb5_cc_next_cred(context, ccache, ctypes.byref(cursor),
 -                                  ctypes.byref(checkcreds))
 +                try:
 +                    krb5_cc_next_cred(context, ccache, ctypes.byref(cursor),
 +                                      ctypes.byref(checkcreds))
 +                except KRB5Error:
 +                    break
 +
                 if (krb5_principal_compare(context, principal,
                                           checkcreds.client) == 1 and
                     krb5_principal_compare(context, srv_princ,
@@ -328,8 +332,6 @@ def get_data(princ_name, key):
                 else:
                     krb5_free_cred_contents(context,
                                             ctypes.byref(checkcreds))
 -        except KRB5Error:
 -            pass
         finally:
             krb5_cc_end_seq_get(context, ccache, ctypes.byref(cursor))
--- a/SOURCES/0012-Do-not-ignore-staged-users-in-sidgen-plugin_rhel#23626.patch
+++ b/SOURCES/0012-Do-not-ignore-staged-users-in-sidgen-plugin_rhel#23626.patch
@ -1,109 +0,0 @@
 From b56a80581ef388e19d5761020454e51463036cd6 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Tue, 23 Jan 2024 14:47:50 +0200
 Subject: [PATCH] sidgen: ignore staged users when generating SIDs
 Staged users have
  uidNumber: -1
  gidNumber: -1
  ipaUniqueID: autogenerate
 We cannot generate ipaSecurityIdentifier based on those UID/GID numbers.
 However, '-1' value will trigger an error
 find_sid_for_ldap_entry - [file ipa_sidgen_common.c, line 483]: ID value too large.
 And that, in turn, will cause stopping SID generation for all users.
 Detect 'ipaUniqueID: autogenerate' situation and ignore these entries.
 Fixes: https://pagure.io/freeipa/issue/9517
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>
 ---
 daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h    |  2 ++
 .../ipa-slapi-plugins/ipa-sidgen/ipa_sidgen_common.c | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h
 index 0feff7eec..bd46982d0 100644
 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h
 +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h
@@ -45,6 +45,8 @@
 #define UID_NUMBER "uidnumber"
 #define GID_NUMBER "gidnumber"
 #define IPA_SID "ipantsecurityidentifier"
 +#define IPA_UNIQUEID "ipauniqueid"
 +#define IPA_UNIQUEID_AUTOGENERATE "autogenerate"
 #define DOM_ATTRS_FILTER OBJECTCLASS"=ipantdomainattrs"
 #define DOMAIN_ID_RANGE_FILTER OBJECTCLASS"=ipadomainidrange"
 #define POSIX_ACCOUNT "posixaccount"
 diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen_common.c b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen_common.c
 index 6f784804c..cb763ebf8 100644
 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen_common.c
 +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen_common.c
@@ -454,6 +454,7 @@ int find_sid_for_ldap_entry(struct slapi_entry *entry,
     uint32_t id;
     char *sid = NULL;
     char **objectclasses = NULL;
 +    char *uniqueid = NULL;
     Slapi_PBlock *mod_pb = NULL;
     Slapi_Mods *smods = NULL;
     int result;
@@ -479,6 +480,16 @@ int find_sid_for_ldap_entry(struct slapi_entry *entry,
         goto done;
     }
 +    uniqueid = slapi_entry_attr_get_charptr(entry, IPA_UNIQUEID);
 +    if (uniqueid != NULL &&
 +        strncmp(IPA_UNIQUEID_AUTOGENERATE, uniqueid,
 +                sizeof(IPA_UNIQUEID_AUTOGENERATE)) == 0) {
 +        LOG("Staged entry [%s] does not have Posix IDs, nothing to do.\n",
 +            dn_str);
 +        ret = 0;
 +        goto done;
 +    }
 +
     if (uid_number >= UINT32_MAX || gid_number >= UINT32_MAX) {
         LOG_FATAL("ID value too large.\n");
         ret = LDAP_CONSTRAINT_VIOLATION;
@@ -554,6 +565,7 @@ int find_sid_for_ldap_entry(struct slapi_entry *entry,
     }
 done:
 +    slapi_ch_free_string(&uniqueid);
     slapi_ch_free_string(&sid);
     slapi_pblock_destroy(mod_pb);
     slapi_mods_free(&smods);
 -- 
 2.43.0
 From 07150b71537744f491d022c737ef04775c72a10a Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Tue, 23 Jan 2024 14:53:39 +0200
 Subject: [PATCH] sidgen: fix missing prototypes
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>
 ---
 daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h
 index bd46982d0..aec862796 100644
 --- a/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h
 +++ b/daemons/ipa-slapi-plugins/ipa-sidgen/ipa_sidgen.h
@@ -106,3 +106,6 @@ int find_sid_for_ldap_entry(struct slapi_entry *entry,
                             const char *base_dn,
                             const char *dom_sid,
                             struct range_info **ranges);
 +
 +int sidgen_task_init(Slapi_PBlock *pb);
 +int ipa_sidgen_init(Slapi_PBlock *pb);
 -- 
 2.43.0
--- a/SOURCES/0013-ipa-kdb-Disable-Bronze-Bit-check-if-PAC-not-available_rhel#22313.patch
+++ b/SOURCES/0013-ipa-kdb-Disable-Bronze-Bit-check-if-PAC-not-available_rhel#22313.patch
@ -1,310 +0,0 @@
 From 67ca47ba4092811029eec02f8af9c34ba7662924 Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Mon, 9 Oct 2023 15:47:03 +0200
 Subject: [PATCH] ipa-kdb: Ensure Bronze-Bit check can be enabled
 MIT krb5 1.19 and older do not implement support for PAC ticket
 signature to protect the encrypted part of tickets. This is the cause of
 the Bronze-Bit vulnerability (CVE-2020-17043). The Bronze-Bit attack
 detection mechanism introduced in a847e248 relies on the content of the
 PAC.
 However, since CVE-2022-37967, the content of the PAC can no longer be
 trusted if the KDC does not support PAC extended KDC signature (aka.
 PAC full checksum). This signature is supported in MIT krb5 since
 version 1.21.
 Support for the PAC extended KDC signature was backported downstream to
 krb5 1.18.2 for CentOS 8 Stream (dist-git commit 7d215a54). This makes
 the content of the PAC still trustworthy there.
 This commit disables the Bronze-Bit attack detection mechanism at build
 time in case krb5 does not provide the krb5_pac_full_sign_compat()
 function.
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 daemons/ipa-kdb/ipa_kdb.h           | 4 ++++
 daemons/ipa-kdb/ipa_kdb_kdcpolicy.c | 7 +++++++
 daemons/ipa-kdb/ipa_kdb_mspac.c     | 4 ++++
 3 files changed, 15 insertions(+)
 diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h
 index 02b2cb631..c6926f7d5 100644
 --- a/daemons/ipa-kdb/ipa_kdb.h
 +++ b/daemons/ipa-kdb/ipa_kdb.h
@@ -367,6 +367,8 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
                                                   const char *test_realm, size_t size,
                                                   char **trusted_realm);
 +#if KRB5_KDB_DAL_MAJOR_VERSION <= 8
 +#  ifdef HAVE_KRB5_PAC_FULL_SIGN_COMPAT
 /* Try to detect a Bronze-Bit attack based on the content of the request and
  * data from the KDB.
  *
@@ -379,6 +381,8 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
 krb5_error_code
 ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
                                   bool *detected, const char **status);
 +#  endif
 +#endif
 /* DELEGATION CHECKS */
 diff --git a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 index 1032dff0b..ee0546c01 100644
 --- a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 +++ b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
@@ -185,11 +185,18 @@ ipa_kdcpolicy_check_tgs(krb5_context context, krb5_kdcpolicy_moddata moddata,
                         const char **status, krb5_deltat *lifetime_out,
                         krb5_deltat *renew_lifetime_out)
 {
 +#if KRB5_KDB_DAL_MAJOR_VERSION <= 8
 +#  ifdef HAVE_KRB5_PAC_FULL_SIGN_COMPAT
     krb5_error_code kerr;
     kerr = ipadb_check_for_bronze_bit_attack(context, request, NULL, status);
     if (kerr)
         return KRB5KDC_ERR_POLICY;
 +#  else
 +#    warning Support for Kerberos PAC extended KDC signature is missing.\
 +             This makes FreeIPA vulnerable to the Bronze-Bit exploit (CVE-2020-17049).
 +#  endif
 +#endif
     *status = NULL;
     *lifetime_out = 0;
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index b4e22d431..05d5b407d 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -3299,6 +3299,8 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
 	return KRB5_KDB_NOENTRY;
 }
 +#if KRB5_KDB_DAL_MAJOR_VERSION <= 8
 +#  ifdef HAVE_KRB5_PAC_FULL_SIGN_COMPAT
 krb5_error_code
 ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
                                   bool *detected, const char **status)
@@ -3471,3 +3473,5 @@ end:
     ipadb_free_principal(context, proxy_entry);
     return kerr;
 }
 +#  endif
 +#endif
 -- 
 2.43.0
 From 27b96c17dd51d076e04d97662b7c788658a5094a Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Jan 26 2024 09:35:57 +0000
 Subject: ipa-kdb: Disable Bronze-Bit check if PAC not available
 The Bronze-Bit check introduced in commit
 a847e2483b4c4832ee5129901da169f4eb0d1392 requires the MS-PAC to be
 present in the evidence ticket in order for S4U2Proxy requests to be
 accepted. This actually requires SIDs to be set.
 However, domains that were initialized before commit
 e527857d000e558b3288a7a210400abaf2171237 may still not have SIDs
 configured. This would results in all S4U2Proxy requests to fail
 (including all the HTTP API requests).
 This present commit disables the check for the Bronze-Bit exploit
 (CVE-2020-17049) in case the domain is not able to generate PACs.
 Instead, it prints a warning message in the KDC logs each time a
 S4U2Proxy request is processed.
 Fixes: https://pagure.io/freeipa/issue/9521
 Signed-off-by: Julien Rische <jrische@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h
 index c6926f7..621c235 100644
 --- a/daemons/ipa-kdb/ipa_kdb.h
 +++ b/daemons/ipa-kdb/ipa_kdb.h
@@ -370,17 +370,21 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
 #if KRB5_KDB_DAL_MAJOR_VERSION <= 8
 #  ifdef HAVE_KRB5_PAC_FULL_SIGN_COMPAT
 /* Try to detect a Bronze-Bit attack based on the content of the request and
 - * data from the KDB.
 + * data from the KDB. This check will work only if the domain supports MS-PAC.
  *
  *   context     krb5 context
  *   request     KDB request
 - *   detected    Set to "true" if a bronze bit attack is detected and the
 - *               pointer is not NULL. Remains unset otherwise.
 + *   supported   If not NULL, set to "false" in case the Bronze-Bit exploit
 + *               detection process silently failed to complete because the
 + *               domain does not meet requirements. Set to "true" otherwise.
 + *   detected    If not NULL, set to "true" if a Bronze-Bit attack is detected.
 + *               Set to "false" otherwise.
  *   status      If the call fails and the pointer is not NULL, set it with a
  *               message describing the cause of the failure. */
 krb5_error_code
 ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
 -                                  bool *detected, const char **status);
 +                                  bool *supported, bool *detected,
 +                                  const char **status);
 #  endif
 #endif
 diff --git a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 index ee0546c..713e9a0 100644
 --- a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 +++ b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
@@ -188,10 +188,18 @@ ipa_kdcpolicy_check_tgs(krb5_context context, krb5_kdcpolicy_moddata moddata,
 #if KRB5_KDB_DAL_MAJOR_VERSION <= 8
 #  ifdef HAVE_KRB5_PAC_FULL_SIGN_COMPAT
     krb5_error_code kerr;
 +    bool supported;
 -    kerr = ipadb_check_for_bronze_bit_attack(context, request, NULL, status);
 +    kerr = ipadb_check_for_bronze_bit_attack(context, request, supported, NULL,
 +                                             status);
     if (kerr)
         return KRB5KDC_ERR_POLICY;
 +
 +    if (!supported)
 +        krb5_klog_syslog(LOG_WARNING, "MS-PAC not available. This makes "
 +                         "FreeIPA vulnerable to the Bronze-Bit exploit "
 +                         "(CVE-2020-17049). Please generate SIDs to enable "
 +                         "PAC support.");
 #  else
 #    warning Support for Kerberos PAC extended KDC signature is missing.\
              This makes FreeIPA vulnerable to the Bronze-Bit exploit (CVE-2020-17049).
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index 05d5b40..a18beff 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -3303,11 +3303,14 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
 #  ifdef HAVE_KRB5_PAC_FULL_SIGN_COMPAT
 krb5_error_code
 ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
 -                                  bool *detected, const char **status)
 +                                  bool *supported, bool *detected,
 +                                  const char **status)
 {
     krb5_error_code kerr;
     const char *st = NULL;
     size_t i, j;
 +    bool in_supported = true, in_detected = false;
 +    struct ipadb_context *ipactx;
     krb5_ticket *evidence_tkt;
     krb5_authdata **authdata, **ifrel = NULL;
     krb5_pac pac = NULL;
@@ -3327,6 +3330,21 @@ ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
         goto end;
     }
 +    ipactx = ipadb_get_context(context);
 +    if (!ipactx) {
 +        kerr = KRB5_KDB_DBNOTINITED;
 +        goto end;
 +    }
 +
 +    /* Handle the case where the domain is not able to generate PACs (probably
 +     * because SIDs are not set). In this case, we just skip the Bronze-Bit
 +     * check. */
 +    if (!ipactx->mspac) {
 +        in_supported = false;
 +        kerr = 0;
 +        goto end;
 +    }
 +
     evidence_tkt = request->second_ticket[0];
     /* No need to check the Forwardable flag. If it was not set, this request
@@ -3451,8 +3469,7 @@ ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
             /* This evidence ticket cannot be forwardable given the privileges
              * of the proxy principal.
              * This is a Bronze Bit attack. */
 -            if (detected)
 -                *detected = true;
 +            in_detected = true;
             st = "S4U2PROXY_BRONZE_BIT_ATTACK_DETECTED";
             kerr = EBADE;
             goto end;
@@ -3464,6 +3481,10 @@ ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
 end:
     if (st && status)
         *status = st;
 +    if (supported)
 +        *supported = in_supported;
 +    if (detected)
 +        *detected = in_detected;
     krb5_free_authdata(context, ifrel);
     krb5_pac_free(context, pac);
 From 81aa6ef695838a4b2fb5a53e773ea379a492913d Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Fri, 9 Feb 2024 16:36:03 +0100
 Subject: [PATCH] ipd-kdb: Fix some mistakes in
 ipadb_check_for_bronze_bit_attack()
 Fixes: https://pagure.io/freeipa/issue/9521
 Signed-off-by: Julien Rische <jrische@redhat.com>
 Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
 ---
 daemons/ipa-kdb/ipa_kdb.h           | 3 ++-
 daemons/ipa-kdb/ipa_kdb_kdcpolicy.c | 2 +-
 daemons/ipa-kdb/ipa_kdb_mspac.c     | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h
 index 621c23591..5de5ea7a5 100644
 --- a/daemons/ipa-kdb/ipa_kdb.h
 +++ b/daemons/ipa-kdb/ipa_kdb.h
@@ -382,7 +382,8 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
  *   status      If the call fails and the pointer is not NULL, set it with a
  *               message describing the cause of the failure. */
 krb5_error_code
 -ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
 +ipadb_check_for_bronze_bit_attack(krb5_context context,
 +                                  const krb5_kdc_req *request,
                                   bool *supported, bool *detected,
                                   const char **status);
 #  endif
 diff --git a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 index 713e9a0c8..44959f3de 100644
 --- a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 +++ b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
@@ -190,7 +190,7 @@ ipa_kdcpolicy_check_tgs(krb5_context context, krb5_kdcpolicy_moddata moddata,
     krb5_error_code kerr;
     bool supported;
 -    kerr = ipadb_check_for_bronze_bit_attack(context, request, supported, NULL,
 +    kerr = ipadb_check_for_bronze_bit_attack(context, request, &supported, NULL,
                                              status);
     if (kerr)
         return KRB5KDC_ERR_POLICY;
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index 80350364a..886ed7785 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -3308,13 +3308,14 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
 #if KRB5_KDB_DAL_MAJOR_VERSION <= 8
 #  ifdef HAVE_KRB5_PAC_FULL_SIGN_COMPAT
 krb5_error_code
 -ipadb_check_for_bronze_bit_attack(krb5_context context, krb5_kdc_req *request,
 +ipadb_check_for_bronze_bit_attack(krb5_context context,
 +                                  const krb5_kdc_req *request,
                                   bool *supported, bool *detected,
                                   const char **status)
 {
     krb5_error_code kerr;
     const char *st = NULL;
 -    size_t i, j;
 +    size_t i, j = 0;
     bool in_supported = true, in_detected = false;
     struct ipadb_context *ipactx;
     krb5_ticket *evidence_tkt;
 -- 
 2.43.0
--- a/SOURCES/0014-krb5kdc-Fix-start-when-pkinit-and-otp-auth-type-are-enabled_rhel#4874.patch
+++ b/SOURCES/0014-krb5kdc-Fix-start-when-pkinit-and-otp-auth-type-are-enabled_rhel#4874.patch
@ -1,272 +0,0 @@
 From 00f8ddbfd2795228b343e1c39c1944b44d482c18 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Fri, 24 Nov 2023 11:46:19 +0200
 Subject: [PATCH 1/4] ipa-kdb: add better detection of allowed user auth type
 If default user authentication type is set to a list that does not
 include a password or a hardened credential, the resulting configuration
 might be incorrect for special service principals, including a krbtgt/..
 one.
 Add detection of special principals to avoid these situations and always
 allow password or hardened for services.
 Special handling is needed for the following principals:
 - krbtgt/..       -- TGT service principals
 - K/M             -- master key principal
 - kadmin/changepw -- service for changing passwords
 - kadmin/kadmin   -- kadmin service principal
 - kadmin/history  -- key used to encrypt history
 Additionally, implicitly allow password or hardened credential use for
 IPA services and IPA hosts since applications typically use keytabs for
 that purpose.
 Fixes: https://pagure.io/freeipa/issue/9485
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Francisco Trivino <ftrivino@redhat.com>
 ---
 daemons/ipa-kdb/ipa_kdb.c | 62 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 8 deletions(-)
 diff --git a/daemons/ipa-kdb/ipa_kdb.c b/daemons/ipa-kdb/ipa_kdb.c
 index 06d511c76..dbb98dba6 100644
 --- a/daemons/ipa-kdb/ipa_kdb.c
 +++ b/daemons/ipa-kdb/ipa_kdb.c
@@ -26,6 +26,7 @@
 #include "ipa_kdb.h"
 #include "ipa_krb5.h"
 #include "ipa_hostname.h"
 +#include <kadm5/admin.h>
 #define IPADB_GLOBAL_CONFIG_CACHE_TIME 60
@@ -207,6 +208,19 @@ static const struct {
     { "idp", IPADB_USER_AUTH_IDP },
     { "passkey", IPADB_USER_AUTH_PASSKEY },
     { }
 +},
 +  objclass_table[] = {
 +    { "ipaservice", IPADB_USER_AUTH_PASSWORD },
 +    { "ipahost", IPADB_USER_AUTH_PASSWORD },
 +    { }
 +},
 +  princname_table[] = {
 +    { KRB5_TGS_NAME, IPADB_USER_AUTH_PASSWORD },
 +    { KRB5_KDB_M_NAME, IPADB_USER_AUTH_PASSWORD },
 +    { KADM5_ADMIN_SERVICE, IPADB_USER_AUTH_PASSWORD },
 +    { KADM5_CHANGEPW_SERVICE, IPADB_USER_AUTH_PASSWORD },
 +    { KADM5_HIST_PRINCIPAL, IPADB_USER_AUTH_PASSWORD },
 +    { }
 };
 void ipadb_parse_user_auth(LDAP *lcontext, LDAPMessage *le,
@@ -217,17 +231,49 @@ void ipadb_parse_user_auth(LDAP *lcontext, LDAPMessage *le,
     *userauth = IPADB_USER_AUTH_NONE;
     vals = ldap_get_values_len(lcontext, le, IPA_USER_AUTH_TYPE);
 -    if (!vals)
 -        return;
 -
 -    for (i = 0; vals[i]; i++) {
 -        for (j = 0; userauth_table[j].name; j++) {
 -            if (strcasecmp(vals[i]->bv_val, userauth_table[j].name) == 0) {
 -                *userauth |= userauth_table[j].flag;
 -                break;
 +    if (!vals) {
 +        /* if there is no explicit ipaUserAuthType set, use objectclass */
 +        vals = ldap_get_values_len(lcontext, le, "objectclass");
 +        if (!vals)
 +            return;
 +
 +        for (i = 0; vals[i]; i++) {
 +            for (j = 0; objclass_table[j].name; j++) {
 +                if (strcasecmp(vals[i]->bv_val, objclass_table[j].name) == 0) {
 +                    *userauth |= objclass_table[j].flag;
 +                    break;
 +                }
 +            }
 +        }
 +    } else {
 +        for (i = 0; vals[i]; i++) {
 +            for (j = 0; userauth_table[j].name; j++) {
 +                if (strcasecmp(vals[i]->bv_val, userauth_table[j].name) == 0) {
 +                    *userauth |= userauth_table[j].flag;
 +                    break;
 +                }
             }
         }
     }
 +
 +    /* If neither ipaUserAuthType nor objectClass were definitive,
 +     * check the krbPrincipalName to see if it is krbtgt/ or K/M one */
 +    if (*userauth == IPADB_USER_AUTH_NONE) {
 +        ldap_value_free_len(vals);
 +        vals = ldap_get_values_len(lcontext, le, "krbprincipalname");
 +        if (!vals)
 +            return;
 +        for (i = 0; vals[i]; i++) {
 +            for (j = 0; princname_table[j].name; j++) {
 +                if (strncmp(vals[i]->bv_val, princname_table[j].name,
 +                            strlen(princname_table[j].name)) == 0) {
 +                    *userauth |= princname_table[j].flag;
 +                    break;
 +                }
 +            }
 +        }
 +
 +    }
     /* If password auth is enabled, enable hardened policy too. */
     if (*userauth & IPADB_USER_AUTH_PASSWORD) {
         *userauth |= IPADB_USER_AUTH_HARDENED;
 -- 
 2.43.0
 From 69ae9febfb4462766b3bfe3e07e76550ece97b42 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Fri, 24 Nov 2023 11:54:04 +0200
 Subject: [PATCH 2/4] ipa-kdb: when applying ticket policy, do not deny PKINIT
 PKINIT differs from other pre-authentication methods by the fact that it
 can be matched indepedently of the user authentication types via certmap
 plugin in KDC.
 Since PKINIT is a strong authentication method, allow its authentication
 indicator and only apply the ticket policy.
 Fixes: https://pagure.io/freeipa/issue/9485
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Francisco Trivino <ftrivino@redhat.com>
 ---
 daemons/ipa-kdb/ipa_kdb_kdcpolicy.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
 diff --git a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 index 436ee0e62..2802221c7 100644
 --- a/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
 +++ b/daemons/ipa-kdb/ipa_kdb_kdcpolicy.c
@@ -119,11 +119,8 @@ ipa_kdcpolicy_check_as(krb5_context context, krb5_kdcpolicy_moddata moddata,
             pol_limits = &(ied->pol_limits[IPADB_USER_AUTH_IDX_RADIUS]);
         } else if (strcmp(auth_indicator, "pkinit") == 0) {
             valid_auth_indicators++;
 -            if (!(ua & IPADB_USER_AUTH_PKINIT)) {
 -                *status = "PKINIT pre-authentication not allowed for this user.";
 -                kerr = KRB5KDC_ERR_POLICY;
 -                goto done;
 -            }
 +            /* allow PKINIT unconditionally -- it has passed already at this
 +             * point so some certificate was useful, only apply the limits */
             pol_limits = &(ied->pol_limits[IPADB_USER_AUTH_IDX_PKINIT]);
         } else if (strcmp(auth_indicator, "hardened") == 0) {
             valid_auth_indicators++;
 -- 
 2.43.0
 From 62c44c9e69aa2721990ca3628434713e1af6f59b Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Fri, 24 Nov 2023 12:20:55 +0200
 Subject: [PATCH 3/4] ipa-kdb: clarify user auth table mapping use of
 _AUTH_PASSWORD
 Related: https://pagure.io/freeipa/issue/9485
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Francisco Trivino <ftrivino@redhat.com>
 ---
 daemons/ipa-kdb/ipa_kdb.c | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/daemons/ipa-kdb/ipa_kdb.c b/daemons/ipa-kdb/ipa_kdb.c
 index dbb98dba6..4e6cacf24 100644
 --- a/daemons/ipa-kdb/ipa_kdb.c
 +++ b/daemons/ipa-kdb/ipa_kdb.c
@@ -195,6 +195,9 @@ done:
     return base;
 }
 +/* In this table all _AUTH_PASSWORD entries will be
 + * expanded to include _AUTH_HARDENED in ipadb_parse_user_auth()
 + * which means there is no need to explicitly add it here */
 static const struct {
     const char *name;
     enum ipadb_user_auth flag;
 -- 
 2.43.0
 From c3bc938650b19a51706d8ccd98cdf8deaa26dc28 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Fri, 24 Nov 2023 13:00:48 +0200
 Subject: [PATCH 4/4] ipatests: make sure PKINIT enrollment works with a strict
 policy
 Previously, for a global policy which does not include
 'password', krb5kdc restart was failing. Now it should succeed.
 We set admin user authentication type to PASSWORD to simplify
 configuration in the test.
 What matters here is that global policy does not include PKINIT and that
 means a code in the ticket policy check will allow PKINIT implicitly
 rather than explicitly.
 Related: https://pagure.io/freeipa/issue/9485
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Francisco Trivino <ftrivino@redhat.com>
 ---
 .../test_integration/test_pkinit_install.py   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 diff --git a/ipatests/test_integration/test_pkinit_install.py b/ipatests/test_integration/test_pkinit_install.py
 index caa0e6a34..5c2e7af02 100644
 --- a/ipatests/test_integration/test_pkinit_install.py
 +++ b/ipatests/test_integration/test_pkinit_install.py
@@ -23,6 +23,24 @@ class TestPkinitClientInstall(IntegrationTest):
     def install(cls, mh):
         tasks.install_master(cls.master)
 +    def enforce_password_and_otp(self):
 +        """enforce otp by default and password for admin """
 +        self.master.run_command(
 +            [
 +                "ipa",
 +                "config-mod",
 +                "--user-auth-type=otp",
 +            ]
 +        )
 +        self.master.run_command(
 +            [
 +                "ipa",
 +                "user-mod",
 +                "admin",
 +                "--user-auth-type=password",
 +            ]
 +        )
 +
     def add_certmaperule(self):
         """add certmap rule to map SAN dNSName to host entry"""
         self.master.run_command(
@@ -86,6 +104,14 @@ class TestPkinitClientInstall(IntegrationTest):
         cabundle = self.master.get_file_contents(paths.KDC_CA_BUNDLE_PEM)
         client.put_file_contents(self.tmpbundle, cabundle)
 +    def test_restart_krb5kdc(self):
 +        tasks.kinit_admin(self.master)
 +        self.enforce_password_and_otp()
 +        self.master.run_command(['systemctl', 'stop', 'krb5kdc.service'])
 +        self.master.run_command(['systemctl', 'start', 'krb5kdc.service'])
 +        self.master.run_command(['systemctl', 'stop', 'kadmin.service'])
 +        self.master.run_command(['systemctl', 'start', 'kadmin.service'])
 +
     def test_client_install_pkinit(self):
         tasks.kinit_admin(self.master)
         self.add_certmaperule()
 -- 
 2.43.0
--- a/SOURCES/0015-hbactest-was-not-collecting-or-returning-messages_rhel#12780.patch
+++ b/SOURCES/0015-hbactest-was-not-collecting-or-returning-messages_rhel#12780.patch
@ -1,139 +0,0 @@
 From 48846e98e5e988d600ddf81c937f353fcecdea1a Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Mon, 27 Nov 2023 16:11:08 -0500
 Subject: [PATCH 1/2] hbactest was not collecting or returning messages
 hbactest does a number of internal searches, one of which
 can exceed the configured sizelimit: hbacrule-find
 Collect any messages returned from thsi call and display them
 to the user on the cli.
 Fixes: https://pagure.io/freeipa/issue/9486
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 ipaclient/plugins/hbactest.py |  2 ++
 ipaserver/plugins/hbactest.py | 14 +++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 diff --git a/ipaclient/plugins/hbactest.py b/ipaclient/plugins/hbactest.py
 index 1b54530b2..e0f93b9c2 100644
 --- a/ipaclient/plugins/hbactest.py
 +++ b/ipaclient/plugins/hbactest.py
@@ -38,6 +38,8 @@ class hbactest(CommandOverride):
         # Note that we don't actually use --detail below to see if details need
         # to be printed as our execute() method will return None for corresponding
         # entries and None entries will be skipped.
 +        self.log_messages(output)
 +
         for o in self.output:
             if o == 'value':
                 continue
 diff --git a/ipaserver/plugins/hbactest.py b/ipaserver/plugins/hbactest.py
 index 887a35b7e..568c13174 100644
 --- a/ipaserver/plugins/hbactest.py
 +++ b/ipaserver/plugins/hbactest.py
@@ -24,6 +24,8 @@ from ipalib import Command, Str, Flag, Int
 from ipalib import _
 from ipapython.dn import DN
 from ipalib.plugable import Registry
 +from ipalib.messages import VersionMissing
 +
 if api.env.in_server:
     try:
         import ipaserver.dcerpc
@@ -323,6 +325,9 @@ class hbactest(Command):
         # 2. Required options are (user, target host, service)
         # 3. Options: rules to test (--rules, --enabled, --disabled), request for detail output
         rules = []
 +        result = {
 +            'warning':None, 'matched':None, 'notmatched':None, 'error':None
 +        }
         # Use all enabled IPA rules by default
         all_enabled = True
@@ -351,8 +356,12 @@ class hbactest(Command):
         hbacset = []
         if len(testrules) == 0:
 -            hbacset = self.api.Command.hbacrule_find(
 -                sizelimit=sizelimit, no_members=False)['result']
 +            hbacrules = self.api.Command.hbacrule_find(
 +                sizelimit=sizelimit, no_members=False)
 +            hbacset = hbacrules['result']
 +            for message in hbacrules['messages']:
 +                if message['code'] != VersionMissing.errno:
 +                    result.setdefault('messages', []).append(message)
         else:
             for rule in testrules:
                 try:
@@ -469,7 +478,6 @@ class hbactest(Command):
         error_rules = []
         warning_rules = []
 -        result = {'warning':None, 'matched':None, 'notmatched':None, 'error':None}
         if not options['nodetail']:
             # Validate runs rules one-by-one and reports failed ones
             for ipa_rule in rules:
 -- 
 2.43.0
 From d1e09c68af8ac77f656dd639af5d9a7f07c41f9d Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Tue, 28 Nov 2023 13:35:13 -0500
 Subject: [PATCH 2/2] ipatests: Verify that hbactest will return messages
 Limit the sizelimit of the hbactest request to confirm that
 the output includes a SearchResultTruncated message.
 Fixes: https://pagure.io/freeipa/issue/9486
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 ipatests/test_xmlrpc/test_hbactest_plugin.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
 diff --git a/ipatests/test_xmlrpc/test_hbactest_plugin.py b/ipatests/test_xmlrpc/test_hbactest_plugin.py
 index 73c4ce232..e2e66c759 100644
 --- a/ipatests/test_xmlrpc/test_hbactest_plugin.py
 +++ b/ipatests/test_xmlrpc/test_hbactest_plugin.py
@@ -134,6 +134,7 @@ class test_hbactest(XMLRPC_test):
         assert ret['value']
         assert ret['error'] is None
         assert ret['matched'] is None
 +        assert 'messages' not in ret
         assert ret['notmatched'] is None
     def test_c_hbactest_check_rules_enabled_detail(self):
@@ -200,7 +201,23 @@ class test_hbactest(XMLRPC_test):
                 nodetail=True
             )
 -    def test_g_hbactest_clear_testing_data(self):
 +    def test_g_hbactest_searchlimit_message(self):
 +        """
 +        Test running 'ipa hbactest' with limited --sizelimit
 +
 +        We know there are at least 6 rules, 4 created here + 2 default.
 +        """
 +        ret = api.Command['hbactest'](
 +            user=self.test_user,
 +            targethost=self.test_host,
 +            service=self.test_service,
 +            nodetail=True,
 +            sizelimit=2,
 +        )
 +
 +        assert ret['messages'] is not None
 +
 +    def test_h_hbactest_clear_testing_data(self):
         """
         Clear data for HBAC test plugin testing.
         """
 -- 
 2.43.0
--- a/SOURCES/0016-ipatests-wait-for-replica-update-in-test_dns_locatio.patch
+++ b/SOURCES/0016-ipatests-wait-for-replica-update-in-test_dns_locatio.patch
@ -1,43 +0,0 @@
 From 16a739e0260f97705827f972d53c828809dbfdb2 Mon Sep 17 00:00:00 2001
 From: Masahiro Matsuya <mmatsuya@redhat.com>
 Date: Tue, 9 Jan 2024 23:12:11 +0900
 Subject: [PATCH] ipatests: wait for replica update in test_dns_locations
 test_ipa_ca_records and test_adtrust_system_records can fail with
 NXDOMAIN, because it doesn't wait enough for the update on replica.
 It can be resolved by waiting for the update with wait_for_replication.
 Fixes: https://pagure.io/freeipa/issue/9504
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 (cherry picked from commit 905a55a4ef926068630ebd2ab375f58c24dedcd1)
 ---
 ipatests/test_integration/test_dns_locations.py | 6 ++++++
 1 file changed, 6 insertions(+)
 diff --git a/ipatests/test_integration/test_dns_locations.py b/ipatests/test_integration/test_dns_locations.py
 index 44900af80..89a310892 100644
 --- a/ipatests/test_integration/test_dns_locations.py
 +++ b/ipatests/test_integration/test_dns_locations.py
@@ -534,6 +534,9 @@ class TestDNSLocations(IntegrationTest):
         expected_servers = (self.master.ip, self.replicas[1].ip)
 +        ldap = self.master.ldap_connect()
 +        tasks.wait_for_replication(ldap)
 +
         for ip in (self.master.ip, self.replicas[0].ip, self.replicas[1].ip):
             self._test_A_rec_against_server(ip, self.domain, expected_servers)
@@ -557,6 +560,9 @@ class TestDNSLocations(IntegrationTest):
             (self.PRIO_HIGH, self.WEIGHT, DNSName(self.master.hostname)),
         )
 +        ldap = self.master.ldap_connect()
 +        tasks.wait_for_replication(ldap)
 +
         for ip in (self.master.ip, self.replicas[0].ip, self.replicas[1].ip):
             self._test_SRV_rec_against_server(
                     ip, self.domain, expected_servers,
 -- 
 2.43.0
--- a/SOURCES/0017-ipa-kdb-Rework-ipadb_reinit_mspac.patch
+++ b/SOURCES/0017-ipa-kdb-Rework-ipadb_reinit_mspac.patch
@ -1,707 +0,0 @@
 From c3ac69e9cf8dfcc31ed11fc988c37bd99d3ec3cf Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Wed, 14 Feb 2024 17:47:00 +0100
 Subject: [PATCH] ipa-kdb: Rework ipadb_reinit_mspac()
 Modify ipadb_reinit_mspac() to allocate and initialize ipactx->mspac
 only if all its attributes can be set. If not, ipactx->mspac is set to
 NULL. This makes easier to determine if the KDC is able to generate PACs
 or not.
 Also ipadb_reinit_mspac() is now able to return a status message
 explaining why initialization of the PAC generator failed. This message
 is printed in KDC logs.
 Fixes: https://pagure.io/freeipa/issue/9535
 Signed-off-by: Julien Rische <jrische@redhat.com>
 Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
 (cherry picked from commit 7f072e348d318e928f6270a182ca04dee8716677)
 ---
 daemons/ipa-kdb/ipa_kdb.c               |  14 +-
 daemons/ipa-kdb/ipa_kdb.h               |   4 +-
 daemons/ipa-kdb/ipa_kdb_mspac.c         | 340 +++++++++++++-----------
 daemons/ipa-kdb/ipa_kdb_mspac_private.h |   2 +-
 daemons/ipa-kdb/ipa_kdb_mspac_v6.c      |   5 +-
 daemons/ipa-kdb/ipa_kdb_mspac_v9.c      |  16 +-
 daemons/ipa-kdb/ipa_kdb_principals.c    |   6 +-
 7 files changed, 218 insertions(+), 169 deletions(-)
 diff --git a/daemons/ipa-kdb/ipa_kdb.c b/daemons/ipa-kdb/ipa_kdb.c
 index 0c6325df9..fcadb8ee7 100644
 --- a/daemons/ipa-kdb/ipa_kdb.c
 +++ b/daemons/ipa-kdb/ipa_kdb.c
@@ -443,6 +443,7 @@ int ipadb_get_connection(struct ipadb_context *ipactx)
     struct timeval tv = { 5, 0 };
     LDAPMessage *res = NULL;
     LDAPMessage *first;
 +    const char *stmsg;
     int ret;
     int v3;
@@ -522,16 +523,9 @@ int ipadb_get_connection(struct ipadb_context *ipactx)
     }
     /* get adtrust options using default refresh interval */
 -    ret = ipadb_reinit_mspac(ipactx, false);
 -    if (ret && ret != ENOENT) {
 -        /* TODO: log that there is an issue with adtrust settings */
 -        if (ipactx->lcontext == NULL) {
 -            /* for some reason ldap connection was reset in ipadb_reinit_mspac
 -             * and is no longer established => failure of ipadb_get_connection
 -             */
 -            goto done;
 -        }
 -    }
 +    ret = ipadb_reinit_mspac(ipactx, false, &stmsg);
 +    if (ret && stmsg)
 +        krb5_klog_syslog(LOG_WARNING, "MS-PAC generator: %s", stmsg);
     ret = 0;
 diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h
 index 5de5ea7a5..7baf4697f 100644
 --- a/daemons/ipa-kdb/ipa_kdb.h
 +++ b/daemons/ipa-kdb/ipa_kdb.h
@@ -352,7 +352,9 @@ krb5_error_code ipadb_v9_issue_pac(krb5_context context, unsigned int flags,
                                    krb5_data ***auth_indicators);
 #endif
 -krb5_error_code ipadb_reinit_mspac(struct ipadb_context *ipactx, bool force_reinit);
 +krb5_error_code ipadb_reinit_mspac(struct ipadb_context *ipactx,
 +                                   bool force_reinit,
 +                                   const char **stmsg);
 void ipadb_mspac_struct_free(struct ipadb_mspac **mspac);
 krb5_error_code ipadb_check_transited_realms(krb5_context kcontext,
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index 886ed7785..deed513b9 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -793,16 +793,16 @@ static krb5_error_code ipadb_fill_info3(struct ipadb_context *ipactx,
         return ret;
     }
 +    if (!ipactx->mspac) {
 +        /* can't give a PAC without server NetBIOS name or primary group RID */
 +        return ENOENT;
 +    }
 +
     if (info3->base.primary_gid == 0) {
         if (is_host || is_service) {
             info3->base.primary_gid = 515;  /* Well known RID for domain computers group */
         } else {
 -            if (ipactx->mspac->fallback_rid) {
 -                info3->base.primary_gid = ipactx->mspac->fallback_rid;
 -            } else {
 -                /* can't give a pack without a primary group rid */
 -                return ENOENT;
 -            }
 +            info3->base.primary_gid = ipactx->mspac->fallback_rid;
         }
     }
@@ -812,26 +812,16 @@ static krb5_error_code ipadb_fill_info3(struct ipadb_context *ipactx,
     /* always zero out, not used for Krb, only NTLM */
     memset(&info3->base.key, '\0', sizeof(info3->base.key));
 -    if (ipactx->mspac->flat_server_name) {
 -        info3->base.logon_server.string =
 -                    talloc_strdup(memctx, ipactx->mspac->flat_server_name);
 -        if (!info3->base.logon_server.string) {
 -            return ENOMEM;
 -        }
 -    } else {
 -        /* can't give a pack without Server NetBIOS Name :-| */
 -        return ENOENT;
 +    info3->base.logon_server.string =
 +        talloc_strdup(memctx, ipactx->mspac->flat_server_name);
 +    if (!info3->base.logon_server.string) {
 +        return ENOMEM;
     }
 -    if (ipactx->mspac->flat_domain_name) {
 -        info3->base.logon_domain.string =
 -                    talloc_strdup(memctx, ipactx->mspac->flat_domain_name);
 -        if (!info3->base.logon_domain.string) {
 -            return ENOMEM;
 -        }
 -    } else {
 -        /* can't give a pack without Domain NetBIOS Name :-| */
 -        return ENOENT;
 +    info3->base.logon_domain.string =
 +        talloc_strdup(memctx, ipactx->mspac->flat_domain_name);
 +    if (!info3->base.logon_domain.string) {
 +        return ENOMEM;
     }
     if (is_host || is_service) {
@@ -1044,6 +1034,11 @@ krb5_error_code ipadb_get_pac(krb5_context kcontext,
         return KRB5_KDB_DBNOTINITED;
     }
 +    /* Check if PAC generator is initialized */
 +    if (!ipactx->mspac) {
 +        return ENOENT;
 +    }
 +
     ied = (struct ipadb_e_data *)client->e_data;
     if (ied->magic != IPA_E_DATA_MAGIC) {
         return EINVAL;
@@ -1626,14 +1621,14 @@ static struct ipadb_adtrusts *get_domain_from_realm(krb5_context context,
 {
     struct ipadb_context *ipactx;
     struct ipadb_adtrusts *domain;
 -    int i;
 +    size_t i;
     ipactx = ipadb_get_context(context);
     if (!ipactx) {
         return NULL;
     }
 -    if (ipactx->mspac == NULL) {
 +    if (!ipactx->mspac) {
         return NULL;
     }
@@ -1655,6 +1650,7 @@ static struct ipadb_adtrusts *get_domain_from_realm_update(krb5_context context,
 {
     struct ipadb_context *ipactx;
     struct ipadb_adtrusts *domain;
 +    const char *stmsg = NULL;
     krb5_error_code kerr;
     ipactx = ipadb_get_context(context);
@@ -1663,8 +1659,10 @@ static struct ipadb_adtrusts *get_domain_from_realm_update(krb5_context context,
     }
     /* re-init MS-PAC info using default update interval */
 -    kerr = ipadb_reinit_mspac(ipactx, false);
 +    kerr = ipadb_reinit_mspac(ipactx, false, &stmsg);
     if (kerr != 0) {
 +        if (stmsg)
 +            krb5_klog_syslog(LOG_WARNING, "MS-PAC generator: %s", stmsg);
         return NULL;
     }
     domain = get_domain_from_realm(context, realm);
@@ -1717,6 +1715,7 @@ static krb5_error_code check_logon_info_consistent(krb5_context context,
     struct ipadb_e_data *ied = NULL;
     int flags = 0;
     struct dom_sid client_sid;
 +    const char *stmsg = NULL;
 #ifdef KRB5_KDB_FLAG_ALIAS_OK
     flags = KRB5_KDB_FLAG_ALIAS_OK;
 #endif
@@ -1730,10 +1729,14 @@ static krb5_error_code check_logon_info_consistent(krb5_context context,
      * check that our own view on the PAC details is up to date */
     if (ipactx->mspac->domsid.num_auths == 0) {
         /* Force re-init of KDB's view on our domain */
 -        kerr = ipadb_reinit_mspac(ipactx, true);
 +        kerr = ipadb_reinit_mspac(ipactx, true, &stmsg);
         if (kerr != 0) {
 -            krb5_klog_syslog(LOG_ERR,
 -                             "PAC issue: unable to update realm's view on PAC info");
 +            if (stmsg) {
 +                krb5_klog_syslog(LOG_ERR, "MS-PAC generator: %s", stmsg);
 +            } else {
 +                krb5_klog_syslog(LOG_ERR, "PAC issue: unable to update " \
 +                                 "realm's view on PAC info");
 +            }
             return KRB5KDC_ERR_POLICY;
         }
     }
@@ -1746,7 +1749,7 @@ static krb5_error_code check_logon_info_consistent(krb5_context context,
         if (is_s4u && (ipactx->mspac->trusts != NULL)) {
             /* Iterate through list of trusts and check if this SID belongs to
              * one of the domains we trust */
 -            for(int i = 0 ; i < ipactx->mspac->num_trusts ; i++) {
 +            for(size_t i = 0 ; i < ipactx->mspac->num_trusts ; i++) {
                 result = dom_sid_check(&ipactx->mspac->trusts[i].domsid,
                                        info->info->info3.base.domain_sid, true);
                 if (result) {
@@ -1858,11 +1861,11 @@ krb5_error_code filter_logon_info(krb5_context context,
         struct ipadb_mspac *mspac_ctx = ipactx->mspac;
         result = FALSE;
         /* Didn't match but perhaps the original PAC was issued by a child domain's DC? */
 -        for (k = 0; k < mspac_ctx->num_trusts; k++) {
 -            result = dom_sid_check(&mspac_ctx->trusts[k].domsid,
 +        for (size_t m = 0; m < mspac_ctx->num_trusts; m++) {
 +            result = dom_sid_check(&mspac_ctx->trusts[m].domsid,
                              info->info->info3.base.domain_sid, true);
             if (result) {
 -                domain = &mspac_ctx->trusts[k];
 +                domain = &mspac_ctx->trusts[m];
                 break;
             }
         }
@@ -2091,10 +2094,10 @@ static krb5_error_code ipadb_check_logon_info(krb5_context context,
                 return KRB5_KDB_DBNOTINITED;
             }
             /* In S4U case we might be dealing with the PAC issued by the trusted domain */
 -            if ((ipactx->mspac->trusts != NULL)) {
 +            if (ipactx->mspac->trusts) {
                 /* Iterate through list of trusts and check if this SID belongs to
                 * one of the domains we trust */
 -                for(int i = 0 ; i < ipactx->mspac->num_trusts ; i++) {
 +                for(size_t i = 0 ; i < ipactx->mspac->num_trusts ; i++) {
                     result = dom_sid_check(&ipactx->mspac->trusts[i].domsid,
                                            &client_sid, false);
                     if (result) {
@@ -2631,7 +2634,7 @@ static char *get_server_netbios_name(struct ipadb_context *ipactx)
 void ipadb_mspac_struct_free(struct ipadb_mspac **mspac)
 {
 -    int i, j;
 +    size_t i, j;
     if (!*mspac) return;
@@ -2786,7 +2789,8 @@ ipadb_mspac_get_trusted_domains(struct ipadb_context *ipactx)
     LDAPDN dn = NULL;
     char **sid_blocklist_incoming = NULL;
     char **sid_blocklist_outgoing = NULL;
 -    int ret, n, i;
 +    size_t i, n;
 +    int ret;
     ret = asprintf(&base, "cn=ad,cn=trusts,%s", ipactx->base);
     if (ret == -1) {
@@ -2871,7 +2875,7 @@ ipadb_mspac_get_trusted_domains(struct ipadb_context *ipactx)
         t[n].upn_suffixes_len = NULL;
         if (t[n].upn_suffixes != NULL) {
 -            int len = 0;
 +            size_t len = 0;
             for (; t[n].upn_suffixes[len] != NULL; len++);
@@ -2986,108 +2990,114 @@ done:
     return ret;
 }
 -krb5_error_code ipadb_reinit_mspac(struct ipadb_context *ipactx, bool force_reinit)
 +krb5_error_code
 +ipadb_reinit_mspac(struct ipadb_context *ipactx, bool force_reinit,
 +                   const char **stmsg)
 {
     char *dom_attrs[] = { "ipaNTFlatName",
                           "ipaNTFallbackPrimaryGroup",
                           "ipaNTSecurityIdentifier",
                           NULL };
     char *grp_attrs[] = { "ipaNTSecurityIdentifier", NULL };
 -    krb5_error_code kerr;
     LDAPMessage *result = NULL;
     LDAPMessage *lentry;
 -    struct dom_sid gsid;
 -    char *resstr;
 -    int ret;
 +    struct dom_sid gsid, domsid;
 +    char *resstr = NULL;
 +    char *flat_domain_name = NULL;
 +    char *flat_server_name = NULL;
 +    char *fallback_group = NULL;
 +    uint32_t fallback_rid;
     time_t now;
 +    const char *in_stmsg = NULL;
 +    int err;
 +    krb5_error_code trust_kerr = 0;
 +
     /* Do not update the mspac struct more than once a minute. This would
      * avoid heavy load on the directory server if there are lots of requests
      * from domains which we do not trust. */
     now = time(NULL);
 -    if (ipactx->mspac != NULL &&
 -        (force_reinit == false) &&
 -        (now > ipactx->mspac->last_update) &&
 -        (now - ipactx->mspac->last_update) < 60) {
 -        return 0;
 -    }
 -
 -    if (ipactx->mspac && ipactx->mspac->num_trusts == 0) {
 -        /* Check if there is any trust configured. If not, just return
 -         * and do not re-initialize the MS-PAC structure. */
 -        kerr = ipadb_mspac_check_trusted_domains(ipactx);
 -        if (kerr == KRB5_KDB_NOENTRY) {
 -            kerr = 0;
 -            goto done;
 -        } else if (kerr != 0) {
 -            goto done;
 +    if (ipactx->mspac) {
 +        if (!force_reinit &&
 +            (now > ipactx->mspac->last_update) &&
 +            (now - ipactx->mspac->last_update) < 60) {
 +            /* SKIP */
 +            err = 0;
 +            goto end;
         }
 -    }
 -
 -    /* clean up in case we had old values around */
 -    ipadb_mspac_struct_free(&ipactx->mspac);
 -    ipactx->mspac = calloc(1, sizeof(struct ipadb_mspac));
 -    if (!ipactx->mspac) {
 -        kerr = ENOMEM;
 -        goto done;
 +        if (ipactx->mspac->num_trusts == 0) {
 +            /* Check if there is any trust configured. If not, just return
 +             * and do not re-initialize the MS-PAC structure. */
 +            err = ipadb_mspac_check_trusted_domains(ipactx);
 +            if (err) {
 +                if (err == KRB5_KDB_NOENTRY) {
 +                    /* SKIP */
 +                    err = 0;
 +                } else {
 +                    in_stmsg = "Failed to fetch trusted domains information";
 +                }
 +                goto end;
 +            }
 +        }
     }
 -    ipactx->mspac->last_update = now;
 -
 -    kerr = ipadb_simple_search(ipactx, ipactx->base, LDAP_SCOPE_SUBTREE,
 -                               "(objectclass=ipaNTDomainAttrs)", dom_attrs,
 -                                &result);
 -    if (kerr == KRB5_KDB_NOENTRY) {
 -        return ENOENT;
 -    } else if (kerr != 0) {
 -        return EIO;
 +    err = ipadb_simple_search(ipactx, ipactx->base, LDAP_SCOPE_SUBTREE,
 +                              "(objectclass=ipaNTDomainAttrs)", dom_attrs,
 +                              &result);
 +    if (err == KRB5_KDB_NOENTRY) {
 +        err = ENOENT;
 +        in_stmsg = "Local domain NT attributes not configured";
 +        goto end;
 +    } else if (err) {
 +        err = EIO;
 +        in_stmsg = "Failed to fetch local domain NT attributes";
 +        goto end;
     }
     lentry = ldap_first_entry(ipactx->lcontext, result);
     if (!lentry) {
 -        kerr = ENOENT;
 -        goto done;
 +        err = ENOENT;
 +        in_stmsg = "Local domain NT attributes not configured";
 +        goto end;
     }
 -    ret = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 -                                 "ipaNTFlatName",
 -                                 &ipactx->mspac->flat_domain_name);
 -    if (ret) {
 -        kerr = ret;
 -        goto done;
 +    err = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry, "ipaNTFlatName",
 +                                 &flat_domain_name);
 +    if (err) {
 +        in_stmsg = "Local domain NT flat name not configured";
 +        goto end;
     }
 -    ret = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 -                                 "ipaNTSecurityIdentifier",
 -                                 &resstr);
 -    if (ret) {
 -        kerr = ret;
 -        goto done;
 +    err = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 +                                 "ipaNTSecurityIdentifier", &resstr);
 +    if (err) {
 +        in_stmsg = "Local domain SID not configured";
 +        goto end;
     }
 -    ret = ipadb_string_to_sid(resstr, &ipactx->mspac->domsid);
 -    if (ret) {
 -        kerr = ret;
 -        free(resstr);
 -        goto done;
 +    err = ipadb_string_to_sid(resstr, &domsid);
 +    if (err) {
 +        in_stmsg = "Malformed local domain SID";
 +        goto end;
     }
 +
     free(resstr);
 -    free(ipactx->mspac->flat_server_name);
 -    ipactx->mspac->flat_server_name = get_server_netbios_name(ipactx);
 -    if (!ipactx->mspac->flat_server_name) {
 -        kerr = ENOMEM;
 -        goto done;
 +    flat_server_name = get_server_netbios_name(ipactx);
 +    if (!flat_server_name) {
 +        err = ENOMEM;
 +        goto end;
     }
 -    ret = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 -                                 "ipaNTFallbackPrimaryGroup",
 -                                 &ipactx->mspac->fallback_group);
 -    if (ret && ret != ENOENT) {
 -        kerr = ret;
 -        goto done;
 +    err = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 +                                 "ipaNTFallbackPrimaryGroup", &fallback_group);
 +    if (err) {
 +        in_stmsg = (err == ENOENT)
 +          ? "Local fallback primary group not configured"
 +          : "Failed to fetch local fallback primary group";
 +        goto end;
     }
     /* result and lentry not valid any more from here on */
@@ -3095,53 +3105,81 @@ krb5_error_code ipadb_reinit_mspac(struct ipadb_context *ipactx, bool force_rein
     result = NULL;
     lentry = NULL;
 -    if (ret != ENOENT) {
 -        kerr = ipadb_simple_search(ipactx, ipactx->mspac->fallback_group,
 -                                   LDAP_SCOPE_BASE,
 -                                   "(objectclass=posixGroup)",
 -                                   grp_attrs, &result);
 -        if (kerr && kerr != KRB5_KDB_NOENTRY) {
 -            kerr = ret;
 -            goto done;
 -        }
 +    err = ipadb_simple_search(ipactx, fallback_group, LDAP_SCOPE_BASE,
 +                              "(objectclass=posixGroup)", grp_attrs, &result);
 +    if (err) {
 +        in_stmsg = (err == KRB5_KDB_NOENTRY)
 +          ? "Local fallback primary group has no POSIX definition"
 +          : "Failed to fetch SID of POSIX group mapped as local fallback " \
 +            "primary group";
 +        goto end;
 +    }
 -        lentry = ldap_first_entry(ipactx->lcontext, result);
 -        if (!lentry) {
 -            kerr = ENOENT;
 -            goto done;
 -        }
 +    lentry = ldap_first_entry(ipactx->lcontext, result);
 +    if (!lentry) {
 +        err = ENOENT;
 +        goto end;
 +    }
 -        if (kerr == 0) {
 -            ret = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 -                                         "ipaNTSecurityIdentifier",
 -                                         &resstr);
 -            if (ret && ret != ENOENT) {
 -                kerr = ret;
 -                goto done;
 -            }
 -            if (ret == 0) {
 -                ret = ipadb_string_to_sid(resstr, &gsid);
 -                if (ret) {
 -                    free(resstr);
 -                    kerr = ret;
 -                    goto done;
 -                }
 -                ret = sid_split_rid(&gsid, &ipactx->mspac->fallback_rid);
 -                if (ret) {
 -                    free(resstr);
 -                    kerr = ret;
 -                    goto done;
 -                }
 -                free(resstr);
 -            }
 -        }
 +    err = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
 +                                 "ipaNTSecurityIdentifier", &resstr);
 +    if (err) {
 +        in_stmsg = (err == ENOENT)
 +          ? "The POSIX group set as fallback primary group has no SID " \
 +            "configured"
 +          : "Failed to fetch SID of POSIX group set as local fallback " \
 +            "primary group";
 +        goto end;
     }
 -    kerr = ipadb_mspac_get_trusted_domains(ipactx);
 +    err = ipadb_string_to_sid(resstr, &gsid);
 +    if (err) {
 +        in_stmsg = "Malformed SID of POSIX group set as local fallback " \
 +                   "primary group";
 +        goto end;
 +    }
 -done:
 +    err = sid_split_rid(&gsid, &fallback_rid);
 +    if (err) {
 +        in_stmsg = "Malformed SID of POSIX group mapped as local fallback " \
 +                   "primary group";
 +        goto end;
 +    }
 +
 +    /* clean up in case we had old values around */
 +    ipadb_mspac_struct_free(&ipactx->mspac);
 +
 +    ipactx->mspac = calloc(1, sizeof(struct ipadb_mspac));
 +    if (!ipactx->mspac) {
 +        err = ENOMEM;
 +        goto end;
 +    }
 +
 +    ipactx->mspac->last_update      = now;
 +    ipactx->mspac->flat_domain_name = flat_domain_name;
 +    ipactx->mspac->flat_server_name = flat_server_name;
 +    ipactx->mspac->domsid           = domsid;
 +    ipactx->mspac->fallback_group   = fallback_group;
 +    ipactx->mspac->fallback_rid     = fallback_rid;
 +
 +    trust_kerr = ipadb_mspac_get_trusted_domains(ipactx);
 +    if (trust_kerr)
 +        in_stmsg = "Failed to assemble trusted domains information";
 +
 +end:
 +    if (stmsg)
 +        *stmsg = in_stmsg;
 +
 +    if (resstr) free(resstr);
     ldap_msgfree(result);
 -    return kerr;
 +
 +    if (err) {
 +        if (flat_domain_name) free(flat_domain_name);
 +        if (flat_server_name) free(flat_server_name);
 +        if (fallback_group)   free(fallback_group);
 +    }
 +
 +    return err ? (krb5_error_code)err : trust_kerr;
 }
 krb5_error_code ipadb_check_transited_realms(krb5_context kcontext,
@@ -3151,11 +3189,11 @@ krb5_error_code ipadb_check_transited_realms(krb5_context kcontext,
 {
 	struct ipadb_context *ipactx;
 	bool has_transited_contents, has_client_realm, has_server_realm;
 -        int i;
 +        size_t i;
         krb5_error_code ret;
         ipactx = ipadb_get_context(kcontext);
 -        if (!ipactx || !ipactx->mspac) {
 +        if (!ipactx) {
             return KRB5_KDB_DBNOTINITED;
         }
@@ -3217,7 +3255,7 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
 						  char **trusted_realm)
 {
 	struct ipadb_context *ipactx;
 -	int i, j, length;
 +	size_t i, j, length;
 	const char *name;
 	bool result = false;
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac_private.h b/daemons/ipa-kdb/ipa_kdb_mspac_private.h
 index 7f0ca7a79..e650cfa73 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac_private.h
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac_private.h
@@ -31,7 +31,7 @@ struct ipadb_mspac {
     char *fallback_group;
     uint32_t fallback_rid;
 -    int num_trusts;
 +    size_t num_trusts;
     struct ipadb_adtrusts *trusts;
     time_t last_update;
 };
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac_v6.c b/daemons/ipa-kdb/ipa_kdb_mspac_v6.c
 index faf47ad1b..96cd50e4c 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac_v6.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac_v6.c
@@ -233,6 +233,7 @@ krb5_error_code ipadb_sign_authdata(krb5_context context,
     krb5_db_entry *client_entry = NULL;
     krb5_boolean is_equal;
     bool force_reinit_mspac = false;
 +    const char *stmsg = NULL;
     is_as_req = ((flags & KRB5_KDB_FLAG_CLIENT_REFERRALS_ONLY) != 0);
@@ -309,7 +310,9 @@ krb5_error_code ipadb_sign_authdata(krb5_context context,
             force_reinit_mspac = true;
         }
 -        (void)ipadb_reinit_mspac(ipactx, force_reinit_mspac);
 +        kerr = ipadb_reinit_mspac(ipactx, force_reinit_mspac, &stmsg);
 +        if (kerr && stmsg)
 +            krb5_klog_syslog(LOG_WARNING, "MS-PAC generator: %s", stmsg);
         kerr = ipadb_get_pac(context, flags, client, server, NULL, authtime, &pac);
         if (kerr != 0 && kerr != ENOENT) {
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac_v9.c b/daemons/ipa-kdb/ipa_kdb_mspac_v9.c
 index 3badd5b08..60db048e1 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac_v9.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac_v9.c
@@ -46,6 +46,7 @@ ipadb_v9_issue_pac(krb5_context context, unsigned int flags,
     bool with_pad;
     krb5_error_code kerr = 0;
     bool is_as_req = flags & CLIENT_REFERRALS_FLAGS;
 +    const char *stmsg = NULL;
     if (is_as_req) {
         get_authz_data_types(context, client, &with_pac, &with_pad);
@@ -110,12 +111,19 @@ ipadb_v9_issue_pac(krb5_context context, unsigned int flags,
                     force_reinit_mspac = TRUE;
                 }
             }
 -            (void)ipadb_reinit_mspac(ipactx, force_reinit_mspac);
 -            /* MS-PAC needs proper configuration and if it is missing, we simply skip issuing one */
 -            if (ipactx->mspac->flat_server_name == NULL) {
 +            /* MS-PAC generator has to be initalized */
 +            kerr = ipadb_reinit_mspac(ipactx, force_reinit_mspac, &stmsg);
 +            if (kerr && stmsg)
 +                krb5_klog_syslog(LOG_ERR, "MS-PAC generator: %s", stmsg);
 +
 +            /* Continue even if initilization of PAC generator failed.
 +             * It may caused by the trust objects part only. */
 +
 +            /* At least the core part of the PAC generator is required. */
 +            if (!ipactx->mspac)
                 return KRB5_PLUGIN_OP_NOTSUPP;
 -            }
 +
             kerr = ipadb_get_pac(context, flags,
                                  client, server, replaced_reply_key,
                                  authtime, &new_pac);
 diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c
 index fadb132ed..07cc87746 100644
 --- a/daemons/ipa-kdb/ipa_kdb_principals.c
 +++ b/daemons/ipa-kdb/ipa_kdb_principals.c
@@ -1495,6 +1495,7 @@ static krb5_error_code dbget_alias(krb5_context kcontext,
     krb5_db_entry *kentry = NULL;
     krb5_data *realm;
     krb5_boolean check = FALSE;
 +    const char *stmsg = NULL;
     /* TODO: also support hostbased aliases */
@@ -1562,8 +1563,11 @@ static krb5_error_code dbget_alias(krb5_context kcontext,
     if (kerr == KRB5_KDB_NOENTRY) {
         /* If no trusted realm found, refresh trusted domain data and try again
          * because it might be a freshly added trust to AD */
 -        kerr = ipadb_reinit_mspac(ipactx, false);
 +        kerr = ipadb_reinit_mspac(ipactx, false, &stmsg);
         if (kerr != 0) {
 +            if (stmsg)
 +                krb5_klog_syslog(LOG_WARNING, "MS-PAC generator: %s",
 +                                 stmsg);
             kerr = KRB5_KDB_NOENTRY;
             goto done;
         }
 -- 
 2.43.0
--- a/SOURCES/0018-ipatests-fix-tasks-wait_for_replication-method_rhel#25708.patch
+++ b/SOURCES/0018-ipatests-fix-tasks-wait_for_replication-method_rhel#25708.patch
@ -1,34 +0,0 @@
 From 44a762413c83f9637399afeb61b1e4b1ac111260 Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Feb 14 2024 12:24:48 +0000
 Subject: ipatests: fix tasks.wait_for_replication method
 With the fix for https://pagure.io/freeipa/issue/9171, the
 method entry.single_value['nsds5replicaupdateinprogress'] now
 returns a Boolean instead of a string "TRUE"/"FALSE".
 The method tasks.wait_for_replication needs to be fixed so that
 it properly detects when replication is not done.
 Fixes: https://pagure.io/freeipa/issue/9530
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py
 index 9068ba6..952c9e6 100755
 --- a/ipatests/pytest_ipa/integration/tasks.py
 +++ b/ipatests/pytest_ipa/integration/tasks.py
@@ -1510,7 +1510,7 @@ def wait_for_replication(ldap, timeout=30,
         statuses = [entry.single_value[status_attr] for entry in entries]
         wrong_statuses = [s for s in statuses
                           if not re.match(target_status_re, s)]
 -        if any(e.single_value[progress_attr] == 'TRUE' for e in entries):
 +        if any(e.single_value[progress_attr] for e in entries):
             msg = 'Replication not finished'
             logger.debug(msg)
         elif wrong_statuses:
--- a/SOURCES/0019-Vault-add-support-for-RSA-OAEP-wrapping-algo.patch
+++ b/SOURCES/0019-Vault-add-support-for-RSA-OAEP-wrapping-algo.patch
@ -1,127 +0,0 @@
 From 163f06cab678d517ab30ab6da59ae339f39ee7cf Mon Sep 17 00:00:00 2001
 From: Francisco Trivino <ftrivino@redhat.com>
 Date: Fri, 27 May 2022 17:31:40 +0200
 Subject: [PATCH] Vault: add support for RSA-OAEP wrapping algo
 None of the FIPS certified modules in RHEL support PKCS#1 v1.5 as FIPS
 approved mechanism. This commit adds support for RSA-OAEP padding as a
 fallback.
 Fixes: https://pagure.io/freeipa/issue/9191
 Signed-off-by: Francisco Trivino <ftrivino@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 (cherry picked from commit b1fb31fd20c900c9ff1d5d28dfe136439f6bf605)
 ---
 ipaclient/plugins/vault.py | 57 ++++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 12 deletions(-)
 diff --git a/ipaclient/plugins/vault.py b/ipaclient/plugins/vault.py
 index d4c84eb6b..ed16c73ae 100644
 --- a/ipaclient/plugins/vault.py
 +++ b/ipaclient/plugins/vault.py
@@ -119,8 +119,8 @@ def encrypt(data, symmetric_key=None, public_key=None):
         return public_key_obj.encrypt(
             data,
             padding.OAEP(
 -                mgf=padding.MGF1(algorithm=hashes.SHA1()),
 -                algorithm=hashes.SHA1(),
 +                mgf=padding.MGF1(algorithm=hashes.SHA256()),
 +                algorithm=hashes.SHA256(),
                 label=None
             )
         )
@@ -154,8 +154,8 @@ def decrypt(data, symmetric_key=None, private_key=None):
             return private_key_obj.decrypt(
                 data,
                 padding.OAEP(
 -                    mgf=padding.MGF1(algorithm=hashes.SHA1()),
 -                    algorithm=hashes.SHA1(),
 +                    mgf=padding.MGF1(algorithm=hashes.SHA256()),
 +                    algorithm=hashes.SHA256(),
                     label=None
                 )
             )
@@ -705,14 +705,39 @@ class ModVaultData(Local):
         return transport_cert, wrapping_algo
     def _do_internal(self, algo, transport_cert, raise_unexpected,
 -                     *args, **options):
 +                     use_oaep=False, *args, **options):
         public_key = transport_cert.public_key()
         # wrap session key with transport certificate
 -        wrapped_session_key = public_key.encrypt(
 -            algo.key,
 -            padding.PKCS1v15()
 -        )
 +        # KRA may be configured using either the default PKCS1v15 or RSA-OAEP.
 +        # there is no way to query this info using the REST interface.
 +        if not use_oaep:
 +            # PKCS1v15() causes an OpenSSL exception when FIPS is enabled
 +            # if so, we fallback to RSA-OAEP
 +            try:
 +                wrapped_session_key = public_key.encrypt(
 +                    algo.key,
 +                    padding.PKCS1v15()
 +                )
 +            except ValueError:
 +                wrapped_session_key = public_key.encrypt(
 +                    algo.key,
 +                    padding.OAEP(
 +                        mgf=padding.MGF1(algorithm=hashes.SHA256()),
 +                        algorithm=hashes.SHA256(),
 +                        label=None
 +                    )
 +                )
 +        else:
 +            wrapped_session_key = public_key.encrypt(
 +                algo.key,
 +                padding.OAEP(
 +                    mgf=padding.MGF1(algorithm=hashes.SHA256()),
 +                    algorithm=hashes.SHA256(),
 +                    label=None
 +                )
 +            )
 +
         options['session_key'] = wrapped_session_key
         name = self.name + '_internal'
@@ -723,7 +748,7 @@ class ModVaultData(Local):
                 errors.ExecutionError,
                 errors.GenericError):
             _kra_config_cache.remove(self.api.env.domain)
 -            if raise_unexpected:
 +            if raise_unexpected and use_oaep:
                 raise
         return None
@@ -733,15 +758,23 @@ class ModVaultData(Local):
         """
         # try call with cached transport certificate
         result = self._do_internal(algo, transport_cert, False,
 -                                       *args, **options)
 +                                   False, *args, **options)
         if result is not None:
             return result
         # retrieve transport certificate (cached by vaultconfig_show)
         transport_cert = self._get_vaultconfig(force_refresh=True)[0]
 +
         # call with the retrieved transport certificate
 +        result = self._do_internal(algo, transport_cert, True,
 +                                   False, *args, **options)
 +
 +        if result is not None:
 +            return result
 +
 +        # call and use_oaep this time, last attempt
         return self._do_internal(algo, transport_cert, True,
 -                                 *args, **options)
 +                                 True, *args, **options)
 @register(no_fail=True)
 -- 
 2.43.0
--- a/SOURCES/0020-Vault-improve-vault-server-archival-retrieval-calls-.patch
+++ b/SOURCES/0020-Vault-improve-vault-server-archival-retrieval-calls-.patch
@ -1,88 +0,0 @@
 From 84798137fabf75fe79aebbd97e4b8418de8ab0f2 Mon Sep 17 00:00:00 2001
 From: Francisco Trivino <ftrivino@redhat.com>
 Date: Fri, 19 Jan 2024 18:15:28 +0100
 Subject: [PATCH] Vault: improve vault server archival/retrieval calls
 error handling
 If a vault operation fails, the error message just says "InternalError". This commit
 improves error handling of key archival and retrieval calls by catching the PKIException
 error and raising it as an IPA error.
 Related: https://pagure.io/freeipa/issue/9191
 Signed-off-by: Francisco Trivino <ftrivino@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 (cherry picked from commit dc1ab53f0aa0398d493f7440b5ec4d70d9c7d663)
 ---
 ipaserver/plugins/vault.py | 40 +++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 14 deletions(-)
 diff --git a/ipaserver/plugins/vault.py b/ipaserver/plugins/vault.py
 index 574c83a9a..13c4fac9a 100644
 --- a/ipaserver/plugins/vault.py
 +++ b/ipaserver/plugins/vault.py
@@ -45,6 +45,7 @@ if api.env.in_server:
     import pki.key
     from pki.crypto import DES_EDE3_CBC_OID
     from pki.crypto import AES_128_CBC_OID
 +    from pki import PKIException
 if six.PY3:
     unicode = str
@@ -1094,16 +1095,21 @@ class vault_archive_internal(PKQuery):
                     pki.key.KeyClient.KEY_STATUS_INACTIVE)
             # forward wrapped data to KRA
 -            kra_client.keys.archive_encrypted_data(
 -                client_key_id,
 -                pki.key.KeyClient.PASS_PHRASE_TYPE,
 -                wrapped_vault_data,
 -                wrapped_session_key,
 -                algorithm_oid=algorithm_oid,
 -                nonce_iv=nonce,
 -            )
 -
 -            kra_account.logout()
 +            try:
 +                kra_client.keys.archive_encrypted_data(
 +                    client_key_id,
 +                    pki.key.KeyClient.PASS_PHRASE_TYPE,
 +                    wrapped_vault_data,
 +                    wrapped_session_key,
 +                    algorithm_oid=algorithm_oid,
 +                    nonce_iv=nonce,
 +                )
 +            except PKIException as e:
 +                kra_account.logout()
 +                raise errors.EncodingError(
 +                    message=_("Unable to archive key: %s") % e)
 +            finally:
 +                kra_account.logout()
         response = {
             'value': args[-1],
@@ -1174,11 +1180,17 @@ class vault_retrieve_internal(PKQuery):
             kra_client.keys.encrypt_alg_oid = algorithm_oid
             # retrieve encrypted data from KRA
 -            key = kra_client.keys.retrieve_key(
 -                key_info.get_key_id(),
 -                wrapped_session_key)
 +            try:
 -            kra_account.logout()
 +                key = kra_client.keys.retrieve_key(
 +                    key_info.get_key_id(),
 +                    wrapped_session_key)
 +            except PKIException as e:
 +                kra_account.logout()
 +                raise errors.EncodingError(
 +                    message=_("Unable to retrieve key: %s") % e)
 +            finally:
 +                kra_account.logout()
         response = {
             'value': args[-1],
 -- 
 2.43.0
--- a/SOURCES/0021-kra-set-RSA-OAEP-as-default-wrapping-algo-when-FIPS-.patch
+++ b/SOURCES/0021-kra-set-RSA-OAEP-as-default-wrapping-algo-when-FIPS-.patch
@ -1,98 +0,0 @@
 From a406fd9aec7d053c044e73f16b05489bebd84bc8 Mon Sep 17 00:00:00 2001
 From: Francisco Trivino <ftrivino@redhat.com>
 Date: Fri, 19 Jan 2024 17:12:07 +0100
 Subject: [PATCH] kra: set RSA-OAEP as default wrapping algo when FIPS is
 enabled
 Vault uses PKCS1v15 as default padding wrapping algo, which is not an approved
 FIPS algorithm. This commit ensures that KRA is installed with RSA-OAEP if FIPS
 is enabled. It also handles upgrade path.
 Fixes: https://pagure.io/freeipa/issue/9191
 Signed-off-by: Francisco Trivino <ftrivino@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 (cherry picked from commit f2eec9eb208e62f923375b9eaf34fcc491046a0d)
 ---
 install/share/ipaca_default.ini     |  3 +++
 ipaserver/install/dogtaginstance.py |  4 +++-
 ipaserver/install/krainstance.py    | 12 ++++++++++++
 ipaserver/install/server/upgrade.py | 12 ++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 diff --git a/install/share/ipaca_default.ini b/install/share/ipaca_default.ini
 index 082f507b2..691f1e1b7 100644
 --- a/install/share/ipaca_default.ini
 +++ b/install/share/ipaca_default.ini
@@ -166,3 +166,6 @@ pki_audit_signing_subject_dn=cn=KRA Audit,%(ipa_subject_base)s
 # We will use the dbuser created for the CA.
 pki_share_db=True
 pki_share_dbuser_dn=uid=pkidbuser,ou=people,o=ipaca
 +
 +# KRA padding, set RSA-OAEP in FIPS mode
 +pki_use_oaep_rsa_keywrap=%(fips_use_oaep_rsa_keywrap)s
 \ No newline at end of file
 diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
 index c2c6b3f49..c3c726f68 100644
 --- a/ipaserver/install/dogtaginstance.py
 +++ b/ipaserver/install/dogtaginstance.py
@@ -1020,7 +1020,9 @@ class PKIIniLoader:
             # for softhsm2 testing
             softhsm2_so=paths.LIBSOFTHSM2_SO,
             # Configure a more secure AJP password by default
 -            ipa_ajp_secret=ipautil.ipa_generate_password(special=None)
 +            ipa_ajp_secret=ipautil.ipa_generate_password(special=None),
 +            # in FIPS mode use RSA-OAEP wrapping padding algo as default
 +            fips_use_oaep_rsa_keywrap=tasks.is_fips_enabled()
         )
     @classmethod
 diff --git a/ipaserver/install/krainstance.py b/ipaserver/install/krainstance.py
 index 13cb2dcaa..0e04840a1 100644
 --- a/ipaserver/install/krainstance.py
 +++ b/ipaserver/install/krainstance.py
@@ -277,6 +277,18 @@ class KRAInstance(DogtagInstance):
         # A restart is required
 +    def enable_oaep_wrap_algo(self):
 +        """
 +        Enable KRA OAEP key wrap algorithm
 +        """
 +        with installutils.stopped_service('pki-tomcatd', 'pki-tomcat'):
 +            directivesetter.set_directive(
 +                self.config,
 +                'keyWrap.useOAEP',
 +                'true', quotes=False, separator='=')
 +
 +        # A restart is required
 +
     def update_cert_config(self, nickname, cert):
         """
         When renewing a KRA subsystem certificate the configuration file
 diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
 index e4dc7ae73..c84516b56 100644
 --- a/ipaserver/install/server/upgrade.py
 +++ b/ipaserver/install/server/upgrade.py
@@ -1780,6 +1780,18 @@ def upgrade_configuration():
             else:
                 logger.info('ephemeralRequest is already enabled')
 +            if tasks.is_fips_enabled():
 +                logger.info('[Ensuring KRA OAEP wrap algo is enabled in FIPS]')
 +                value = directivesetter.get_directive(
 +                    paths.KRA_CS_CFG_PATH,
 +                    'keyWrap.useOAEP',
 +                    separator='=')
 +                if value is None or value.lower() != 'true':
 +                    logger.info('Use the OAEP key wrap algo')
 +                    kra.enable_oaep_wrap_algo()
 +                else:
 +                    logger.info('OAEP key wrap algo is already enabled')
 +
     # several upgrade steps require running CA.  If CA is configured,
     # always run ca.start() because we need to wait until CA is really ready
     # by checking status using http
 -- 
 2.43.0
--- a/SOURCES/0022-ipa-kdb-Fix-double-free-in-ipadb_reinit_mspac.patch
+++ b/SOURCES/0022-ipa-kdb-Fix-double-free-in-ipadb_reinit_mspac.patch
@ -1,29 +0,0 @@
 From a8e433f7c8d844d9f337a34db09b0197f2dbc5af Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Tue, 20 Feb 2024 15:14:24 +0100
 Subject: [PATCH] ipa-kdb: Fix double free in ipadb_reinit_mspac()
 Fixes: https://pagure.io/freeipa/issue/9535
 Signed-off-by: Julien Rische <jrische@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 (cherry picked from commit dd27d225524aa81c038a970961a4f878cf742e2a)
 ---
 daemons/ipa-kdb/ipa_kdb_mspac.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/daemons/ipa-kdb/ipa_kdb_mspac.c b/daemons/ipa-kdb/ipa_kdb_mspac.c
 index deed513b9..0964d112a 100644
 --- a/daemons/ipa-kdb/ipa_kdb_mspac.c
 +++ b/daemons/ipa-kdb/ipa_kdb_mspac.c
@@ -3084,6 +3084,7 @@ ipadb_reinit_mspac(struct ipadb_context *ipactx, bool force_reinit,
     }
     free(resstr);
 +    resstr = NULL;
     flat_server_name = get_server_netbios_name(ipactx);
     if (!flat_server_name) {
 -- 
 2.43.0
--- a/SOURCES/0023-rpcserver-validate-Kerberos-principal-name-before-running-kinit_rhel#26153.patch
+++ b/SOURCES/0023-rpcserver-validate-Kerberos-principal-name-before-running-kinit_rhel#26153.patch
@ -1,392 +0,0 @@
 From b039f3087a13de3f34b230dbe29a7cfb1965700d Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Feb 23 2024 09:49:27 +0000
 Subject: rpcserver: validate Kerberos principal name before running kinit
 Do minimal validation of the Kerberos principal name when passing it to
 kinit command line tool. Also pass it as the final argument to prevent
 option injection.
 Accepted Kerberos principals are:
 - user names, using the following regexp
   (username with optional @realm, no spaces or slashes in the name):
   "(?!^[0-9]+$)^[a-zA-Z0-9_.][a-zA-Z0-9_.-]*[a-zA-Z0-9_.$-]?@?[a-zA-Z0-9.-]*$"
 - service names (with slash in the name but no spaces). Validation of
   the hostname is done. There is no validation of the service name.
 The regular expression above also covers cases where a principal name
 starts with '-'. This prevents option injection as well.
 This fixes CVE-2024-1481
 Fixes: https://pagure.io/freeipa/issue/9541
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 ---
 diff --git a/ipalib/install/kinit.py b/ipalib/install/kinit.py
 index cc839ec..4ad4eaa 100644
 --- a/ipalib/install/kinit.py
 +++ b/ipalib/install/kinit.py
@@ -6,12 +6,16 @@ from __future__ import absolute_import
 import logging
 import os
 +import re
 import time
 import gssapi
 from ipaplatform.paths import paths
 from ipapython.ipautil import run
 +from ipalib.constants import PATTERN_GROUPUSER_NAME
 +from ipalib.util import validate_hostname
 +from ipalib import api
 logger = logging.getLogger(__name__)
@@ -21,6 +25,40 @@ KRB5_KDC_UNREACH = 2529639068
 # A service is not available that s required to process the request
 KRB5KDC_ERR_SVC_UNAVAILABLE = 2529638941
 +PATTERN_REALM = '@?([a-zA-Z0-9.-]*)$'
 +PATTERN_PRINCIPAL = '(' + PATTERN_GROUPUSER_NAME[:-1] + ')' + PATTERN_REALM
 +PATTERN_SERVICE = '([a-zA-Z0-9.-]+)/([a-zA-Z0-9.-]+)' + PATTERN_REALM
 +
 +user_pattern = re.compile(PATTERN_PRINCIPAL)
 +service_pattern = re.compile(PATTERN_SERVICE)
 +
 +
 +def validate_principal(principal):
 +    if not isinstance(principal, str):
 +        raise RuntimeError('Invalid principal: not a string')
 +    if ('/' in principal) and (' ' in principal):
 +        raise RuntimeError('Invalid principal: bad spacing')
 +    else:
 +        realm = None
 +        match = user_pattern.match(principal)
 +        if match is None:
 +            match = service_pattern.match(principal)
 +            if match is None:
 +                raise RuntimeError('Invalid principal: cannot parse')
 +            else:
 +                # service = match[1]
 +                hostname = match[2]
 +                realm = match[3]
 +                try:
 +                    validate_hostname(hostname)
 +                except ValueError as e:
 +                    raise RuntimeError(str(e))
 +        else:  # user match, validate realm
 +            # username = match[1]
 +            realm = match[2]
 +        if realm and 'realm' in api.env and realm != api.env.realm:
 +            raise RuntimeError('Invalid principal: realm mismatch')
 +
 def kinit_keytab(principal, keytab, ccache_name, config=None, attempts=1):
     """
@@ -29,6 +67,7 @@ def kinit_keytab(principal, keytab, ccache_name, config=None, attempts=1):
     The optional parameter 'attempts' specifies how many times the credential
     initialization should be attempted in case of non-responsive KDC.
     """
 +    validate_principal(principal)
     errors_to_retry = {KRB5KDC_ERR_SVC_UNAVAILABLE,
                        KRB5_KDC_UNREACH}
     logger.debug("Initializing principal %s using keytab %s",
@@ -65,6 +104,7 @@ def kinit_keytab(principal, keytab, ccache_name, config=None, attempts=1):
         return None
 +
 def kinit_password(principal, password, ccache_name, config=None,
                    armor_ccache_name=None, canonicalize=False,
                    enterprise=False, lifetime=None):
@@ -73,8 +113,9 @@ def kinit_password(principal, password, ccache_name, config=None,
     web-based authentication, use armor_ccache_path to specify http service
     ccache.
     """
 +    validate_principal(principal)
     logger.debug("Initializing principal %s using password", principal)
 -    args = [paths.KINIT, principal, '-c', ccache_name]
 +    args = [paths.KINIT, '-c', ccache_name]
     if armor_ccache_name is not None:
         logger.debug("Using armor ccache %s for FAST webauth",
                      armor_ccache_name)
@@ -91,6 +132,7 @@ def kinit_password(principal, password, ccache_name, config=None,
         logger.debug("Using enterprise principal")
         args.append('-E')
 +    args.extend(['--', principal])
     env = {'LC_ALL': 'C'}
     if config is not None:
         env['KRB5_CONFIG'] = config
@@ -154,6 +196,7 @@ def kinit_pkinit(
     :raises: CalledProcessError if PKINIT fails
     """
 +    validate_principal(principal)
     logger.debug(
         "Initializing principal %s using PKINIT %s", principal, user_identity
     )
@@ -168,7 +211,7 @@ def kinit_pkinit(
             assert pkinit_anchor.startswith(("FILE:", "DIR:", "ENV:"))
             args.extend(["-X", f"X509_anchors={pkinit_anchor}"])
     args.extend(["-X", f"X509_user_identity={user_identity}"])
 -    args.append(principal)
 +    args.extend(['--', principal])
     # this workaround enables us to capture stderr and put it
     # into the raised exception in case of unsuccessful authentication
 diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
 index 3555014..60bfa61 100644
 --- a/ipaserver/rpcserver.py
 +++ b/ipaserver/rpcserver.py
@@ -1134,10 +1134,6 @@ class login_password(Backend, KerberosSession):
                 canonicalize=True,
                 lifetime=self.api.env.kinit_lifetime)
 -            if armor_path:
 -                logger.debug('Cleanup the armor ccache')
 -                ipautil.run([paths.KDESTROY, '-A', '-c', armor_path],
 -                            env={'KRB5CCNAME': armor_path}, raiseonerr=False)
         except RuntimeError as e:
             if ('kinit: Cannot read password while '
                     'getting initial credentials') in str(e):
@@ -1155,6 +1151,11 @@ class login_password(Backend, KerberosSession):
                 raise KrbPrincipalWrongFAST(principal=principal)
             raise InvalidSessionPassword(principal=principal,
                                          message=unicode(e))
 +        finally:
 +            if armor_path:
 +                logger.debug('Cleanup the armor ccache')
 +                ipautil.run([paths.KDESTROY, '-A', '-c', armor_path],
 +                            env={'KRB5CCNAME': armor_path}, raiseonerr=False)
 class change_password(Backend, HTTP_Status):
 diff --git a/ipatests/prci_definitions/gating.yaml b/ipatests/prci_definitions/gating.yaml
 index 91be057..400a248 100644
 --- a/ipatests/prci_definitions/gating.yaml
 +++ b/ipatests/prci_definitions/gating.yaml
@@ -310,3 +310,15 @@ jobs:
         template: *ci-ipa-4-9-latest
         timeout: 3600
         topology: *master_1repl_1client
 +
 +  fedora-latest-ipa-4-9/test_ipalib_install:
 +    requires: [fedora-latest-ipa-4-9/build]
 +    priority: 100
 +    job:
 +      class: RunPytest
 +      args:
 +        build_url: '{fedora-latest-ipa-4-9/build_url}'
 +        test_suite: test_ipalib_install/test_kinit.py
 +        template: *ci-ipa-4-9-latest
 +        timeout: 600
 +        topology: *master_1repl
 diff --git a/ipatests/prci_definitions/nightly_ipa-4-9_latest.yaml b/ipatests/prci_definitions/nightly_ipa-4-9_latest.yaml
 index b2ab765..7c03a48 100644
 --- a/ipatests/prci_definitions/nightly_ipa-4-9_latest.yaml
 +++ b/ipatests/prci_definitions/nightly_ipa-4-9_latest.yaml
@@ -1801,3 +1801,15 @@ jobs:
         template: *ci-ipa-4-9-latest
         timeout: 5000
         topology: *master_2repl_1client
 +
 +  fedora-latest-ipa-4-9/test_ipalib_install:
 +    requires: [fedora-latest-ipa-4-9/build]
 +    priority: 50
 +    job:
 +      class: RunPytest
 +      args:
 +        build_url: '{fedora-latest-ipa-4-9/build_url}'
 +        test_suite: test_ipalib_install/test_kinit.py
 +        template: *ci-ipa-4-9-latest
 +        timeout: 600
 +        topology: *master_1repl
 diff --git a/ipatests/prci_definitions/nightly_ipa-4-9_latest_selinux.yaml b/ipatests/prci_definitions/nightly_ipa-4-9_latest_selinux.yaml
 index b7b3d3b..802bd2a 100644
 --- a/ipatests/prci_definitions/nightly_ipa-4-9_latest_selinux.yaml
 +++ b/ipatests/prci_definitions/nightly_ipa-4-9_latest_selinux.yaml
@@ -1944,3 +1944,16 @@ jobs:
         template: *ci-ipa-4-9-latest
         timeout: 5000
         topology: *master_2repl_1client
 +
 +  fedora-latest-ipa-4-9/test_ipalib_install:
 +    requires: [fedora-latest-ipa-4-9/build]
 +    priority: 50
 +    job:
 +      class: RunPytest
 +      args:
 +        build_url: '{fedora-latest-ipa-4-9/build_url}'
 +        selinux_enforcing: True
 +        test_suite: test_ipalib_install/test_kinit.py
 +        template: *ci-ipa-4-9-latest
 +        timeout: 600
 +        topology: *master_1repl
 diff --git a/ipatests/prci_definitions/nightly_ipa-4-9_previous.yaml b/ipatests/prci_definitions/nightly_ipa-4-9_previous.yaml
 index eb3849e..1e1adb8 100644
 --- a/ipatests/prci_definitions/nightly_ipa-4-9_previous.yaml
 +++ b/ipatests/prci_definitions/nightly_ipa-4-9_previous.yaml
@@ -1801,3 +1801,15 @@ jobs:
         template: *ci-ipa-4-9-previous
         timeout: 5000
         topology: *master_2repl_1client
 +
 +  fedora-previous-ipa-4-9/test_ipalib_install:
 +    requires: [fedora-previous-ipa-4-9/build]
 +    priority: 50
 +    job:
 +      class: RunPytest
 +      args:
 +        build_url: '{fedora-previous-ipa-4-9/build_url}'
 +        test_suite: test_ipalib_install/test_kinit.py
 +        template: *ci-ipa-4-9-previous
 +        timeout: 600
 +        topology: *master_1repl
 diff --git a/ipatests/setup.py b/ipatests/setup.py
 index 6217a1b..0aec4a7 100644
 --- a/ipatests/setup.py
 +++ b/ipatests/setup.py
@@ -41,6 +41,7 @@ if __name__ == '__main__':
             "ipatests.test_integration",
             "ipatests.test_ipaclient",
             "ipatests.test_ipalib",
 +            "ipatests.test_ipalib_install",
             "ipatests.test_ipaplatform",
             "ipatests.test_ipapython",
             "ipatests.test_ipaserver",
 diff --git a/ipatests/test_ipalib_install/__init__.py b/ipatests/test_ipalib_install/__init__.py
 new file mode 100644
 index 0000000..e69de29
 --- /dev/null
 +++ b/ipatests/test_ipalib_install/__init__.py
 diff --git a/ipatests/test_ipalib_install/test_kinit.py b/ipatests/test_ipalib_install/test_kinit.py
 new file mode 100644
 index 0000000..f89ea17
 --- /dev/null
 +++ b/ipatests/test_ipalib_install/test_kinit.py
@@ -0,0 +1,29 @@
 +#
 +# Copyright (C) 2024  FreeIPA Contributors see COPYING for license
 +#
 +"""Tests for ipalib.install.kinit module
 +"""
 +
 +import pytest
 +
 +from ipalib.install.kinit import validate_principal
 +
 +
 +# None means no exception is expected
 +@pytest.mark.parametrize('principal, exception', [
 +    ('testuser', None),
 +    ('testuser@EXAMPLE.TEST', None),
 +    ('test/ipa.example.test', None),
 +    ('test/ipa.example.test@EXAMPLE.TEST', None),
 +    ('test/ipa@EXAMPLE.TEST', RuntimeError),
 +    ('test/-ipa.example.test@EXAMPLE.TEST', RuntimeError),
 +    ('test/ipa.1example.test@EXAMPLE.TEST', RuntimeError),
 +    ('test /ipa.example,test', RuntimeError),
 +    ('testuser@OTHER.TEST', RuntimeError),
 +    ('test/ipa.example.test@OTHER.TEST', RuntimeError),
 +])
 +def test_validate_principal(principal, exception):
 +    try:
 +        validate_principal(principal)
 +    except Exception as e:
 +        assert e.__class__ == exception
 From 96a478bbedd49c31e0f078f00f2d1cb55bb952fd Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Feb 23 2024 09:49:27 +0000
 Subject: validate_principal: Don't try to verify that the realm is known
 The actual value is less important than whether it matches the
 regular expression. A number of legal but difficult to know in
 context realms could be passed in here (trust for example).
 This fixes CVE-2024-1481
 Fixes: https://pagure.io/freeipa/issue/9541
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 ---
 diff --git a/ipalib/install/kinit.py b/ipalib/install/kinit.py
 index 4ad4eaa..d5fb56b 100644
 --- a/ipalib/install/kinit.py
 +++ b/ipalib/install/kinit.py
@@ -15,7 +15,6 @@ from ipaplatform.paths import paths
 from ipapython.ipautil import run
 from ipalib.constants import PATTERN_GROUPUSER_NAME
 from ipalib.util import validate_hostname
 -from ipalib import api
 logger = logging.getLogger(__name__)
@@ -39,7 +38,9 @@ def validate_principal(principal):
     if ('/' in principal) and (' ' in principal):
         raise RuntimeError('Invalid principal: bad spacing')
     else:
 -        realm = None
 +        # For a user match in the regex
 +        # username = match[1]
 +        # realm = match[2]
         match = user_pattern.match(principal)
         if match is None:
             match = service_pattern.match(principal)
@@ -48,16 +49,11 @@ def validate_principal(principal):
             else:
                 # service = match[1]
                 hostname = match[2]
 -                realm = match[3]
 +                # realm = match[3]
                 try:
                     validate_hostname(hostname)
                 except ValueError as e:
                     raise RuntimeError(str(e))
 -        else:  # user match, validate realm
 -            # username = match[1]
 -            realm = match[2]
 -        if realm and 'realm' in api.env and realm != api.env.realm:
 -            raise RuntimeError('Invalid principal: realm mismatch')
 def kinit_keytab(principal, keytab, ccache_name, config=None, attempts=1):
 diff --git a/ipatests/test_ipalib_install/test_kinit.py b/ipatests/test_ipalib_install/test_kinit.py
 index f89ea17..8289c4b 100644
 --- a/ipatests/test_ipalib_install/test_kinit.py
 +++ b/ipatests/test_ipalib_install/test_kinit.py
@@ -17,13 +17,16 @@ from ipalib.install.kinit import validate_principal
     ('test/ipa.example.test@EXAMPLE.TEST', None),
     ('test/ipa@EXAMPLE.TEST', RuntimeError),
     ('test/-ipa.example.test@EXAMPLE.TEST', RuntimeError),
 -    ('test/ipa.1example.test@EXAMPLE.TEST', RuntimeError),
 +    ('test/ipa.1example.test@EXAMPLE.TEST', None),
     ('test /ipa.example,test', RuntimeError),
 -    ('testuser@OTHER.TEST', RuntimeError),
 -    ('test/ipa.example.test@OTHER.TEST', RuntimeError),
 +    ('testuser@OTHER.TEST', None),
 +    ('test/ipa.example.test@OTHER.TEST', None)
 ])
 def test_validate_principal(principal, exception):
     try:
         validate_principal(principal)
     except Exception as e:
         assert e.__class__ == exception
 +    else:
 +        if exception is not None:
 +            raise RuntimeError('Test should have failed')
--- a/SOURCES/0024-Vault-add-additional-fallback-to-RSA-OAEP-wrapping-algo_rhel#28259.patch
+++ b/SOURCES/0024-Vault-add-additional-fallback-to-RSA-OAEP-wrapping-algo_rhel#28259.patch
@ -1,43 +0,0 @@
 From d7c1ba0672fc8964f7674a526f3019429a551372 Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Mar 06 2024 08:34:57 +0000
 Subject: Vault: add additional fallback to RSA-OAEP wrapping algo
 There is a fallback when creating the wrapping key but one was missing
 when trying to use the cached transport_cert.
 This allows, along with forcing keyWrap.useOAEP=true, vault creation
 on an nCipher HSM.
 This can be seen in HSMs where the device doesn't support the
 PKCS#1 v1.5 mechanism. It will error out with either "invalid
 algorithm" or CKR_FUNCTION_FAILED.
 Related: https://pagure.io/freeipa/issue/9191
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
 ---
 diff --git a/ipaclient/plugins/vault.py b/ipaclient/plugins/vault.py
 index ed16c73..1523187 100644
 --- a/ipaclient/plugins/vault.py
 +++ b/ipaclient/plugins/vault.py
@@ -757,8 +757,12 @@ class ModVaultData(Local):
         Calls the internal counterpart of the command.
         """
         # try call with cached transport certificate
 -        result = self._do_internal(algo, transport_cert, False,
 -                                   False, *args, **options)
 +        try:
 +            result = self._do_internal(algo, transport_cert, False,
 +                                       False, *args, **options)
 +        except errors.EncodingError:
 +            result = self._do_internal(algo, transport_cert, False,
 +                                       True, *args, **options)
         if result is not None:
             return result
--- a/SOURCES/0025-dcerpc-invalidate-forest-trust-intfo-cache-when-filtering-out-realm-domains_rhel#28559.patch
+++ b/SOURCES/0025-dcerpc-invalidate-forest-trust-intfo-cache-when-filtering-out-realm-domains_rhel#28559.patch
@ -1,50 +0,0 @@
 From 656a11ae961f8d1afad54567cfe8ccb53e084a67 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Mar 20 2024 10:06:07 +0000
 Subject: dcerpc: invalidate forest trust info cache when filtering out realm domains
 When get_realmdomains() method is called, it will filter out subdomains
 of the IPA primary domain. This is required because Active Directory
 domain controllers are assuming subdomains already covered by the main
 domain namespace.
 [MS-LSAD] 3.1.4.7.16.1, 'Forest Trust Collision Generation' defines the
 method of validating the forest trust information. They are the same as
 rules in [MS-ADTS] section 6.1.6. Specifically,
  - A top-level name must not be superior to an enabled top-level name
    for another trusted domain object, unless the current trusted domain
    object has a corresponding exclusion record.
 In practice, we filtered those subdomains already but the code wasn't
 invalidating a previously retrieved forest trust information.
 Fixes: https://pagure.io/freeipa/issue/9551
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 ---
 diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
 index b6139db..7ee553d 100644
 --- a/ipaserver/dcerpc.py
 +++ b/ipaserver/dcerpc.py
@@ -1103,6 +1103,7 @@ class TrustDomainInstance:
         info.count = len(ftinfo_records)
         info.entries = ftinfo_records
 +        another_domain.ftinfo_data = info
         return info
     def clear_ftinfo_conflict(self, another_domain, cinfo):
@@ -1778,6 +1779,7 @@ class TrustDomainJoins:
             return
         self.local_domain.ftinfo_records = []
 +        self.local_domain.ftinfo_data = None
         realm_domains = self.api.Command.realmdomains_show()['result']
         # Use realmdomains' modification timestamp
--- a/SOURCES/0026-backport-test-fixes_rhel#29908.patch
+++ b/SOURCES/0026-backport-test-fixes_rhel#29908.patch
@ -1,335 +0,0 @@
 From 3bba254ccdcf9b62fdd8a6d71baecf37c97c300c Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Mon, 3 Apr 2023 08:37:28 +0200
 Subject: [PATCH] ipatests: mark known failures for autoprivategroup
 Two tests have known issues in test_trust.py with sssd 2.8.2+:
 - TestNonPosixAutoPrivateGroup::test_idoverride_with_auto_private_group
 (when called with the "hybrid" parameter)
 - TestPosixAutoPrivateGroup::test_only_uid_number_auto_private_group_default
 (when called with the "true" parameter)
 Related: https://pagure.io/freeipa/issue/9295
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 ---
 ipatests/test_integration/test_trust.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
 diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py
 index 0d5b71cb0..12f000c1a 100644
 --- a/ipatests/test_integration/test_trust.py
 +++ b/ipatests/test_integration/test_trust.py
@@ -1154,11 +1154,15 @@ class TestNonPosixAutoPrivateGroup(BaseTestTrust):
                                      self.gid_override
                                      ):
             self.mod_idrange_auto_private_group(type)
 -            (uid, gid) = self.get_user_id(self.clients[0], nonposixuser)
 -            assert (uid == self.uid_override and gid == self.gid_override)
 +            sssd_version = tasks.get_sssd_version(self.clients[0])
 +            bad_version = sssd_version >= tasks.parse_version("2.8.2")
 +            cond = (type == 'hybrid') and bad_version
 +            with xfail_context(condition=cond,
 +                               reason="https://pagure.io/freeipa/issue/9295"):
 +                (uid, gid) = self.get_user_id(self.clients[0], nonposixuser)
 +                assert (uid == self.uid_override and gid == self.gid_override)
             test_group = self.clients[0].run_command(
                 ["id", nonposixuser]).stdout_text
 -            # version = tasks.get_sssd_version(self.clients[0])
             with xfail_context(type == "hybrid",
                                'https://github.com/SSSD/sssd/issues/5989'):
                 assert "domain users@{0}".format(self.ad_domain) in test_group
@@ -1232,8 +1236,11 @@ class TestPosixAutoPrivateGroup(BaseTestTrust):
         posixuser = "testuser1@%s" % self.ad_domain
         self.mod_idrange_auto_private_group(type)
         if type == "true":
 -            (uid, gid) = self.get_user_id(self.clients[0], posixuser)
 -            assert uid == gid
 +            sssd_version = tasks.get_sssd_version(self.clients[0])
 +            with xfail_context(sssd_version >= tasks.parse_version("2.8.2"),
 +                 "https://pagure.io/freeipa/issue/9295"):
 +                (uid, gid) = self.get_user_id(self.clients[0], posixuser)
 +                assert uid == gid
         else:
             for host in [self.master, self.clients[0]]:
                 result = host.run_command(['id', posixuser], raiseonerr=False)
 -- 
 2.44.0
 From ed2a8eb0cefadfe0544074114facfef381349ae0 Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Feb 12 2024 10:43:39 +0000
 Subject: ipatests: add xfail for autoprivate group test with override
 Because of SSSD issue 7169, secondary groups are not
 retrieved when autoprivate group is set and an idoverride
 replaces the user's primary group.
 Mark the known issues as xfail.
 Related: https://github.com/SSSD/sssd/issues/7169
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Anuja More <amore@redhat.com>
 ---
 diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py
 index 3b9f0fb..2b94514 100644
 --- a/ipatests/test_integration/test_trust.py
 +++ b/ipatests/test_integration/test_trust.py
@@ -1164,8 +1164,12 @@ class TestNonPosixAutoPrivateGroup(BaseTestTrust):
                 assert (uid == self.uid_override and gid == self.gid_override)
             test_group = self.clients[0].run_command(
                 ["id", nonposixuser]).stdout_text
 -            with xfail_context(type == "hybrid",
 -                               'https://github.com/SSSD/sssd/issues/5989'):
 +            cond2 = ((type == 'false'
 +                      and sssd_version >= tasks.parse_version("2.9.4"))
 +                     or type == 'hybrid')
 +            with xfail_context(cond2,
 +                               'https://github.com/SSSD/sssd/issues/5989 '
 +                               'and 7169'):
                 assert "domain users@{0}".format(self.ad_domain) in test_group
     @pytest.mark.parametrize('type', ['hybrid', 'true', "false"])
@@ -1287,5 +1291,9 @@ class TestPosixAutoPrivateGroup(BaseTestTrust):
             assert(uid == self.uid_override
                    and gid == self.gid_override)
             result = self.clients[0].run_command(['id', posixuser])
 -            assert "10047(testgroup@{0})".format(
 -                self.ad_domain) in result.stdout_text
 +            sssd_version = tasks.get_sssd_version(self.clients[0])
 +            bad_version = sssd_version >= tasks.parse_version("2.9.4")
 +            with xfail_context(bad_version and type in ('false', 'hybrid'),
 +                 "https://github.com/SSSD/sssd/issues/7169"):
 +                assert "10047(testgroup@{0})".format(
 +                    self.ad_domain) in result.stdout_text
 From d5392300d77170ea3202ee80690ada8bf81b60b5 Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Feb 12 2024 10:44:47 +0000
 Subject: ipatests: remove xfail thanks to sssd 2.9.4
 SSSD 2.9.4 fixes some issues related to auto-private-group
 Related: https://pagure.io/freeipa/issue/9295
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Anuja More <amore@redhat.com>
 ---
 diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py
 index 12f000c..3b9f0fb 100644
 --- a/ipatests/test_integration/test_trust.py
 +++ b/ipatests/test_integration/test_trust.py
@@ -1155,7 +1155,8 @@ class TestNonPosixAutoPrivateGroup(BaseTestTrust):
                                      ):
             self.mod_idrange_auto_private_group(type)
             sssd_version = tasks.get_sssd_version(self.clients[0])
 -            bad_version = sssd_version >= tasks.parse_version("2.8.2")
 +            bad_version = (tasks.parse_version("2.8.2") <= sssd_version
 +                           < tasks.parse_version("2.9.4"))
             cond = (type == 'hybrid') and bad_version
             with xfail_context(condition=cond,
                                reason="https://pagure.io/freeipa/issue/9295"):
@@ -1237,7 +1238,9 @@ class TestPosixAutoPrivateGroup(BaseTestTrust):
         self.mod_idrange_auto_private_group(type)
         if type == "true":
             sssd_version = tasks.get_sssd_version(self.clients[0])
 -            with xfail_context(sssd_version >= tasks.parse_version("2.8.2"),
 +            bad_version = (tasks.parse_version("2.8.2") <= sssd_version
 +                           < tasks.parse_version("2.9.4"))
 +            with xfail_context(bad_version,
                  "https://pagure.io/freeipa/issue/9295"):
                 (uid, gid) = self.get_user_id(self.clients[0], posixuser)
                 assert uid == gid
 From 34d048ede0c439b3a53e02f8ace96ff91aa1609d Mon Sep 17 00:00:00 2001
 From: Florence Blanc-Renaud <flo@redhat.com>
 Date: Mar 14 2023 16:50:25 +0000
 Subject: ipatests: adapt for new automembership fixup behavior
 The automembership fixup task now needs to be called
 with --cleanup argument when the user expects automember
 to remove user/hosts from automember groups.
 Update the test to call create a cleanup task equivalent to
 dsconf plugin automember fixup --cleanup
 when it is needed.
 Fixes: https://pagure.io/freeipa/issue/9313
 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 diff --git a/ipatests/test_integration/test_automember.py b/ipatests/test_integration/test_automember.py
 index 7acd0d7..8b27f4d 100644
 --- a/ipatests/test_integration/test_automember.py
 +++ b/ipatests/test_integration/test_automember.py
@@ -4,6 +4,7 @@
 """This covers tests for automemberfeature."""
 from __future__ import absolute_import
 +import uuid
 from ipapython.dn import DN
@@ -211,11 +212,27 @@ class TestAutounmembership(IntegrationTest):
             # Running automember-build so that user is part of correct group
             result = self.master.run_command(['ipa', 'automember-rebuild',
                                               '--users=%s' % user2])
 +            assert msg in result.stdout_text
 +
 +            # The additional --cleanup argument is required
 +            cleanup_ldif = (
 +                "dn: cn={cn},cn=automember rebuild membership,"
 +                "cn=tasks,cn=config\n"
 +                "changetype: add\n"
 +                "objectclass: top\n"
 +                "objectclass: extensibleObject\n"
 +                "basedn: cn=users,cn=accounts,{suffix}\n"
 +                "filter: (uid={user})\n"
 +                "cleanup: yes\n"
 +                "scope: sub"
 +            ).format(cn=str(uuid.uuid4()),
 +                     suffix=str(self.master.domain.basedn),
 +                     user=user2)
 +            tasks.ldapmodify_dm(self.master, cleanup_ldif)
 +
             assert self.is_user_member_of_group(user2, group2)
             assert not self.is_user_member_of_group(user2, group1)
 -            assert msg in result.stdout_text
 -
         finally:
             # testcase cleanup
             self.remove_user_automember(user2, raiseonerr=False)
@@ -248,11 +265,27 @@ class TestAutounmembership(IntegrationTest):
             result = self.master.run_command(
                 ['ipa', 'automember-rebuild', '--hosts=%s' % host2]
             )
 +            assert msg in result.stdout_text
 +
 +            # The additional --cleanup argument is required
 +            cleanup_ldif = (
 +                "dn: cn={cn},cn=automember rebuild membership,"
 +                "cn=tasks,cn=config\n"
 +                "changetype: add\n"
 +                "objectclass: top\n"
 +                "objectclass: extensibleObject\n"
 +                "basedn: cn=computers,cn=accounts,{suffix}\n"
 +                "filter: (fqdn={fqdn})\n"
 +                "cleanup: yes\n"
 +                "scope: sub"
 +            ).format(cn=str(uuid.uuid4()),
 +                     suffix=str(self.master.domain.basedn),
 +                     fqdn=host2)
 +            tasks.ldapmodify_dm(self.master, cleanup_ldif)
 +
             assert self.is_host_member_of_hostgroup(host2, hostgroup2)
             assert not self.is_host_member_of_hostgroup(host2, hostgroup1)
 -            assert msg in result.stdout_text
 -
         finally:
             # testcase cleanup
             self.remove_host_automember(host2, raiseonerr=False)
 From 9b777390fbb6d4c683bf7d3e5f74d5443209b1d5 Mon Sep 17 00:00:00 2001
 From: Alexander Bokovoy <abokovoy@redhat.com>
 Date: Fri, 24 Mar 2023 08:15:00 +0200
 Subject: [PATCH] test_xmlrpc: adopt to automember plugin message changes in
 389-ds
 Another change in automember plugin messaging that breaks FreeIPA tests.
 Use common substring to match.
 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipatests/test_xmlrpc/xmlrpc_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py
 index cf11721bfca..5fe1245dc65 100644
 --- a/ipatests/test_xmlrpc/xmlrpc_test.py
 +++ b/ipatests/test_xmlrpc/xmlrpc_test.py
@@ -64,7 +64,7 @@ def test(xs):
 # Matches an automember task finish message
 fuzzy_automember_message = Fuzzy(
 -    r'^Automember rebuild task finished\. Processed \(\d+\) entries\.$'
 +    r'^Automember rebuild task finished\. Processed \(\d+\) entries'
 )
 # Matches trusted domain GUID, like u'463bf2be-3456-4a57-979e-120304f2a0eb'
 From 8e8b97a2251329aec9633a5c7c644bc5034bc8c2 Mon Sep 17 00:00:00 2001
 From: Sudhir Menon <sumenon@redhat.com>
 Date: Wed, 20 Mar 2024 14:29:46 +0530
 Subject: [PATCH] ipatests: Fixes for test_ipahealthcheck_ipansschainvalidation
 testcases.
 Currently the test is using IPA_NSSDB_PWDFILE_TXT which is /etc/ipa/nssdb/pwdfile.txt
 which causes error in STIG mode.
 [root@master slapd-TESTRELM-TEST]# certutil -M -n 'TESTRELM.TEST IPA CA' -t ',,' -d . -f /etc/ipa/nssdb/pwdfile.txt
 Incorrect password/PIN entered.
 Hence modified the test to include paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE/pwd.txt.
 Signed-off-by: Sudhir Menon <sumenon@redhat.com>
 Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
 ---
 ipatests/test_integration/test_ipahealthcheck.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 diff --git a/ipatests/test_integration/test_ipahealthcheck.py b/ipatests/test_integration/test_ipahealthcheck.py
 index 8aae9fad776..a96de7088aa 100644
 --- a/ipatests/test_integration/test_ipahealthcheck.py
 +++ b/ipatests/test_integration/test_ipahealthcheck.py
@@ -2731,17 +2731,18 @@ def remove_server_cert(self):
         Fixture to remove Server cert and revert the change.
         """
         instance = realm_to_serverid(self.master.domain.realm)
 +        instance_dir = paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % instance
         self.master.run_command(
             [
                 "certutil",
                 "-L",
                 "-d",
 -                paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % instance,
 +                instance_dir,
                 "-n",
                 "Server-Cert",
                 "-a",
                 "-o",
 -                paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % instance
 +                instance_dir
                 + "/Server-Cert.pem",
             ]
         )
@@ -2760,15 +2761,15 @@ def remove_server_cert(self):
             [
                 "certutil",
                 "-d",
 -                paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % instance,
 +                instance_dir,
                 "-A",
                 "-i",
 -                paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % instance
 +                instance_dir
                 + "/Server-Cert.pem",
                 "-t",
                 "u,u,u",
                 "-f",
 -                paths.IPA_NSSDB_PWDFILE_TXT,
 +                "%s/pwdfile.txt" % instance_dir,
                 "-n",
                 "Server-Cert",
             ]
--- a/SOURCES/0027-kdb-fix-vulnerability-in-GCD-rules-handling.patch
+++ b/SOURCES/0027-kdb-fix-vulnerability-in-GCD-rules-handling.patch
@ -1,341 +0,0 @@
 From 0a48726e104282fb40d8f471ebb306bc9134cb0c Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Tue, 19 Mar 2024 12:24:40 +0100
 Subject: [PATCH] kdb: fix vulnerability in GCD rules handling
 The initial implementation of MS-SFU by MIT Kerberos was missing some
 a condition for granting the "forwardable" flag on S4U2Self tickets.
 Fixing this mistake required to add a special case for the
 check_allowed_to_delegate() function: if the target service argument is
 NULL, then it means the KDC is probing for general constrained
 delegation rules, not actually checking a specific S4U2Proxy request.
 In commit e86807b5, the behavior of ipadb_match_acl() was modified to
 match the changes from upstream MIT Kerberos a441fbe3. However, a
 mistake resulted in this mechanism to apply in cases where target
 service argument is set AND unset. This results in S4U2Proxy requests to
 be accepted regardless of the fact there is a matching service
 delegation rule or not.
 This vulnerability does not affect services having RBCD (resource-based
 constrained delegation) rules.
 This fixes CVE-2024-2698
 Signed-off-by: Julien Rische <jrische@redhat.com>
 ---
 daemons/ipa-kdb/README.s4u2proxy.txt |  19 ++-
 daemons/ipa-kdb/ipa_kdb_delegation.c | 191 +++++++++++++++------------
 2 files changed, 118 insertions(+), 92 deletions(-)
 diff --git a/daemons/ipa-kdb/README.s4u2proxy.txt b/daemons/ipa-kdb/README.s4u2proxy.txt
 index 254fcc4d1..ab34aff36 100644
 --- a/daemons/ipa-kdb/README.s4u2proxy.txt
 +++ b/daemons/ipa-kdb/README.s4u2proxy.txt
@@ -12,9 +12,7 @@ much more easily managed.
 The grouping mechanism has been built so that lookup is highly optimized
 and is basically reduced to a single search that uses the derefernce
 -control. Speed is very important in this case because KDC operations
 -time out very quickly and unless we add a caching layer in ipa-kdb we
 -must keep the number of searches down to avoid client timeouts.
 +control.
 The grouping mechanism is very simple a groupOfPrincipals object is
 introduced, this Auxiliary class have a single optional attribute called
@@ -112,8 +110,7 @@ kinit -kt /etc/httpd/conf/ipa.keytab HTTP/ipaserver.example.com
 kvno -U admin HTTP/ipaserver.example.com
 # Perform S4U2Proxy
 -kvno -k /etc/httpd/conf/ipa.keytab -U admin -P HTTP/ipaserver.example.com
 -ldap/ipaserver.example.com
 +kvno -U admin -P ldap/ipaserver.example.com
 If this works it means you successfully impersonated the admin user with
@@ -125,6 +122,18 @@ modprinc -ok_to_auth_as_delegate HTTP/ipaserver.example.com
 Simo.
 +If IPA is compiled with krb5 1.20 and newer (KDB DAL >= 9), then the
 +behavior of S4U2Self changes: S4U2Self TGS-REQs produce forwardable
 +tickets for all requesters, except if the requester principal is set as
 +the proxy (impersonating service) in at least one `servicedelegation`
 +rule. In this case, even if the rule has no target, the KDC will
 +response to S4U2Self requests with a non-forwardable ticket. Hence,
 +granting the `ok_to_auth_as_delegate` permission to the proxy service
 +remains the only way for this service to obtain the evidence ticket
 +required for general constrained delegation requests if this ticket is
 +not provided by the client.
 +
 +
 [1]
 Note that here I use the term proxy in a different way than it is used in
 the krb interfaces. It may seem a bit confusing but I think people will
 diff --git a/daemons/ipa-kdb/ipa_kdb_delegation.c b/daemons/ipa-kdb/ipa_kdb_delegation.c
 index de82174ad..3581f3c79 100644
 --- a/daemons/ipa-kdb/ipa_kdb_delegation.c
 +++ b/daemons/ipa-kdb/ipa_kdb_delegation.c
@@ -91,120 +91,110 @@ static bool ipadb_match_member(char *princ, LDAPDerefRes *dres)
     return false;
 }
 -static krb5_error_code ipadb_match_acl(krb5_context kcontext,
 -                                       LDAPMessage *results,
 -                                       krb5_const_principal client,
 -                                       krb5_const_principal target)
 +#if KRB5_KDB_DAL_MAJOR_VERSION >= 9
 +static krb5_error_code
 +ipadb_has_acl(krb5_context kcontext, LDAPMessage *ldap_acl, bool *res)
 {
     struct ipadb_context *ipactx;
 -    krb5_error_code kerr;
 -    LDAPMessage *lentry;
 -    LDAPDerefRes *deref_results;
 -    LDAPDerefRes *dres;
 -    char *client_princ = NULL;
 -    char *target_princ = NULL;
 -    bool client_missing;
 -    bool client_found;
 -    bool target_found;
 -    bool is_constraint_delegation = false;
 -    size_t nrules = 0;
 -    int ret;
 +    bool in_res = false;
 +    krb5_error_code kerr = 0;
     ipactx = ipadb_get_context(kcontext);
 -    if (!ipactx) {
 +    if (!ipactx)
         return KRB5_KDB_DBNOTINITED;
 -    }
 -    if ((client != NULL) && (target != NULL)) {
 -        kerr = krb5_unparse_name(kcontext, client, &client_princ);
 -        if (kerr != 0) {
 -            goto done;
 -        }
 -        kerr = krb5_unparse_name(kcontext, target, &target_princ);
 -        if (kerr != 0) {
 -            goto done;
 -        }
 -    } else {
 -        is_constraint_delegation = true;
 +    switch (ldap_count_entries(ipactx->lcontext, ldap_acl)) {
 +    case 0:
 +        break;
 +    case -1:
 +        kerr = EINVAL;
 +        goto end;
 +    default:
 +        in_res = true;
 +        goto end;
     }
 -    lentry = ldap_first_entry(ipactx->lcontext, results);
 -    if (!lentry) {
 -        kerr = ENOENT;
 -        goto done;
 -    }
 +end:
 +    if (res)
 +        *res = in_res;
 +
 +    return kerr;
 +}
 +#endif
 +
 +static krb5_error_code
 +ipadb_match_acl(krb5_context kcontext, LDAPMessage *ldap_acl,
 +                krb5_const_principal client, krb5_const_principal target)
 +{
 +    struct ipadb_context *ipactx;
 +    LDAPMessage *rule;
 +    LDAPDerefRes *acis, *aci;
 +    char *client_princ = NULL, *target_princ= NULL;
 +    bool client_missing, client_found, target_found;
 +    int lerr;
 +    krb5_error_code kerr;
 +
 +    ipactx = ipadb_get_context(kcontext);
 +    if (!ipactx)
 +        return KRB5_KDB_DBNOTINITED;
 +
 +    kerr = krb5_unparse_name(kcontext, client, &client_princ);
 +    if (kerr)
 +        goto end;
 +
 +    kerr = krb5_unparse_name(kcontext, target, &target_princ);
 +    if (kerr)
 +        goto end;
     /* the default is that we fail */
 -    kerr = ENOENT;
 +    kerr = KRB5KDC_ERR_BADOPTION;
 -    while (lentry) {
 +    for (rule = ldap_first_entry(ipactx->lcontext, ldap_acl);
 +         rule;
 +         rule = ldap_next_entry(ipactx->lcontext, rule))
 +    {
         /* both client and target must be found in the same ACI */
         client_missing = true;
         client_found = false;
         target_found = false;
 -        ret = ipadb_ldap_deref_results(ipactx->lcontext, lentry,
 -                                       &deref_results);
 -        switch (ret) {
 +        lerr = ipadb_ldap_deref_results(ipactx->lcontext, rule, &acis);
 +        switch (lerr) {
         case 0:
 -            for (dres = deref_results; dres; dres = dres->next) {
 -                nrules++;
 -                if (is_constraint_delegation) {
 -                    /*
 -                        Microsoft revised the S4U2Proxy rules for forwardable
 -                        tickets.  All S4U2Proxy operations require forwardable
 -                        evidence tickets, but S4U2Self should issue a
 -                        forwardable ticket if the requesting service has no
 -                        ok-to-auth-as-delegate bit but also no constrained
 -                        delegation privileges for traditional S4U2Proxy.
 -                        Implement these rules, extending the
 -                        check_allowed_to_delegate() DAL method so that the KDC
 -                        can ask if a principal has any delegation privileges.
 -
 -                        Since target principal is NULL and client principal is
 -                        NULL in this case, we simply calculate number of rules associated
 -                        with the server principal to decide whether to deny forwardable bit
 -                    */
 -                    continue;
 -                }
 -                if (client_found == false &&
 -                    strcasecmp(dres->derefAttr, "ipaAllowToImpersonate") == 0) {
 +            for (aci = acis; aci; aci = aci->next) {
 +                if (!client_found &&
 +                    0 == strcasecmp(aci->derefAttr, "ipaAllowToImpersonate"))
 +                {
                     /* NOTE: client_missing is used to signal that the
                      * attribute was completely missing. This signals that
                      * ANY client is allowed to be impersonated.
                      * This logic is valid only for clients, not for targets */
                     client_missing = false;
 -                    client_found = ipadb_match_member(client_princ, dres);
 +                    client_found = ipadb_match_member(client_princ, aci);
                 }
 -                if (target_found == false &&
 -                    strcasecmp(dres->derefAttr, "ipaAllowedTarget") == 0) {
 -                    target_found = ipadb_match_member(target_princ, dres);
 +                if (!target_found &&
 +                    0 == strcasecmp(aci->derefAttr, "ipaAllowedTarget"))
 +                {
 +                    target_found = ipadb_match_member(target_princ, aci);
                 }
             }
 -            ldap_derefresponse_free(deref_results);
 +            ldap_derefresponse_free(acis);
             break;
         case ENOENT:
             break;
         default:
 -            kerr = ret;
 -            goto done;
 +            kerr = lerr;
 +            goto end;
         }
 -        if ((client_found == true || client_missing == true) &&
 -            target_found == true) {
 +        if ((client_found || client_missing) && target_found) {
             kerr = 0;
 -            goto done;
 +            goto end;
         }
 -
 -        lentry = ldap_next_entry(ipactx->lcontext, lentry);
 -    }
 -
 -    if (nrules > 0) {
 -        kerr = 0;
     }
 -done:
 +end:
     krb5_free_unparsed_name(kcontext, client_princ);
     krb5_free_unparsed_name(kcontext, target_princ);
     return kerr;
@@ -223,7 +213,7 @@ krb5_error_code ipadb_check_allowed_to_delegate(krb5_context kcontext,
     char *srv_principal = NULL;
     krb5_db_entry *proxy_entry = NULL;
     struct ipadb_e_data *ied_server, *ied_proxy;
 -    LDAPMessage *res = NULL;
 +    LDAPMessage *ldap_gcd_acl = NULL;
     if (proxy != NULL) {
         /* Handle the case where server == proxy, this is allowed in S4U */
@@ -261,26 +251,53 @@ krb5_error_code ipadb_check_allowed_to_delegate(krb5_context kcontext,
         goto done;
     }
 -    kerr = ipadb_get_delegation_acl(kcontext, srv_principal, &res);
 +    /* Load general constrained delegation rules */
 +    kerr = ipadb_get_delegation_acl(kcontext, srv_principal, &ldap_gcd_acl);
     if (kerr) {
         goto done;
     }
 -    kerr = ipadb_match_acl(kcontext, res, client, proxy);
 -    if (kerr) {
 -        goto done;
 +#if KRB5_KDB_DAL_MAJOR_VERSION >= 9
 +    /*
 +     * Microsoft revised the S4U2Proxy rules for forwardable tickets.  All
 +     * S4U2Proxy operations require forwardable evidence tickets, but
 +     * S4U2Self should issue a forwardable ticket if the requesting service
 +     * has no ok-to-auth-as-delegate bit but also no constrained delegation
 +     * privileges for traditional S4U2Proxy.  Implement these rules,
 +     * extending the check_allowed_to_delegate() DAL method so that the KDC
 +     * can ask if a principal has any delegation privileges.
 +     *
 +     * If target service principal is NULL, and the impersonating service has
 +     * at least one GCD rule, then succeed.
 +     */
 +    if (!proxy) {
 +        bool has_gcd_rules;
 +
 +        kerr = ipadb_has_acl(kcontext, ldap_gcd_acl, &has_gcd_rules);
 +        if (!kerr)
 +            kerr = has_gcd_rules ? 0 : KRB5KDC_ERR_BADOPTION;
 +    } else if (client) {
 +#else
 +    if (client && proxy) {
 +#endif
 +        kerr = ipadb_match_acl(kcontext, ldap_gcd_acl, client, proxy);
 +    } else {
 +        /* client and/or proxy is missing */
 +        kerr = KRB5KDC_ERR_BADOPTION;
     }
 +    if (kerr)
 +        goto done;
 done:
     if (kerr) {
 -#if KRB5_KDB_DAL_MAJOR_VERSION < 9
 -        kerr = KRB5KDC_ERR_POLICY;
 -#else
 +#if KRB5_KDB_DAL_MAJOR_VERSION >= 9
         kerr = KRB5KDC_ERR_BADOPTION;
 +#else
 +        kerr = KRB5KDC_ERR_POLICY;
 #endif
     }
     ipadb_free_principal(kcontext, proxy_entry);
     krb5_free_unparsed_name(kcontext, srv_principal);
 -    ldap_msgfree(res);
 +    ldap_msgfree(ldap_gcd_acl);
     return kerr;
 }
 -- 
 2.44.0
--- a/SOURCES/0028-kdb-apply-combinatorial-logic-for-ticket-flags.patch
+++ b/SOURCES/0028-kdb-apply-combinatorial-logic-for-ticket-flags.patch
@ -1,615 +0,0 @@
 From 542e12325afc2f64298f90296760235bfdcef04a Mon Sep 17 00:00:00 2001
 From: Julien Rische <jrische@redhat.com>
 Date: Mon, 25 Mar 2024 18:25:52 +0200
 Subject: [PATCH] kdb: apply combinatorial logic for ticket flags
 The initial design for ticket flags was implementing this logic:
 * If a ticket policy is defined for the principal entry, use flags from
  this policy if they are set. Otherwise, use default ticket flags.
 * If no ticket policy is defined for the principal entry, but there is a
  global one, use flags from the global ticket policy if they are set.
  Otherwise, use default ticket flags.
 * If no policy (principal nor global) is defined, use default ticket
  flags.
 However, this logic was broken by a1165ffb which introduced creation of
 a principal-level ticket policy in case the ticket flag set is modified.
 This was typically the case for the -allow_tix flag, which was set
 virtually by the KDB driver when a user was locked until they initialize
 their password on first kinit pre-authentication.
 This was causing multiple issues, which are mitigated by the new
 approach:
 Now flags from each level are combined together. There flags like
 +requires_preauth which are set systematically by the KDB diver, as
 well as -allow_tix which is set based on the value of "nsAccountLock".
 This commit also adds the implicit -allow_svr ticket flag for user
 principals to protect users against Kerberoast-type attacks. None of
 these flags are stored in the LDAP database, they are hard-coded in the
 KDB driver.
 In addition to these "virtual" ticket flags, flags from both global and
 principal ticket policies are applied (if these policies exist).
 Principal ticket policies are not supported for hosts and services, but
 this is only an HTTP API limitation. The "krbTicketPolicyAux" object
 class is supported for all account types. This is required for ticket
 flags like +ok_to_auth_as_delegate. Such flags can be set using "ipa
 host-mod" and "ipa serivce-mod", or using kadmin's "modprinc".
 It is possible to ignore flags from the global ticket policy or default
 flags like -allow_svr for a user principal by setting the
 "final_user_tkt_flags" string attribute to "true" in kadmin. In this
 case, any ticket flag can be configured in the principal ticket policy,
 except requires_preauth and allow_tix.
 When in IPA setup mode (using the "ipa-setup-override-restrictions" KDB
 argument), all the system described above is disabled and ticket flags
 are written in the principal ticket policy as they are provided. This is
 required to initialize the Kerberos LDAP container during IPA server
 installation.
 This fixes CVE-2024-3183
 Signed-off-by: Julien Rische <jrische@redhat.com>
 ---
 daemons/ipa-kdb/ipa_kdb.h            |  43 ++++
 daemons/ipa-kdb/ipa_kdb_principals.c | 353 +++++++++++++++++++++++----
 util/ipa_krb5.c                      |  18 ++
 util/ipa_krb5.h                      |   4 +
 4 files changed, 365 insertions(+), 53 deletions(-)
 diff --git a/daemons/ipa-kdb/ipa_kdb.h b/daemons/ipa-kdb/ipa_kdb.h
 index 7baf4697f..85cabe142 100644
 --- a/daemons/ipa-kdb/ipa_kdb.h
 +++ b/daemons/ipa-kdb/ipa_kdb.h
@@ -94,6 +94,34 @@
 #define IPA_KRB_AUTHZ_DATA_ATTR "ipaKrbAuthzData"
 #define IPA_USER_AUTH_TYPE "ipaUserAuthType"
 +/* Virtual managed ticket flags like "-allow_tix", are always controlled by the
 + * "nsAccountLock" attribute, such flags should never be set in the database.
 + * The following expression combine all of them, and is used to filter them
 + * out. */
 +#define IPA_KDB_TKTFLAGS_VIRTUAL_MANAGED_ALL          (KRB5_KDB_DISALLOW_ALL_TIX)
 +
 +/* Virtual static ticket flags are hard-coded in the KDB driver. */
 +/*   Virtual static mandatory flags are set systematically and implicitly for all
 + *   principals. They are filtered out from database ticket flags updates.
 + *   (However, "KRB5_KDB_REQUIRES_PRE_AUTH" can still be unset by the
 + *   "KDC:Disable Default Preauth for SPNs" global setting) */
 +#define IPA_KDB_TKTFLAGS_VIRTUAL_STATIC_MANDATORY     (KRB5_KDB_REQUIRES_PRE_AUTH)
 +/*   Virtual static default ticket flags are implicitly set for user and non-user
 + *   (SPN) principals, and not stored in the database.
 + *   (Except if the "IPA_KDB_STRATTR_FINAL_TKTFLAGS" string attribute is "true"
 + *   the principal) */
 +/*     Virtual static default user ticket flags are set for users only. The
 + *     "-allow_svr" flag is set to protect them from CVE-2024-3183. */
 +#define IPA_KDB_TKTFLAGS_VIRTUAL_STATIC_DEFAULTS_USER (KRB5_KDB_DISALLOW_SVR)
 +#define IPA_KDB_TKTFLAGS_VIRTUAL_STATIC_DEFAULTS_SPN  (0)
 +
 +/* If this string attribute is set to "true", then only the virtual managed and
 + * virtual static mandatory ticket flags are applied and filtered out from
 + * database read and write operations for the concerned user principal.
 + * Configurable principal ticket flags are applied, but not the configurable
 + * global ticket policy flags. */
 +#define IPA_KDB_STRATTR_FINAL_USER_TKTFLAGS "final_user_tkt_flags"
 +
 struct ipadb_mspac;
 struct dom_sid;
@@ -178,6 +206,21 @@ struct ipadb_e_data {
     struct dom_sid *sid;
 };
 +inline static krb5_error_code
 +ipadb_get_edata(krb5_db_entry *entry, struct ipadb_e_data **ied)
 +{
 +    struct ipadb_e_data *in_ied;
 +
 +    in_ied = (struct ipadb_e_data *)entry->e_data;
 +    if (!in_ied || in_ied->magic != IPA_E_DATA_MAGIC)
 +        return EINVAL;
 +
 +    if (ied)
 +        *ied = in_ied;
 +
 +    return 0;
 +}
 +
 struct ipadb_context *ipadb_get_context(krb5_context kcontext);
 int ipadb_get_connection(struct ipadb_context *ipactx);
 diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c
 index 07cc87746..6eb542d4f 100644
 --- a/daemons/ipa-kdb/ipa_kdb_principals.c
 +++ b/daemons/ipa-kdb/ipa_kdb_principals.c
@@ -706,9 +706,12 @@ static krb5_error_code ipadb_parse_ldap_entry(krb5_context kcontext,
                                  "krbTicketFlags", &result);
     if (ret == 0) {
         entry->attributes = result;
 -    } else {
 -        *polmask |= TKTFLAGS_BIT;
     }
 +    /* Since principal, global policy, and virtual ticket flags are combined,
 +     * they must always be resolved, except if we are in IPA setup mode (because
 +     * ticket policies and virtual ticket flags are irrelevant in this case). */
 +    if (!ipactx->override_restrictions)
 +        *polmask |= TKTFLAGS_BIT;
     ret = ipadb_ldap_attr_to_int(lcontext, lentry,
                                  "krbMaxTicketLife", &result);
@@ -912,7 +915,12 @@ static krb5_error_code ipadb_parse_ldap_entry(krb5_context kcontext,
         goto done;
     }
     if (ret == 0) {
 -        ied->ipa_user = true;
 +        if (1 == krb5_princ_size(kcontext, entry->princ)) {
 +            /* A principal must be a POSIX account AND have only one element to
 +             * be considered a user (this is to filter out CIFS principals). */
 +            ied->ipa_user = true;
 +        }
 +
         ret = ipadb_ldap_attr_to_str(lcontext, lentry,
                                      "uid", &uidstring);
         if (ret != 0 && ret != ENOENT) {
@@ -1251,23 +1259,150 @@ done:
     return ret;
 }
 -static krb5_flags maybe_require_preauth(struct ipadb_context *ipactx,
 -                                        krb5_db_entry *entry)
 +static krb5_error_code
 +are_final_tktflags(struct ipadb_context *ipactx, krb5_db_entry *entry,
 +                   bool *final_tktflags)
 {
 -    const struct ipadb_global_config *config;
 +    krb5_error_code kerr;
     struct ipadb_e_data *ied;
 +    char *str = NULL;
 +    bool in_final_tktflags = false;
 -    config = ipadb_get_global_config(ipactx);
 -    if (config && config->disable_preauth_for_spns) {
 -        ied = (struct ipadb_e_data *)entry->e_data;
 -        if (ied && ied->ipa_user != true) {
 -            /* not a user, assume SPN */
 -            return 0;
 -        }
 +    kerr = ipadb_get_edata(entry, &ied);
 +    if (kerr)
 +        goto end;
 +
 +    if (!ied->ipa_user) {
 +        kerr = 0;
 +        goto end;
     }
 -    /* By default require preauth for all principals */
 -    return KRB5_KDB_REQUIRES_PRE_AUTH;
 +    kerr = krb5_dbe_get_string(ipactx->kcontext, entry,
 +                               IPA_KDB_STRATTR_FINAL_USER_TKTFLAGS, &str);
 +    if (kerr)
 +        goto end;
 +
 +    in_final_tktflags = str && ipa_krb5_parse_bool(str);
 +
 +end:
 +    if (final_tktflags)
 +        *final_tktflags = in_final_tktflags;
 +
 +    krb5_dbe_free_string(ipactx->kcontext, str);
 +    return kerr;
 +}
 +
 +static krb5_error_code
 +add_virtual_static_tktflags(struct ipadb_context *ipactx, krb5_db_entry *entry,
 +                            krb5_flags *tktflags)
 +{
 +    krb5_error_code kerr;
 +    krb5_flags vsflg;
 +    bool final_tktflags;
 +    const struct ipadb_global_config *gcfg;
 +    struct ipadb_e_data *ied;
 +
 +    vsflg = IPA_KDB_TKTFLAGS_VIRTUAL_STATIC_MANDATORY;
 +
 +    kerr = ipadb_get_edata(entry, &ied);
 +    if (kerr)
 +        goto end;
 +
 +    kerr = are_final_tktflags(ipactx, entry, &final_tktflags);
 +    if (kerr)
 +        goto end;
 +
 +    /* In practice, principal ticket flags cannot be final for SPNs. */
 +    if (!final_tktflags)
 +        vsflg |= ied->ipa_user ? IPA_KDB_TKTFLAGS_VIRTUAL_STATIC_DEFAULTS_USER
 +                               : IPA_KDB_TKTFLAGS_VIRTUAL_STATIC_DEFAULTS_SPN;
 +
 +    if (!ied->ipa_user) {
 +        gcfg = ipadb_get_global_config(ipactx);
 +        if (gcfg && gcfg->disable_preauth_for_spns)
 +            vsflg &= ~KRB5_KDB_REQUIRES_PRE_AUTH;
 +    }
 +
 +    if (tktflags)
 +        *tktflags |= vsflg;
 +
 +end:
 +    return kerr;
 +}
 +
 +static krb5_error_code
 +get_virtual_static_tktflags_mask(struct ipadb_context *ipactx,
 +                                 krb5_db_entry *entry, krb5_flags *mask)
 +{
 +    krb5_error_code kerr;
 +    krb5_flags flags = IPA_KDB_TKTFLAGS_VIRTUAL_MANAGED_ALL;
 +
 +    kerr = add_virtual_static_tktflags(ipactx, entry, &flags);
 +    if (kerr)
 +        goto end;
 +
 +    if (mask)
 +        *mask = ~flags;
 +
 +    kerr = 0;
 +
 +end:
 +    return kerr;
 +}
 +
 +/* Add ticket flags from the global ticket policy if it exists, otherwise
 + * succeed. If the global ticket policy is set, the "exists" parameter is set to
 + * true. */
 +static krb5_error_code
 +add_global_ticket_policy_flags(struct ipadb_context *ipactx,
 +                               bool *gtpol_exists, krb5_flags *tktflags)
 +{
 +    krb5_error_code kerr;
 +    char *policy_dn;
 +    char *tktflags_attr[] = { "krbticketflags", NULL };
 +    LDAPMessage *res = NULL, *first;
 +    int ec, ldap_tktflags;
 +    bool in_gtpol_exists = false;
 +
 +    ec = asprintf(&policy_dn, "cn=%s,cn=kerberos,%s", ipactx->realm,
 +                  ipactx->base);
 +    if (-1 == ec) {
 +        kerr = ENOMEM;
 +        goto end;
 +    }
 +
 +    kerr = ipadb_simple_search(ipactx, policy_dn, LDAP_SCOPE_BASE,
 +                               "(objectclass=krbticketpolicyaux)",
 +                               tktflags_attr, &res);
 +    if (kerr) {
 +        if (KRB5_KDB_NOENTRY == kerr)
 +            kerr = 0;
 +        goto end;
 +    }
 +
 +    first = ldap_first_entry(ipactx->lcontext, res);
 +    if (!first) {
 +        kerr = 0;
 +        goto end;
 +    }
 +
 +    in_gtpol_exists = true;
 +
 +    ec = ipadb_ldap_attr_to_int(ipactx->lcontext, first, "krbticketflags",
 +                                &ldap_tktflags);
 +    if (0 == ec && tktflags) {
 +        *tktflags |= (krb5_flags)ldap_tktflags;
 +    }
 +
 +    kerr = 0;
 +
 +end:
 +    if (gtpol_exists)
 +        *gtpol_exists = in_gtpol_exists;
 +
 +    ldap_msgfree(res);
 +    free(policy_dn);
 +    return kerr;
 }
 static krb5_error_code ipadb_fetch_tktpolicy(krb5_context kcontext,
@@ -1280,6 +1415,7 @@ static krb5_error_code ipadb_fetch_tktpolicy(krb5_context kcontext,
     char *policy_dn = NULL;
     LDAPMessage *res = NULL;
     LDAPMessage *first;
 +    bool final_tktflags, has_local_tktpolicy = true;
     int result;
     int ret;
@@ -1288,12 +1424,18 @@ static krb5_error_code ipadb_fetch_tktpolicy(krb5_context kcontext,
         return KRB5_KDB_DBNOTINITED;
     }
 +    kerr = are_final_tktflags(ipactx, entry, &final_tktflags);
 +    if (kerr)
 +        goto done;
 +
     ret = ipadb_ldap_attr_to_str(ipactx->lcontext, lentry,
                                  "krbticketpolicyreference", &policy_dn);
     switch (ret) {
     case 0:
         break;
     case ENOENT:
 +        /* If no principal ticket policy, fallback to the global one. */
 +        has_local_tktpolicy = false;
         ret = asprintf(&policy_dn, "cn=%s,cn=kerberos,%s",
                                    ipactx->realm, ipactx->base);
         if (ret == -1) {
@@ -1337,12 +1479,13 @@ static krb5_error_code ipadb_fetch_tktpolicy(krb5_context kcontext,
                 }
             }
             if (polmask & TKTFLAGS_BIT) {
 -                ret = ipadb_ldap_attr_to_int(ipactx->lcontext, first,
 -                                             "krbticketflags", &result);
 -                if (ret == 0) {
 -                    entry->attributes |= result;
 -                } else {
 -                    entry->attributes |= maybe_require_preauth(ipactx, entry);
 +                /* If global ticket policy is being applied, set flags only if
 +                 * user principal ticket flags are not final. */
 +                if (has_local_tktpolicy || !final_tktflags) {
 +                    ret = ipadb_ldap_attr_to_int(ipactx->lcontext, first,
 +                                                 "krbticketflags", &result);
 +                    if (ret == 0)
 +                        entry->attributes |= result;
                 }
             }
@@ -1366,13 +1509,27 @@ static krb5_error_code ipadb_fetch_tktpolicy(krb5_context kcontext,
         if (polmask & MAXRENEWABLEAGE_BIT) {
             entry->max_renewable_life = 604800;
         }
 -        if (polmask & TKTFLAGS_BIT) {
 -            entry->attributes |= maybe_require_preauth(ipactx, entry);
 -        }
         kerr = 0;
     }
 +    if (polmask & TKTFLAGS_BIT) {
 +        /* If the principal ticket flags were applied, then flags from the
 +         * global ticket policy has to be applied atop of them if user principal
 +         * ticket flags are not final. */
 +        if (has_local_tktpolicy && !final_tktflags) {
 +            kerr = add_global_ticket_policy_flags(ipactx, NULL,
 +                                                  &entry->attributes);
 +            if (kerr)
 +            goto done;
 +        }
 +
 +        /* Virtual static ticket flags are set regardless of database content */
 +        kerr = add_virtual_static_tktflags(ipactx, entry, &entry->attributes);
 +        if (kerr)
 +            goto done;
 +    }
 +
 done:
     ldap_msgfree(res);
     free(policy_dn);
@@ -1864,6 +2021,36 @@ static void ipadb_mods_free_tip(struct ipadb_mods *imods)
     imods->tip--;
 }
 +/* Use LDAP REPLACE operation to remove an attribute.
 + * Contrary to the DELETE operation, it will not fail if the attribute does not
 + * exist. */
 +static krb5_error_code
 +ipadb_ldap_replace_remove(struct ipadb_mods *imods, char *attribute)
 +{
 +    krb5_error_code kerr;
 +    LDAPMod *m = NULL;
 +
 +    kerr = ipadb_mods_new(imods, &m);
 +    if (kerr)
 +        return kerr;
 +
 +    m->mod_op = LDAP_MOD_REPLACE;
 +    m->mod_type = strdup(attribute);
 +    if (!m->mod_type) {
 +        kerr = ENOMEM;
 +        goto end;
 +    }
 +
 +    m->mod_values = NULL;
 +
 +    kerr = 0;
 +
 +end:
 +    if (kerr)
 +        ipadb_mods_free_tip(imods);
 +    return kerr;
 +}
 +
 static krb5_error_code ipadb_get_ldap_mod_str(struct ipadb_mods *imods,
                                               char *attribute, char *value,
                                               int mod_op)
@@ -2275,6 +2462,93 @@ static krb5_error_code ipadb_get_ldap_mod_auth_ind(krb5_context kcontext,
     return ret;
 }
 +static krb5_error_code
 +update_tktflags(krb5_context kcontext, struct ipadb_mods *imods,
 +                krb5_db_entry *entry, int mod_op)
 +{
 +    krb5_error_code kerr;
 +    struct ipadb_context *ipactx;
 +    struct ipadb_e_data *ied;
 +    bool final_tktflags;
 +    krb5_flags tktflags_mask;
 +    int tktflags;
 +
 +    ipactx = ipadb_get_context(kcontext);
 +    if (!ipactx) {
 +        kerr = KRB5_KDB_DBNOTINITED;
 +        goto end;
 +    }
 +
 +    if (ipactx->override_restrictions) {
 +        /* In IPA setup mode, IPA edata might not be available. In this mode,
 +         * ticket flags are written as they are provided. */
 +        tktflags = (int)entry->attributes;
 +    } else {
 +        kerr = ipadb_get_edata(entry, &ied);
 +        if (kerr)
 +            goto end;
 +
 +        kerr = get_virtual_static_tktflags_mask(ipactx, entry, &tktflags_mask);
 +        if (kerr)
 +            goto end;
 +
 +        kerr = are_final_tktflags(ipactx, entry, &final_tktflags);
 +        if (kerr)
 +            goto end;
 +
 +        /* Flags from the global ticket policy are filtered out only if the user
 +         * principal flags are not final. */
 +        if (!final_tktflags) {
 +            krb5_flags gbl_tktflags = 0;
 +
 +            kerr = add_global_ticket_policy_flags(ipactx, NULL, &gbl_tktflags);
 +            if (kerr)
 +                goto end;
 +
 +            tktflags_mask &= ~gbl_tktflags;
 +        }
 +
 +        tktflags = (int)(entry->attributes & tktflags_mask);
 +
 +        if (LDAP_MOD_REPLACE == mod_op && ied && !ied->has_tktpolaux) {
 +            if (0 == tktflags) {
 +                /* No point initializing principal ticket policy if there are no
 +                 * flags left after filtering out virtual and global ticket
 +                 * policy ones. */
 +                kerr = 0;
 +                goto end;
 +            }
 +
 +            /* if the object does not have the krbTicketPolicyAux class
 +             * we need to add it or this will fail, only for modifications.
 +             * We always add this objectclass by default when doing an add
 +             * from scratch. */
 +            kerr = ipadb_get_ldap_mod_str(imods, "objectclass",
 +                                          "krbTicketPolicyAux", LDAP_MOD_ADD);
 +            if (kerr)
 +                goto end;
 +        }
 +    }
 +
 +    if (tktflags != 0) {
 +        kerr = ipadb_get_ldap_mod_int(imods, "krbTicketFlags", tktflags,
 +                                      mod_op);
 +        if (kerr)
 +            goto end;
 +    } else if (LDAP_MOD_REPLACE == mod_op) {
 +        /* If the principal is not being created, and there are no custom ticket
 +         * flags to be set, remove the "krbTicketFlags" attribute. */
 +        kerr = ipadb_ldap_replace_remove(imods, "krbTicketFlags");
 +        if (kerr)
 +            goto end;
 +    }
 +
 +    kerr = 0;
 +
 +end:
 +    return kerr;
 +}
 +
 static krb5_error_code ipadb_entry_to_mods(krb5_context kcontext,
                                            struct ipadb_mods *imods,
                                            krb5_db_entry *entry,
@@ -2350,36 +2624,9 @@ static krb5_error_code ipadb_entry_to_mods(krb5_context kcontext,
     /* KADM5_ATTRIBUTES */
     if (entry->mask & KMASK_ATTRIBUTES) {
 -        /* if the object does not have the krbTicketPolicyAux class
 -         * we need to add it or this will fail, only for modifications.
 -         * We always add this objectclass by default when doing an add
 -         * from scratch. */
 -        if ((mod_op == LDAP_MOD_REPLACE) && entry->e_data) {
 -            struct ipadb_e_data *ied;
 -
 -            ied = (struct ipadb_e_data *)entry->e_data;
 -            if (ied->magic != IPA_E_DATA_MAGIC) {
 -                kerr = EINVAL;
 -                goto done;
 -            }
 -
 -            if (!ied->has_tktpolaux) {
 -                kerr = ipadb_get_ldap_mod_str(imods, "objectclass",
 -                                              "krbTicketPolicyAux",
 -                                              LDAP_MOD_ADD);
 -                if (kerr) {
 -                    goto done;
 -                }
 -            }
 -        }
 -
 -        kerr = ipadb_get_ldap_mod_int(imods,
 -                                      "krbTicketFlags",
 -                                      (int)entry->attributes,
 -                                      mod_op);
 -        if (kerr) {
 +        kerr = update_tktflags(kcontext, imods, entry, mod_op);
 +        if (kerr)
             goto done;
 -        }
     }
     /* KADM5_MAX_LIFE */
 diff --git a/util/ipa_krb5.c b/util/ipa_krb5.c
 index 1ba6d25ee..2e663c506 100644
 --- a/util/ipa_krb5.c
 +++ b/util/ipa_krb5.c
@@ -38,6 +38,12 @@ const char *ipapwd_password_max_len_errmsg = \
     TOSTR(IPAPWD_PASSWORD_MAX_LEN) \
     " chars)!";
 +/* Case-insensitive string values to by parsed as boolean true */
 +static const char *const conf_yes[] = {
 +    "y", "yes", "true", "t", "1", "on",
 +    NULL,
 +};
 +
 /* Salt types */
 #define KRB5P_SALT_SIZE 16
@@ -1237,3 +1243,15 @@ done:
     }
     return ret;
 }
 +
 +bool ipa_krb5_parse_bool(const char *str)
 +{
 +    const char *const *p;
 +
 +    for (p = conf_yes; *p; p++) {
 +        if (!strcasecmp(*p, str))
 +            return true;
 +    }
 +
 +    return false;
 +}
 diff --git a/util/ipa_krb5.h b/util/ipa_krb5.h
 index 7d2ebae98..d0280940a 100644
 --- a/util/ipa_krb5.h
 +++ b/util/ipa_krb5.h
@@ -174,3 +174,7 @@ static inline bool
 krb5_ts_after(krb5_timestamp a, krb5_timestamp b) {
     return (uint32_t)a > (uint32_t)b;
 }
 +
 +/* Implement boolean string parsing function from MIT krb5:
 + * src/lib/krb5/krb/libdef_parse.c:_krb5_conf_boolean() */
 +bool ipa_krb5_parse_bool(const char *str);
 -- 
 2.45.1
--- a/SOURCES/0029-Allow_the_admin_user_to_be_disabled_rhel#34756.patch
+++ b/SOURCES/0029-Allow_the_admin_user_to_be_disabled_rhel#34756.patch
@ -1,127 +0,0 @@
 diff --git a/ipaserver/plugins/user.py b/ipaserver/plugins/user.py
 index 6f5e349..febc22f 100644
 --- a/ipaserver/plugins/user.py
 +++ b/ipaserver/plugins/user.py
@@ -144,8 +144,7 @@ PROTECTED_USERS = ('admin',)
 def check_protected_member(user, protected_group_name=u'admins'):
     '''
     Ensure admin and the last enabled member of a protected group cannot
 -    be deleted or disabled by raising ProtectedEntryError or
 -    LastMemberError as appropriate.
 +    be deleted.
     '''
     if user in PROTECTED_USERS:
@@ -155,6 +154,12 @@ def check_protected_member(user, protected_group_name=u'admins'):
             reason=_("privileged user"),
         )
 +
 +def check_last_member(user, protected_group_name=u'admins'):
 +    '''
 +    Ensure the last enabled member of a protected group cannot
 +    be disabled.
 +    '''
     # Get all users in the protected group
     result = api.Command.user_find(in_group=protected_group_name)
@@ -796,6 +801,7 @@ class user_del(baseuser_del):
         # If the target entry is a Delete entry, skip the orphaning/removal
         # of OTP tokens.
         check_protected_member(keys[-1])
 +        check_last_member(keys[-1])
         preserve = options.get('preserve', False)
@@ -1128,7 +1134,7 @@ class user_disable(LDAPQuery):
     def execute(self, *keys, **options):
         ldap = self.obj.backend
 -        check_protected_member(keys[-1])
 +        check_last_member(keys[-1])
         dn, _oc = self.obj.get_either_dn(*keys, **options)
         ldap.deactivate_entry(dn)
 diff --git a/ipatests/test_integration/test_commands.py b/ipatests/test_integration/test_commands.py
 index c0cb4d0..c2a55b8 100644
 --- a/ipatests/test_integration/test_commands.py
 +++ b/ipatests/test_integration/test_commands.py
@@ -1530,6 +1530,30 @@ class TestIPACommand(IntegrationTest):
         assert 'Discovered server %s' % self.master.hostname in result
 +    def test_delete_last_enabled_admin(self):
 +        """
 +        The admin user may be disabled. Don't allow all other
 +        members of admins to be removed if the admin user is
 +        disabled which would leave the install with no
 +        usable admins users
 +        """
 +        user = 'adminuser2'
 +        passwd = 'Secret123'
 +        tasks.create_active_user(self.master, user, passwd)
 +        tasks.kinit_admin(self.master)
 +        self.master.run_command(['ipa', 'group-add-member', 'admins',
 +                                '--users', user])
 +        tasks.kinit_user(self.master, user, passwd)
 +        self.master.run_command(['ipa', 'user-disable', 'admin'])
 +        result = self.master.run_command(
 +            ['ipa', 'user-del', user],
 +            raiseonerr=False
 +        )
 +        self.master.run_command(['ipa', 'user-enable', 'admin'])
 +        tasks.kdestroy_all(self.master)
 +        assert result.returncode == 1
 +        assert 'cannot be deleted or disabled' in result.stderr_text
 +
 class TestIPACommandWithoutReplica(IntegrationTest):
     """
 diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py
 index 3c58845..68c6c48 100644
 --- a/ipatests/test_xmlrpc/test_user_plugin.py
 +++ b/ipatests/test_xmlrpc/test_user_plugin.py
@@ -1045,8 +1045,8 @@ class TestAdmins(XMLRPC_test):
         tracker = Tracker()
         command = tracker.make_command('user_disable', admin1)
 -        with raises_exact(errors.ProtectedEntryError(label=u'user',
 -                          key=admin1, reason='privileged user')):
 +        with raises_exact(errors.LastMemberError(label=u'group',
 +                          key=admin1, container=admin_group)):
             command()
     def test_create_admin2(self, admin2):
@@ -1064,8 +1064,8 @@ class TestAdmins(XMLRPC_test):
         admin2.disable()
         tracker = Tracker()
 -        with raises_exact(errors.ProtectedEntryError(label=u'user',
 -                          key=admin1, reason='privileged user')):
 +        with raises_exact(errors.LastMemberError(label=u'group',
 +                          key=admin1, container=admin_group)):
             tracker.run_command('user_disable', admin1)
         admin2.delete()
 diff --git a/ipatests/test_webui/test_user.py b/ipatests/test_webui/test_user.py
 index a8a92d0..9083e50 100644
 --- a/ipatests/test_webui/test_user.py
 +++ b/ipatests/test_webui/test_user.py
@@ -50,6 +50,8 @@ INV_FIRSTNAME = ("invalid 'first': Leading and trailing spaces are "
 FIELD_REQ = 'Required field'
 ERR_INCLUDE = 'may only include letters, numbers, _, -, . and $'
 ERR_MISMATCH = 'Passwords must match'
 +ERR_ADMIN_DISABLE = ('admin cannot be deleted or disabled because '
 +                     'it is the last member of group admins')
 ERR_ADMIN_DEL = ('user admin cannot be deleted/modified: privileged user')
 USR_EXIST = 'user with name "{}" already exists'
 ENTRY_EXIST = 'This entry already exists'
@@ -546,7 +548,7 @@ class test_user(user_tasks):
         self.select_record('admin')
         self.facet_button_click('disable')
         self.dialog_button_click('ok')
 -        self.assert_last_error_dialog(ERR_ADMIN_DEL, details=True)
 +        self.assert_last_error_dialog(ERR_ADMIN_DISABLE, details=True)
         self.dialog_button_click('ok')
         self.assert_record('admin')
--- a/SOURCES/0030-ipa-otptoken-import-open-the-key-file-in-binary-mode_rhel#39616.patch
+++ b/SOURCES/0030-ipa-otptoken-import-open-the-key-file-in-binary-mode_rhel#39616.patch
@ -1,13 +0,0 @@
 diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py
 index b3f9347..75e8680 100644
 --- a/ipaserver/install/ipa_otptoken_import.py
 +++ b/ipaserver/install/ipa_otptoken_import.py
@@ -539,7 +539,7 @@ class OTPTokenImport(admintool.AdminTool):
             # Load the keyfile.
             keyfile = self.safe_options.keyfile
 -            with open(keyfile) as f:
 +            with open(keyfile, "rb") as f:
                 self.doc.setKey(f.read())
     def run(self):
--- a/SOURCES/0031-ipa-crlgen-manage-manage-the-cert-status-task-execution-time_rhel#30280.patch
+++ b/SOURCES/0031-ipa-crlgen-manage-manage-the-cert-status-task-execution-time_rhel#30280.patch
@ -1,114 +0,0 @@
 diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
 index 38693c9..35cec89 100644
 --- a/ipaserver/install/cainstance.py
 +++ b/ipaserver/install/cainstance.py
@@ -1327,6 +1327,8 @@ class CAInstance(DogtagInstance):
         generation master:
         - in CS.cfg ca.crl.MasterCRL.enableCRLCache=true
         - in CS.cfg ca.crl.MasterCRL.enableCRLUpdates=true
 +        - in CS.cfg ca.listenToCloneModifications=true
 +        - in CS.cfg ca.certStatusUpdateInterval != 0
         - in /etc/httpd/conf.d/ipa-pki-proxy.conf the RewriteRule
         ^/ipa/crl/MasterCRL.bin is disabled (commented or removed)
@@ -1342,15 +1344,30 @@ class CAInstance(DogtagInstance):
             updates = directivesetter.get_directive(
                 self.config, 'ca.crl.MasterCRL.enableCRLUpdates', '=')
             enableCRLUpdates = updates.lower() == 'true'
 +            listen = directivesetter.get_directive(
 +                self.config, 'ca.listenToCloneModifications', '=')
 +            enableToClone = listen.lower() == 'true'
 +            updateinterval = directivesetter.get_directive(
 +                self.config, 'ca.certStatusUpdateInterval', '=')
             # If the values are different, the config is inconsistent
 -            if enableCRLCache != enableCRLUpdates:
 +            if not (enableCRLCache == enableCRLUpdates == enableToClone):
                 raise InconsistentCRLGenConfigException(
                     "Configuration is inconsistent, please check "
 -                    "ca.crl.MasterCRL.enableCRLCache and "
 -                    "ca.crl.MasterCRL.enableCRLUpdates in {} and "
 +                    "ca.crl.MasterCRL.enableCRLCache, "
 +                    "ca.crl.MasterCRL.enableCRLUpdates and "
 +                    "ca.listenToCloneModifications in {} and "
                     "run ipa-crlgen-manage [enable|disable] to repair".format(
                         self.config))
 +            # If they are the same then we are the CRL renewal master. Ensure
 +            # the update task is configured.
 +            if enableCRLCache and updateinterval == '0':
 +                raise InconsistentCRLGenConfigException(
 +                    "Configuration is inconsistent, please check "
 +                    "ca.certStatusUpdateInterval in {}. It should "
 +                    "be either not present or not zero. Run "
 +                    "ipa-crlgen-manage [enable|disable] to repair".format(
 +                        self.config))
         except IOError:
             raise RuntimeError(
                 "Unable to read {}".format(self.config))
@@ -1407,6 +1424,11 @@ class CAInstance(DogtagInstance):
             str_value = str(setup_crlgen).lower()
             ds.set('ca.crl.MasterCRL.enableCRLCache', str_value)
             ds.set('ca.crl.MasterCRL.enableCRLUpdates', str_value)
 +            ds.set('ca.listenToCloneModifications', str_value)
 +            if setup_crlgen:
 +                ds.set('ca.certStatusUpdateInterval', None)
 +            else:
 +                ds.set('ca.certStatusUpdateInterval', '0')
         # Start pki-tomcat
         logger.info("Starting %s", self.service_name)
 diff --git a/ipatests/test_integration/test_crlgen_manage.py b/ipatests/test_integration/test_crlgen_manage.py
 index 2a733bd..c6f41eb 100644
 --- a/ipatests/test_integration/test_crlgen_manage.py
 +++ b/ipatests/test_integration/test_crlgen_manage.py
@@ -61,6 +61,16 @@ def check_crlgen_status(host, rc=0, msg=None, enabled=True, check_crl=False):
                         ext.value.crl_number)
                     assert number_msg in result.stdout_text
 +        try:
 +            value = get_CS_cfg_value(host, 'ca.certStatusUpdateInterval')
 +        except IOError:
 +            return
 +
 +        if enabled:
 +            assert value is None
 +        else:
 +            assert value == '0'
 +
 def check_crlgen_enable(host, rc=0, msg=None, check_crl=False):
     """Check ipa-crlgen-manage enable command
@@ -125,6 +135,23 @@ def break_crlgen_with_CS_cfg(host):
     check_crlgen_status(host, rc=1, msg="Configuration is inconsistent")
 +def get_CS_cfg_value(host, directive):
 +    """Retrieve and return the a directive from the CA CS.cfg
 +
 +       This returns None if the directives is not found.
 +    """
 +    content = host.get_file_contents(paths.CA_CS_CFG_PATH,
 +                                     encoding='utf-8')
 +    value = None
 +    for line in content.split('\n'):
 +        l = line.lower()
 +
 +        if l.startswith(directive.lower()):
 +            value = line.split('=', 1)[1]
 +
 +    return value
 +
 +
 class TestCRLGenManage(IntegrationTest):
     """Tests the ipa-crlgen-manage command.
@@ -196,6 +223,9 @@ class TestCRLGenManage(IntegrationTest):
         Install a CA clone and enable CRLgen"""
         tasks.install_ca(self.replicas[0])
 +        value = get_CS_cfg_value(self.replicas[0],
 +                                 'ca.certStatusUpdateInterval')
 +        assert value == '0'
         check_crlgen_enable(
             self.replicas[0], rc=0,
             msg="make sure to have only a single CRL generation master",
--- a/SOURCES/0032-idrange-add-add-a-warning-because-389ds-restart-is-required_rhel#28996.patch
+++ b/SOURCES/0032-idrange-add-add-a-warning-because-389ds-restart-is-required_rhel#28996.patch
@ -1,337 +0,0 @@
 diff --git a/ipaserver/plugins/idrange.py b/ipaserver/plugins/idrange.py
 index d5b184f..b38ea73 100644
 --- a/ipaserver/plugins/idrange.py
 +++ b/ipaserver/plugins/idrange.py
@@ -549,6 +549,12 @@ class idrange_add(LDAPCreate):
         self.obj.handle_ipabaserid(entry_attrs, options)
         self.obj.handle_iparangetype(entry_attrs, options,
                                      keep_objectclass=True)
 +        self.add_message(
 +            messages.ServiceRestartRequired(
 +                service=services.knownservices.dirsrv.service_instance(""),
 +                server=_('<all IPA servers>')
 +            )
 +        )
         return dn
 diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py
 index f912e04..e3f4c23 100644
 --- a/ipatests/test_xmlrpc/test_range_plugin.py
 +++ b/ipatests/test_xmlrpc/test_range_plugin.py
@@ -372,6 +372,8 @@ IPA_LOCAL_RANGE_MOD_ERR = (
     "domain. Run `ipa help idrange` for more information"
 )
 +dirsrv_instance = services.knownservices.dirsrv.service_instance("")
 +
 @pytest.mark.tier1
 class test_range(Declarative):
@@ -464,6 +466,11 @@ class test_range(Declarative):
                 ),
                 value=testrange1,
                 summary=u'Added ID range "%s"' % (testrange1),
 +                messages=(
 +                    messages.ServiceRestartRequired(
 +                        service=dirsrv_instance,
 +                        server='<all IPA servers>').to_dict(),
 +                ),
             ),
         ),
@@ -633,6 +640,11 @@ class test_range(Declarative):
                 ),
                 value=testrange2,
                 summary=u'Added ID range "%s"' % (testrange2),
 +                messages=(
 +                    messages.ServiceRestartRequired(
 +                        service=dirsrv_instance,
 +                        server='<all IPA servers>').to_dict(),
 +                ),
             ),
         ),
@@ -792,6 +804,11 @@ class test_range(Declarative):
                 ),
                 value=unicode(domain7range1),
                 summary=u'Added ID range "%s"' % (domain7range1),
 +                messages=(
 +                    messages.ServiceRestartRequired(
 +                        service=dirsrv_instance,
 +                        server='<all IPA servers>').to_dict(),
 +                ),
             ),
         ),
@@ -1079,6 +1096,11 @@ class test_range(Declarative):
                 ),
                 value=testrange9,
                 summary=u'Added ID range "%s"' % (testrange9),
 +                messages=(
 +                    messages.ServiceRestartRequired(
 +                        service=dirsrv_instance,
 +                        server='<all IPA servers>').to_dict(),
 +                ),
             ),
         ),
 diff --git a/ipaserver/plugins/idrange.py b/ipaserver/plugins/idrange.py
 index b38ea73..b12e1b8 100644
 --- a/ipaserver/plugins/idrange.py
 +++ b/ipaserver/plugins/idrange.py
@@ -549,12 +549,15 @@ class idrange_add(LDAPCreate):
         self.obj.handle_ipabaserid(entry_attrs, options)
         self.obj.handle_iparangetype(entry_attrs, options,
                                      keep_objectclass=True)
 -        self.add_message(
 -            messages.ServiceRestartRequired(
 -                service=services.knownservices.dirsrv.service_instance(""),
 -                server=_('<all IPA servers>')
 +
 +        if entry_attrs.single_value.get('iparangetype') in (
 +                'ipa-local', self.obj.range_types.get('ipa-local', None)):
 +            self.add_message(
 +                messages.ServiceRestartRequired(
 +                    service=services.knownservices.dirsrv.service_instance(""),
 +                    server=_('<all IPA servers>')
 +                )
             )
 -        )
         return dn
@@ -568,7 +571,8 @@ class idrange_del(LDAPDelete):
         try:
             old_attrs = ldap.get_entry(dn, ['ipabaseid',
                                             'ipaidrangesize',
 -                                            'ipanttrusteddomainsid'])
 +                                            'ipanttrusteddomainsid',
 +                                            'iparangetype'])
         except errors.NotFound:
             raise self.obj.handle_not_found(*keys)
@@ -602,6 +606,20 @@ class idrange_del(LDAPDelete):
                     key=keys[0],
                     dependent=trust_domains[0].dn[0].value)
 +        self.add_message(
 +            messages.ServiceRestartRequired(
 +                service=services.knownservices['sssd'].systemd_name,
 +                server=_('<all IPA servers>')
 +            )
 +        )
 +
 +        if old_attrs.single_value.get('iparangetype') == 'ipa-local':
 +            self.add_message(
 +                messages.ServiceRestartRequired(
 +                    service=services.knownservices.dirsrv.service_instance(""),
 +                    server=_('<all IPA servers>')
 +                )
 +            )
         return dn
@@ -804,10 +822,20 @@ class idrange_mod(LDAPUpdate):
         assert isinstance(dn, DN)
         self.obj.handle_ipabaserid(entry_attrs, options)
         self.obj.handle_iparangetype(entry_attrs, options)
 +
 +        if entry_attrs.single_value.get('iparangetype') in (
 +                'ipa-local', self.obj.range_types.get('ipa-local', None)):
 +            self.add_message(
 +                messages.ServiceRestartRequired(
 +                    service=services.knownservices.dirsrv.service_instance(""),
 +                    server=_('<all IPA servers>')
 +                )
 +            )
 +
         self.add_message(
             messages.ServiceRestartRequired(
                 service=services.knownservices['sssd'].systemd_name,
 -                server=keys[0]
 +                server=_('<all IPA servers>')
             )
         )
         return dn
 diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py
 index e3f4c23..531fe4a 100644
 --- a/ipatests/test_xmlrpc/test_range_plugin.py
 +++ b/ipatests/test_xmlrpc/test_range_plugin.py
@@ -26,7 +26,8 @@ import six
 from ipalib import api, errors, messages
 from ipalib import constants
 from ipaplatform import services
 -from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
 +from ipatests.test_xmlrpc.xmlrpc_test import (
 +    Declarative, fuzzy_uuid, Fuzzy, fuzzy_sequence_of)
 from ipatests.test_xmlrpc import objectclasses
 from ipatests.util import MockLDAP
 from ipapython.dn import DN
@@ -374,6 +375,8 @@ IPA_LOCAL_RANGE_MOD_ERR = (
 dirsrv_instance = services.knownservices.dirsrv.service_instance("")
 +fuzzy_restart_messages = fuzzy_sequence_of(Fuzzy(type=dict))
 +
 @pytest.mark.tier1
 class test_range(Declarative):
@@ -610,7 +613,8 @@ class test_range(Declarative):
             desc='Delete ID range %r' % testrange1,
             command=('idrange_del', [testrange1], {}),
             expected=dict(
 -                result=dict(failed=[]),
 +                result=dict(failed=[],
 +                            messages=fuzzy_restart_messages),
                 value=[testrange1],
                 summary=u'Deleted ID range "%s"' % testrange1,
             ),
@@ -714,7 +718,8 @@ class test_range(Declarative):
             desc='Delete ID range %r' % testrange2,
             command=('idrange_del', [testrange2], {}),
             expected=dict(
 -                result=dict(failed=[]),
 +                result=dict(failed=[],
 +                            messages=fuzzy_restart_messages),
                 value=[testrange2],
                 summary=u'Deleted ID range "%s"' % testrange2,
             ),
 diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py
 index 531fe4a..3646952 100644
 --- a/ipatests/test_xmlrpc/test_range_plugin.py
 +++ b/ipatests/test_xmlrpc/test_range_plugin.py
@@ -613,8 +613,8 @@ class test_range(Declarative):
             desc='Delete ID range %r' % testrange1,
             command=('idrange_del', [testrange1], {}),
             expected=dict(
 -                result=dict(failed=[],
 -                            messages=fuzzy_restart_messages),
 +                result=dict(failed=[]),
 +                messages=fuzzy_restart_messages,
                 value=[testrange1],
                 summary=u'Deleted ID range "%s"' % testrange1,
             ),
@@ -718,8 +718,8 @@ class test_range(Declarative):
             desc='Delete ID range %r' % testrange2,
             command=('idrange_del', [testrange2], {}),
             expected=dict(
 -                result=dict(failed=[],
 -                            messages=fuzzy_restart_messages),
 +                result=dict(failed=[]),
 +                messages=fuzzy_restart_messages,
                 value=[testrange2],
                 summary=u'Deleted ID range "%s"' % testrange2,
             ),
@@ -809,11 +809,6 @@ class test_range(Declarative):
                 ),
                 value=unicode(domain7range1),
                 summary=u'Added ID range "%s"' % (domain7range1),
 -                messages=(
 -                    messages.ServiceRestartRequired(
 -                        service=dirsrv_instance,
 -                        server='<all IPA servers>').to_dict(),
 -                ),
             ),
         ),
@@ -836,6 +831,7 @@ class test_range(Declarative):
                 result=dict(failed=[]),
                 value=[domain1range1],
                 summary=u'Deleted ID range "%s"' % domain1range1,
 +                messages=fuzzy_restart_messages,
             ),
         ),
@@ -862,12 +858,7 @@ class test_range(Declarative):
             command=('idrange_mod', [domain3range2],
                      dict(ipabaseid=domain3range1_base_id)),
             expected=dict(
 -                messages=(
 -                    messages.ServiceRestartRequired(
 -                        service=services.knownservices['sssd'].systemd_name,
 -                        server=domain3range2
 -                    ).to_dict(),
 -                ),
 +                messages=fuzzy_restart_messages,
                 result=dict(
                     cn=[domain3range2],
                     ipabaseid=[unicode(domain3range1_base_id)],
@@ -933,12 +924,7 @@ class test_range(Declarative):
             command=('idrange_mod', [domain2range1],
                      dict(ipabaserid=domain5range1_base_rid)),
             expected=dict(
 -                messages=(
 -                    messages.ServiceRestartRequired(
 -                        service=services.knownservices['sssd'].systemd_name,
 -                        server=domain2range1
 -                    ).to_dict(),
 -                ),
 +                messages=fuzzy_restart_messages,
                 result=dict(
                     cn=[domain2range1],
                     ipabaseid=[unicode(domain2range1_base_id)],
@@ -973,12 +959,7 @@ class test_range(Declarative):
             command=('idrange_mod', [domain2range1],
                      dict(ipaautoprivategroups='true')),
             expected=dict(
 -                messages=(
 -                    messages.ServiceRestartRequired(
 -                        service=services.knownservices['sssd'].systemd_name,
 -                        server=domain2range1
 -                    ).to_dict(),
 -                ),
 +                messages=fuzzy_restart_messages,
                 result=dict(
                     cn=[domain2range1],
                     ipabaseid=[unicode(domain2range1_base_id)],
@@ -1000,12 +981,7 @@ class test_range(Declarative):
             command=('idrange_mod', [domain2range1],
                      dict(ipaautoprivategroups='false')),
             expected=dict(
 -                messages=(
 -                    messages.ServiceRestartRequired(
 -                        service=services.knownservices['sssd'].systemd_name,
 -                        server=domain2range1
 -                    ).to_dict(),
 -                ),
 +                messages=fuzzy_restart_messages,
                 result=dict(
                     cn=[domain2range1],
                     ipabaseid=[unicode(domain2range1_base_id)],
@@ -1027,12 +1003,7 @@ class test_range(Declarative):
             command=('idrange_mod', [domain2range1],
                      dict(ipaautoprivategroups='hybrid')),
             expected=dict(
 -                messages=(
 -                    messages.ServiceRestartRequired(
 -                        service=services.knownservices['sssd'].systemd_name,
 -                        server=domain2range1
 -                    ).to_dict(),
 -                ),
 +                messages=fuzzy_restart_messages,
                 result=dict(
                     cn=[domain2range1],
                     ipabaseid=[unicode(domain2range1_base_id)],
@@ -1054,12 +1025,7 @@ class test_range(Declarative):
             command=('idrange_mod', [domain2range1],
                      dict(ipaautoprivategroups='')),
             expected=dict(
 -                messages=(
 -                    messages.ServiceRestartRequired(
 -                        service=services.knownservices['sssd'].systemd_name,
 -                        server=domain2range1
 -                    ).to_dict(),
 -                ),
 +                messages=fuzzy_restart_messages,
                 result=dict(
                     cn=[domain2range1],
                     ipabaseid=[unicode(domain2range1_base_id)],
@@ -1116,6 +1082,7 @@ class test_range(Declarative):
                 result=dict(failed=[]),
                 value=[testrange9],
                 summary=u'Deleted ID range "%s"' % testrange9,
 +                messages=fuzzy_restart_messages,
             ),
         ),
--- a/SOURCES/0033-PKINIT-certificate-fix-renewal-on-hidden-replica_rhel#4913.patch
+++ b/SOURCES/0033-PKINIT-certificate-fix-renewal-on-hidden-replica_rhel#4913.patch
@ -1,58 +0,0 @@
 diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py
 index 619be83..9be1b67 100644
 --- a/ipaserver/plugins/cert.py
 +++ b/ipaserver/plugins/cert.py
@@ -55,7 +55,7 @@ from ipapython.dn import DN
 from ipapython.ipautil import datetime_from_utctimestamp
 from ipaserver.plugins.service import normalize_principal, validate_realm
 from ipaserver.masters import (
 -    ENABLED_SERVICE, CONFIGURED_SERVICE, is_service_enabled
 +    ENABLED_SERVICE, CONFIGURED_SERVICE, HIDDEN_SERVICE, is_service_enabled
 )
 try:
@@ -300,7 +300,7 @@ def caacl_check(principal, ca, profile_id):
 def ca_kdc_check(api_instance, hostname):
     master_dn = api_instance.Object.server.get_dn(unicode(hostname))
     kdc_dn = DN(('cn', 'KDC'), master_dn)
 -    wanted = {ENABLED_SERVICE, CONFIGURED_SERVICE}
 +    wanted = {ENABLED_SERVICE, CONFIGURED_SERVICE, HIDDEN_SERVICE}
     try:
         kdc_entry = api_instance.Backend.ldap2.get_entry(
             kdc_dn, ['ipaConfigString'])
 diff --git a/ipatests/test_integration/test_replica_promotion.py b/ipatests/test_integration/test_replica_promotion.py
 index b71f2d5..7ef44c5 100644
 --- a/ipatests/test_integration/test_replica_promotion.py
 +++ b/ipatests/test_integration/test_replica_promotion.py
@@ -26,6 +26,7 @@ from ipalib.constants import (
 )
 from ipaplatform.paths import paths
 from ipapython import certdb
 +from ipatests.test_integration.test_cert import get_certmonger_fs_id
 from ipatests.test_integration.test_dns_locations import (
     resolve_records_from_server, IPA_DEFAULT_MASTER_SRV_REC
 )
@@ -1241,6 +1242,23 @@ class TestHiddenReplicaPromotion(IntegrationTest):
             'ipa-crlgen-manage', 'status'])
         assert "CRL generation: enabled" in result.stdout_text
 +    def test_hidden_replica_renew_pkinit_cert(self):
 +        """Renew the PKINIT cert on a hidden replica.
 +
 +        Test for https://pagure.io/freeipa/issue/9611
 +        """
 +        # Get Request ID
 +        cmd = ['getcert', 'list', '-f', paths.KDC_CERT]
 +        result = self.replicas[0].run_command(cmd)
 +        req_id = get_certmonger_fs_id(result.stdout_text)
 +
 +        self.replicas[0].run_command([
 +            'getcert', 'resubmit', '-f', paths.KDC_CERT
 +        ])
 +        tasks.wait_for_certmonger_status(
 +            self.replicas[0], ('MONITORING'), req_id, timeout=600
 +        )
 +
 class TestHiddenReplicaKRA(IntegrationTest):
     """Test KRA & hidden replica features.
--- a/SOURCES/1002-Revert-freeipa.spec-depend-on-bind-dnssec-utils.patch
+++ b/SOURCES/1002-Revert-freeipa.spec-depend-on-bind-dnssec-utils.patch
@ -1,69 +0,0 @@
 From 0d44e959e5bbe822b51137a8e7cf48fa25533805 Mon Sep 17 00:00:00 2001
 From: Rafael Guterres Jeffman <rjeffman@redhat.com>
 Date: Fri, 10 Dec 2021 12:15:36 -0300
 Subject: [PATCH] Revert "freeipa.spec: depend on bind-dnssec-utils"
 This reverts commit f89d59b6e18b54967682f6a37ce92ae67ab3fcda.
 ---
 freeipa.spec.in             | 4 +---
 ipaplatform/base/paths.py   | 2 +-
 ipaplatform/fedora/paths.py | 1 +
 ipaserver/dnssec/bindmgr.py | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)
 diff --git a/freeipa.spec.in b/freeipa.spec.in
 index 8f5c370e5..e20edb7bc 100755
 --- a/freeipa.spec.in
 +++ b/freeipa.spec.in
@@ -576,11 +576,9 @@ Requires: %{name}-server = %{version}-%{release}
 Requires: bind-dyndb-ldap >= 11.2-2
 Requires: bind >= %{bind_version}
 Requires: bind-utils >= %{bind_version}
 -# bind-dnssec-utils is required by the OpenDNSSec integration
 -# https://pagure.io/freeipa/issue/9026
 -Requires: bind-dnssec-utils >= %{bind_version}
 %if %{with bind_pkcs11}
 Requires: bind-pkcs11 >= %{bind_version}
 +Requires: bind-pkcs11-utils >= %{bind_version}
 %else
 Requires: softhsm >= %{softhsm_version}
 Requires: openssl-pkcs11 >= %{openssl_pkcs11_version}
 diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
 index 7d21367ec..42a47f1df 100644
 --- a/ipaplatform/base/paths.py
 +++ b/ipaplatform/base/paths.py
@@ -259,7 +259,6 @@ class BasePathNamespace:
     IPA_PKI_RETRIEVE_KEY = "/usr/libexec/ipa/ipa-pki-retrieve-key"
     IPA_HTTPD_PASSWD_READER = "/usr/libexec/ipa/ipa-httpd-pwdreader"
     IPA_PKI_WAIT_RUNNING = "/usr/libexec/ipa/ipa-pki-wait-running"
 -    DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel"
 +    DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel-pkcs11"
 -    DNSSEC_KEYFROMLABEL_9_17 = "/usr/bin/dnssec-keyfromlabel"
     GETSEBOOL = "/usr/sbin/getsebool"
     GROUPADD = "/usr/sbin/groupadd"
 diff --git a/ipaplatform/fedora/paths.py b/ipaplatform/fedora/paths.py
 index 4e993c063..92a948966 100644
 --- a/ipaplatform/fedora/paths.py
 +++ b/ipaplatform/fedora/paths.py
@@ -36,6 +36,7 @@ class FedoraPathNamespace(RedHatPathNamespace):
     NAMED_CRYPTO_POLICY_FILE = "/etc/crypto-policies/back-ends/bind.config"
     if HAS_NFS_CONF:
         SYSCONFIG_NFS = '/etc/nfs.conf'
 +    DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel"
 paths = FedoraPathNamespace()
 diff --git a/ipaserver/dnssec/bindmgr.py b/ipaserver/dnssec/bindmgr.py
 index 0c79cc03d..a15c0e601 100644
 --- a/ipaserver/dnssec/bindmgr.py
 +++ b/ipaserver/dnssec/bindmgr.py
@@ -127,7 +127,6 @@ class BINDMgr:
         )
         cmd = [
             paths.DNSSEC_KEYFROMLABEL,
 -            '-E', 'pkcs11',
             '-K', workdir,
             '-a', attrs['idnsSecAlgorithm'][0],
             '-l', uri
 --
 2.31.1
--- a/SOURCES/1003-webui-IdP-Remove-arrow-notation-due-to-uglify-js-lim.patch
+++ b/SOURCES/1003-webui-IdP-Remove-arrow-notation-due-to-uglify-js-lim.patch
@ -1,60 +0,0 @@
 From 7807bcc55b4927fc327830d2237200772d2e1106 Mon Sep 17 00:00:00 2001
 From: Rafael Guterres Jeffman <rjeffman@redhat.com>
 Date: Fri, 17 Jun 2022 15:40:04 -0300
 Subject: [PATCH] webui IdP: Remove arrow notation due to uglify-js limitation.
 uglify-js 2.x series do not support ECMAScript 6 arrow notation ('=>')
 for callback definition.
 This patch changes the arrow definition callbacks for regular anonymous
 function definitions.
 ---
 install/ui/src/freeipa/idp.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 diff --git a/install/ui/src/freeipa/idp.js b/install/ui/src/freeipa/idp.js
 index ada09c075..be3c4f0e6 100644
 --- a/install/ui/src/freeipa/idp.js
 +++ b/install/ui/src/freeipa/idp.js
@@ -227,7 +227,7 @@ IPA.add_idp_policy = function() {
         // For custom template we show custom fields
         // and mark all of them required and passed to the RPC
         // If show_custom is false, the opposite happens
 -        custom_fields.forEach(fname => {
 +        custom_fields.forEach(function(fname) {
             widget_f = that.container.fields.get_field(fname);
             widget_f.set_required(show_custom);
             widget_f.set_enabled(show_custom);
@@ -235,7 +235,7 @@ IPA.add_idp_policy = function() {
         });
         // For template fields we show them if custom aren't shown
 -        template_fields.forEach(fname => {
 +        template_fields.forEach(function(fname) {
             widget_f = that.container.fields.get_field(fname);
             widget_f.set_enabled(!show_custom);
             widget_f.widget.set_visible(!show_custom);
@@ -252,7 +252,7 @@ IPA.add_idp_policy = function() {
         var value = prov_f.get_value()[0];
         // First, clear template fields from the previous provider choice
 -        template_fields.forEach(fname => {
 +        template_fields.forEach(function(fname) {
             widget_f = that.container.fields.get_field(fname);
             widget_f.widget.set_visible(false);
             widget_f.set_required(false);
@@ -260,9 +260,9 @@ IPA.add_idp_policy = function() {
         });
         // Second, enable and get required template-specific fields
 -        idp.templates.forEach(idp_v => {
 +        idp.templates.forEach(function(idp_v) {
             if (idp_v['value'] == value) {
 -                idp_v['fields'].forEach(fname => {
 +                idp_v['fields'].forEach(function(fname) {
                     widget_f = that.container.fields.get_field(fname);
                     widget_f.set_required(true);
                     widget_f.set_enabled(true);
 -- 
 2.36.1
--- a/SOURCES/1004-Revert-DNSResolver-Fix-use-of-nameservers-with-ports.patch
+++ b/SOURCES/1004-Revert-DNSResolver-Fix-use-of-nameservers-with-ports.patch
@ -1,120 +0,0 @@
 From 9a33838407f244e481523fe643bc0626874e8b1a Mon Sep 17 00:00:00 2001
 From: Rafael Guterres Jeffman <rjeffman@redhat.com>
 Date: Mon, 19 Dec 2022 14:57:03 -0300
 Subject: [PATCH] Revert "DNSResolver: Fix use of nameservers with ports"
 This reverts commit 5e2e4664aec641886923c2bec61ce25b96edb62a.
 diff --git a/ipapython/dnsutil.py b/ipapython/dnsutil.py
 index 58de365ab..4baeaf8cc 100644
 --- a/ipapython/dnsutil.py  2023-05-19 05:12:52.471239297 -0300
 +++ b/ipapython/dnsutil.py	2023-05-24 12:20:13.588867053 -0300
@@ -145,55 +145,6 @@
             nameservers.remove(ipv4_loopback)
         self.nameservers = nameservers
 -    @property
 -    def nameservers(self):
 -        return self._nameservers
 -
 -    @nameservers.setter
 -    def nameservers(self, nameservers):
 -        """
 -        *nameservers*, a ``list`` of nameservers with optional ports:
 -            "SERVER_IP port PORT_NUMBER".
 -
 -        Overloads dns.resolver.Resolver.nameservers setter to split off ports
 -        into nameserver_ports after setting nameservers successfully with the
 -        setter in dns.resolver.Resolver.
 -        """
 -        # Get nameserver_ports if it is already set
 -        if hasattr(self, "nameserver_ports"):
 -            nameserver_ports = self.nameserver_ports
 -        else:
 -            nameserver_ports = {}
 -
 -        # Check nameserver items in list and split out converted port number
 -        # into nameserver_ports: { nameserver: port }
 -        if isinstance(nameservers, list):
 -            _nameservers = []
 -            for nameserver in nameservers:
 -                splits = nameserver.split()
 -                if len(splits) == 3 and splits[1] == "port":
 -                    nameserver = splits[0]
 -                    try:
 -                        port = int(splits[2])
 -                        if port < 0 or port > 65535:
 -                            raise ValueError()
 -                    except ValueError:
 -                        raise ValueError(
 -                            "invalid nameserver: %s is not a valid port" %
 -                            splits[2])
 -                    nameserver_ports[nameserver] = port
 -                _nameservers.append(nameserver)
 -            nameservers = _nameservers
 -
 -        # Call dns.resolver.Resolver.nameservers setter
 -        if hasattr(dns.resolver.Resolver, "nameservers"):
 -            dns.resolver.Resolver.nameservers.__set__(self, nameservers)
 -        else:
 -            # old dnspython (<2) doesn't have 'nameservers' property
 -            self._nameservers = nameservers
 -        # Set nameserver_ports after successfull call to setter
 -        self.nameserver_ports = nameserver_ports
 -
 class DNSZoneAlreadyExists(dns.exception.DNSException):
     supp_kwargs = {'zone', 'ns'}
 diff --git a/ipatests/test_ipapython/test_dnsutil.py b/ipatests/test_ipapython/test_dnsutil.py
 index 9070d89ad..5e7a46197 100644
 --- a/ipatests/test_ipapython/test_dnsutil.py
 +++ b/ipatests/test_ipapython/test_dnsutil.py
@@ -101,48 +101,3 @@ class TestSortURI:
         assert dnsutil.sort_prio_weight([h3, h2, h1]) == [h1, h2, h3]
         assert dnsutil.sort_prio_weight([h3, h3, h3]) == [h3]
         assert dnsutil.sort_prio_weight([h2, h2, h1, h1]) == [h1, h2]
 -
 -
 -class TestDNSResolver:
 -    @pytest.fixture(name="res")
 -    def resolver(self):
 -        """Resolver that doesn't read /etc/resolv.conf
 -
 -        /etc/resolv.conf is not mandatory on systems
 -        """
 -        return dnsutil.DNSResolver(configure=False)
 -
 -    def test_nameservers(self, res):
 -        res.nameservers = ["4.4.4.4", "8.8.8.8"]
 -        assert res.nameservers == ["4.4.4.4", "8.8.8.8"]
 -
 -    def test_nameservers_with_ports(self, res):
 -        res.nameservers = ["4.4.4.4 port 53", "8.8.8.8 port 8053"]
 -        assert res.nameservers == ["4.4.4.4", "8.8.8.8"]
 -        assert res.nameserver_ports == {"4.4.4.4": 53, "8.8.8.8": 8053}
 -
 -        res.nameservers = ["4.4.4.4 port 53", "8.8.8.8  port  8053"]
 -        assert res.nameservers == ["4.4.4.4", "8.8.8.8"]
 -        assert res.nameserver_ports == {"4.4.4.4": 53, "8.8.8.8": 8053}
 -
 -    def test_nameservers_with_bad_ports(self, res):
 -        try:
 -            res.nameservers = ["4.4.4.4 port a"]
 -        except ValueError:
 -            pass
 -        else:
 -            pytest.fail("No fail on bad port a")
 -
 -        try:
 -            res.nameservers = ["4.4.4.4 port -1"]
 -        except ValueError:
 -            pass
 -        else:
 -            pytest.fail("No fail on bad port -1")
 -
 -        try:
 -            res.nameservers = ["4.4.4.4 port 65536"]
 -        except ValueError:
 -            pass
 -        else:
 -            pytest.fail("No fail on bad port 65536")
--- a/SOURCES/freeipa-4.9.13.tar.gz.asc
+++ b/SOURCES/freeipa-4.9.13.tar.gz.asc
@ -1,16 +0,0 @@
 -----BEGIN PGP SIGNATURE-----
 iQIzBAABCAAdFiEE11Z2TU1+KXxtrRFyaYdvcqbi008FAmVbZU0ACgkQaYdvcqbi
 009Fgw/+PzHGNOJPs67TtoYITV/3ZCzMyrYTcazVACjD61Zw7JBgbZzZpQXxBSbj
 7QWpNJa3P2JFtv2qOUXJto40mOGpMynyYpuYs4CtyJ86eHTUJyYTFppBmCzzozhT
 2C2BeKKjzV8OOWQ7yO/2BTEZ7KtOcIr4ZI7iZCnLJF9Yt8x7TURjGRqxsHwT62Ip
 vcrtm0LkkYv/fQ6pFZZfinKU1OBrZphwHMCU4Mlv411iQg4+NOxLSsVU/kegeKIO
 adp4Y9g5dfAfdXEXb2Zt7gkmLaWMgf+XNSFDL/wkzRYt74HKwvbIPJQlTZ6pqLxQ
 yTtiHGuMb7xNDWolpoueo1/lbxaHRRGJaSPs7zUht3IBxb7hiF65Gm3UaJhoeAXc
 gVleZf/+0titOdkRfTD2N0P0hli7gaiRrbpw8K4joxMFpYrQGUxD8SI376gkOj6o
 5RWSioPoG9txNM7Co+lVpci7WHhL+Tmhf1SlHyVJGKoNe/z4VHnjHeYlFWRVdDEI
 OOupZzJQoLnso3lTwR5VEN8xGURnhbGV4MdUfD/6FhwmyHiPlYkytdZIsGsNDOab
 978PPaKcIpbsZ4gUhshcbn7qaY809lNSpMtg8saYOP4J/5Nu+i9X5bJqOmoX0rKa
 gAJDY5har+lExRnTEdYEGVB8qen5lqi8r1oYjnDpkSpq6BRoAHA=
 =uQom
 -----END PGP SIGNATURE-----
--- a/SPECS/ipa.spec
+++ b/SPECS/ipa.spec
--- a/freeipa.spec
+++ b/freeipa.spec
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,7 @@
 # recipients: abokovoy, frenaud, kaleem, ftrivino
 --- !Policy
 product_versions:
  - rhel-10
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: idm-ci.brew-build.tier1.functional}
--- a/gpgkey-0E63D716D76AC080A4A33513F40800B6298EB963.asc
+++ b/gpgkey-0E63D716D76AC080A4A33513F40800B6298EB963.asc
@ -0,0 +1,272 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 mQINBFodY+oBEAC7b3VAzN8Bvhvj+XreexZz6JkKTpMOwkkZ/aY+RF+VY2oXqxje
 IIzPh201pnjB5gdPPvoI2kzoZQNXxmavRHJ/4fGj4zdMx9m/tik+hDPsDCOgRxr4
 HjoWJ4u1nYO29+dDMIS75V7aRy/jNqpzLjBuQi1P85Uqr9RWOmgIPSTpXfyREhL1
 53o4CVmPQxQx/AuPNo7RLJdyd748Sv4sUDJGQT1VoZFlu8EOnCgQHpOhfRcPxMpl
 qRrpa6UyesleAiSFfH2hDJzgStPQxGuhLKo4nORCc89YWxgh+wWr2Ph/+zIdL1cp
 NtAMcCvq7Z9DlU8aRUCxZ92O0fh24KiXmuuL3c0RvnVO7NMX9vslEsCmjo4J73j1
 P73MEocrbxKmVtANFhhfOI9352friI6YzNtU18G+sPZYCZ4jxXH6uecTTl0ut8Lc
 cYfxO5FZMarW+kW85OQd8EEW+hJY7CAd6/2K5fnnhbt8mmcomCUPwAQDxptprThz
 TZaRPupV1gQuGUN6tRkvSPrcZLSSG8FqqVViH2XoAdiz41TDqrNjHse0Qbb9ZBiu
 SawbH/7kPPymEumCJZPfAL6iZz8b0bFFSETz48IEJiRUOlvy+SumO3yK7jepPw2t
 NemtWOMKePzOifpN7yg7slmzaGOb/+5wWqx8dzypegpSWiuq0ewPzz+A3wARAQAB
 tCpGcmVlSVBBIFJlbGVhc2VzIDxyZWxlYXNlc0BtZy5mcmVlaXBhLm9yZz6JAk4E
 EwEIADgWIQQOY9cW12rAgKSjNRP0CAC2KY65YwUCYPZyPgIbAwULCQgHAgYVCgkI
 CwIEFgIDAQIeAQIXgAAKCRD0CAC2KY65YzUjEACbVCWndEy3NLzdX4a9X90ADYGq
 liOoxY4kABJ2Bw97qcS4kHHar4RurxyH0L0NKJ75Zwkzct72DyS+2HG4yYHBz9QG
 YEUqzJdCt3Xhy/NDehYJGevDtC00usLYXiahBf1u884U8Hnufk+2zLiWQ9h32q8S
 x9Dn+KL+ySuOidBkG9RykqeV3I3LaUlvMO5cfVmvaM3SWcYwZbkxmsXqjtdZTwxI
 ZThKGBJEbjdSCkwPVtv5fFy4gN1/xnxcR+OhXqjpOwj0HOj48LO/bZmJPiKDUlcA
 ztIO903sAaVRBhe7lOZ3uiPtNQwEj0dpCSkv8ZdF5/68ctuiwN+9nkpYmuwAw1hT
 OqpA2GZdGXCsL+6qKGgUL1l/s8OhqwNAR+GboQ4Yr9sLp51AJvM/z8u3cTk6cvzL
 c6L+Yp99u7f3eLOO9gx8ac5na/EksiTiPFNxTGRCvVWA8C4D5JxBpJRpFjJcjg4D
 XQf12Mpx0UyUvdE8eDQwjZkwTEQTrilXSwbJG8d9LVVlwodX/4BrzcBZui8zMqVJ
 sHq9mlA15A47sWzKoC6GBB90DXQXOIqoyg2KhEDV6qdYbJkCzIqggvlVS9z/r/t0
 8NpisoolIyJOUNdO2IKk/TrT3x8LxcnCqZUx91Iofnwkd1t/3S9HYTQGekuX+uK5
 5Fh7tuEsC59I2bfdVrkCDQRaHWiqARAAmQbtZ/+doF3Kvul2atB9C4RtHpUvLsrs
 8hfN5qH4bwt8Ti71KpQBNaAHXp/moywRsOw8D+3aN/yQD9UKSGF/seub+E4fv8T4
 woYpQ6ivZaCkipUj9/cyoJCzoeK14kM1K/3eJ66eMPbNWJ+sC+eK5CEr2cVEOU/S
 /gXUOf9gMvK8YIuPX7o3MkhhbnuDDluToQeQPplJMrL+b7lNf0Qc1SqIM5QDfLqQ
 PLrhavbnWlqimhOhqT0UuZ57TzvS5J+tezxRpuRx8PADNyfyHgzaX2KVcJo2+FWV
 VDQlobcBQoI12ldE634PAExH+xGHteff6LEX32YwVK+WTXMjUDLid48u46owxn5d
 o5ktJzD9dCQ84IvL38alSp5M8Ah36sk11/N+5lB4f6VJTwrsJH+RH9xak/oDwFvQ
 EQbkS5kuv1a15fPHYaHXjmAKnYuxPEP2Ra69CyWXg/1WzuxHV9iF1hx1fT9mLdRL
 lbq2wvfw/H7auEZKOHDk8UYyWpYxz4+k1XCNVzsI8HfajkvGVkSc/LB+hMgrrFHq
 LuV9BmnAdVhJZmy4c4EqQp3t7zc0hHUDaxOBThtQxdNbJUAtiVitWTCThD7FTlio
 IToZUz+cm4LL4V/qQCdqPu0oE2NrgBj8iWwncyD4tHR97g7pOxJ25CX8YUTy7Kbe
 lkDNQ+GsRy8AEQEAAYkEcgQYAQgAJgIbAhYhBA5j1xbXasCApKM1E/QIALYpjrlj
 BQJg99tXBQkOX0CtAkAJEPQIALYpjrljwXQgBBkBCAAdFiEETwPD9aLQlPeQsGGZ
 jYpQzTKjDeMFAlodaKoACgkQjYpQzTKjDeOfRQ/+L/H7F3sV7nbd508VR4x882DB
 w27UdXDHQle8Y1WlnePQFuSW9rddpVxktAeal3dwjOZQXQgBvxaU7zu8euXGlbKc
 wV6vf5e20W54q4ODnlKF+yEp37OxWUops1ktB0nXQC7x8qZMH9Lq2yc49SAKPCfG
 NJzcEa5aEswq/3e3d1Cc/D/ivP/nnRG0RrVmcnkWZ6udT9YPWcE6S52eE/5U/Gdt
 F1bbeWwexqfm0cNSH3TqmQ0GiJO5AhbUVF8vZBOKGN+l3AF2dLHQqO7EzqYgu6Cd
 7iuJ5EIv6gs3UKGznFxmwfzZPa7H2dPKx+KpONfdDlqrkd0gy++0BdRoJETIw6ed
 I+19hZ6SC4GMYKFuhTGOcBnbjA4x8FUzi7qfNC2IqpW7x8E56CUONG3D4O1Dznrk
 VLP1zIZ3d5ja81ntsLSlj7Ue7c8VUihiEowtYvqbsquDF2sqn8IWlf7ykW3edeVB
 h6y6mqM3Znr2qaVS8m/NtIJA7TPGrtFs6/6cO16a2s0maxJOSTOG7K7CX8L0+xzK
 28LFwTBuGwFSTftOlx+TZGBtEzIPjNssAqHUALTtlg14Z8HkfvtBr/ezJVwnqLqF
 lTco9U0vQiASggOGNCY68WC4YSX3XYPDuccxfEk2YFKeAnTOQnTUuN4x26H9Ne75
 HRGlJGlBAs7odCFMPLaC5A/6AmlKGSz/2/6S79IjEwOhX4TQNkkK8XHIKSb0MLhb
 TXvHLHPU1dFLsdHvaHDDfSjL0kaq/+puEiusiKMuLiStvJhAyhv1bXjWkgN/ZKBA
 kyMwaIR6v7twPLoAeSI6cVu92W3RmV0nLBjDm7Es4MYOjSFcMm8WnhnHLyRLk1Qy
 bjOfmAURjNsd5GWrh4+ELwGdPcPDpox0Nr6IqnBcDcJUQSVlU9Yi6WnO1JlfrKi+
 S/bGdqUaEtF9jAElFT26CXPSzNQHde3sQl/sBqhomsstYKleIg2CfQZ0iAvCifg/
 fEqjsYSIpfZIXqOFvWU5uakLaHFNBT5jviWho7JYHrceqEjZxO6oTShGAV4qCRog
 g+8ScMw9GNFoBy4k2W4idpTdqm/ntQ/j7AOIYsXiFENWTvmqvTE6ddLiKdyiUN+3
 NJsgK1EjGx5ppb/YnUgw0yPnJD66zTFMdHnxllvNRjI6gpBE2qS3bMutQCJM8rGc
 eQaAIb24OXUhGviFOy1RsWx8/wQoGFoYgqjltiZf717Y3nGaAbcW7z4JPm+VCkXX
 iSxagGjJuCqC+4Lp1/Jbc5V+AiD3UHLGB1u9eT4+8XIoXJNaUoE22KMphwSaWvdJ
 qI5OG2JiYuzQ/empnU+ZtJbuKTtBXanVCn7jwimgCuCosUJQACaHMUXUvDvjvBn4
 OpO5Ag0EWh1pLwEQAKCqeJW3nLIkEHucuHdt2jjVje5arTQm3qXOvq0ul2aIjzK1
 /7vJxs9Ss/AWruf9L+7gOoSdREEOEPyZ6wK6Xdg3un/KkV1m+2W+yNbfQEtZhjH8
 pvWfDldzpLyRcgCv5kThJ4Ax3j6nai6FQXP1QkEbYZfQx0RTwKKGv8txSX3oXyJW
 JKpps5WgdHSnG2zc1aM4SG33T37tzLWerlD2t6PTAQUYau6hacoEiV9fKmk1AMvT
 pYPkeVj6/Ur5AuDFRkqTZfH2Ih1JUVtPqFX63Z6xan+qXqEQzFesbtQlMeHFRPbM
 40xIfBfRd2aJ0JXo/rSbB/wNdtuZkYmlrsBemD/plIHduUMpXh8+uuzaiWDw16vm
 8MSZYaeSPQis/jjdvsrNPtkc9MW9F/XdsaUtA0Pgxziqbw3v9S2SGvlxvIa64WqO
 kzfoIHCTcNy08TR3nRNgH+iS3NPWLHJlwpR1W554Aqln4YeIW6DT9knG3pnI8mYD
 0hAGHPIUdV94wOqbFFkRMzWS2h0iLqPb+l83plLplmI4RBZCjqcCXC272b6JV9Xh
 ZNRpiIW37yBnl9dP7TTpyuy3JqYtVbhfrlYxmaVXpPtMNn6FVOTnfHXYUdjbGtRq
 mBX5FA/j+TRe590h6uGgvRGh1syJwafpdu+bKYT1snRqreJz4XhHqgbbYYzfABEB
 AAGJBHIEGAEIACYCGwIWIQQOY9cW12rAgKSjNRP0CAC2KY65YwUCYPfbVwUJDl9A
 KAJACRD0CAC2KY65Y8F0IAQZAQgAHRYhBAIW53hdqPvbo75EVfFTSEDBCz9VBQJa
 HWkvAAoJEPFTSEDBCz9VEMcP/RZjUjM09oPCYRjXoWg37Jsm4upZb7dGF+2oQBMn
 s+c/xQQnr8OZ9ElSW6L15CtXhsBY+Ji4TdWHCmmbqGIUY5Kd7dP3hon0uHEXPOOP
 bRDg6Fg/zs1FgRhyQaFrybx4iAkACF3zNKdsfxrL+fdFiVJiWMZEeZ5u0NYc+OkU
 4U7jnSGj/M1nNzzPuQmQRZ8RFVyqFuqCsbvnipbYmrmAgSGLcM/efhIGR5zpQb1O
 KtnW8ocrLk1a979bHN8ov6h3IhJQL3+XfCKWFsjnOajoH9MpmBnQY+nO/Nco57ZU
 cWajBmY2m+mxAA2mJ0s+oB7sR8oQ2gAQawQq4of2WwVvZUk1bP5NU13UmS6SZWrw
 auYD9XZMrUQvCt6PD81eYU9CmFRrpMvqw5Qmw0RfFxOYpj80D0Z/KfRRWhCUivwB
 cTpfGZQmoXSfcdZKWfdauGgdY5JOLopRjH40CDipopGT/Kvao3983gJE2eAwCytO
 dYmuVP1cvktQNsTg/14S1UXe7AjCOa0/2nPhOlMEWcJdESV1PX71l9nxs3AsxO4c
 bLhBNKIXVwi20D47uR/8QNkVaUMSQriFuLgoKlA0P8tRvOFfbhxZVsoRAu2ncE1p
 cMzbe332S/4aghxNvMhWgMLTomJBbxmCB2G1ZEFmSu7HgyzNkX5+vkOrwO3XMjgB
 xTR/79UP/0Mzm+gyQ6jZmUZGfjbm6lFNLvYfRvUEcjPsBrqXypR0RZ85UMLaQilH
 0ZvpmLDNFAIbzORKwOVi5Cmdm99kLtQpaFdrmzip4wKda9ru9gJKc5eBUBjB9Cel
 9JF5CVfu3NSjyQN7fAWwFUuv5csHjbLg4uFAX7lN4dWpXlEfdvDM2L3QJqSbzdlo
 1W+zBxL5isAkTHj3ivl4MehxSP3lTnPwxIMPUL+zqgX4spQyCOTD4Y5WUjAhCBFu
 saakVf9wT2H7x8xgbNk6C6/MiDsDAeLDM8Q/fTK+0zkIalgH+ly+IUs2E9AgrVXG
 ik/FHmMyMX9EnfisRF+t0I7pnl+2rVXtRKYdq4dHllOv756wuPxjHC3vAzLSRQYa
 9OnntyBVob0C3UC2aIbszqV/SfaxQnh46g7S5Aa5qyS6d9BBogvWolbed2hf6kg1
 9VGOl7SUfSng3G2Q3LfZAK7A6rBbvLx9lZ9rwY5mMxAB2AImqSGptI32xK62NeoS
 rDiqUn2FgyAT7zL7E9s2oA91xtX2cOnadhQHNq1Qs66iBITkeURUQzXE0MUuBIsF
 XH0MWs4iF+uigWgubg0C1ki1xXTqZxC7W201ln1CSDQQEytgVzIPeO5ifibsenvw
 Wv/kyeRIpKlN3UQCi/+izGKQ9YbY3/jLLWajKkDVdrCwfDZd3dkWuQINBGEBiKsB
 EACtoHLQR+6IFrLFXnimamfeGNdjma9DUSVB9SW1aCCbEPHZW3gxs+QD2ZsqjQPh
 afeMcMy70QWktvF89nDRTCTHHsow5xmPTAGEJWTerNAqX2wUjoeZLXwhq72Ueyjw
 U8IRnZSWH7Xu0zRglAAecICAQ/xCexnQhbocgzZfLDcKdqOjxt4UDjYRq8yQcgad
 xmHlAaNeodBw20g4nY99ZAPlgcIMGZhTS93krl+HBcBMTBbk9HDdtRFddHAtP+cj
 Jlgg2nmLbprLKFhoCRTLnyab56kj0F9QnSs6c8tMudkOX5w2stzPlEd9f5kpJhDE
 XrLt7TfTB/11Sm8cVBiSx6XjpWQJqd+0Uc6x5rDl4lb72aegaBrjvY3yRCmq3mrf
 DiIZN0ahf3znwfsqpANP2HnqahaPjEElk5NKThArq8HJEHVczfECNMgM/vwVViu0
 gTe/EFk7tvsWlqMmSFc/s6UF7130aoAL3ONKkjKeogRGDC1M6R8VA+vOcPlWE6uI
 5dHgHmQvf4sl0kYVLNquZg30iJWYoM8tMCtL/UYJ/6b3YWcCS31Sh2nF5IWOq1kZ
 /rSnee/ZtTD3M/1772mrwVGQg9Il4ovZMQiSCiZmBLXNhCr2Pbf7i5mpWlbqFXxe
 ivN1NOWo89dPKjH1TtT0OqU48yxDLWIdoHR1PdVNOZCJlQARAQABiQRyBBgBCAAm
 FiEEDmPXFtdqwICkozUT9AgAtimOuWMFAmEBiKsCGwIFCQlmAYACQAkQ9AgAtimO
 uWPBdCAEGQEIAB0WIQTXVnZNTX4pfG2tEXJph29ypuLTTwUCYQGIqwAKCRBph29y
 puLTT3+FD/9uw164iz6PjLj1nsTDqTxnbLkdUCiEAsik4YXbZm4eTjpiW/aAYZ5o
 CQW0KckSIdn+7Ph22WB9OGua5iTssxAzzaBzqsibkrcgiVwmpsgGHuG9QQQA52sU
 SmXA7qZs2SZvgHjSwcn/1t2Xjaa2YUDbqfM8Syx9klQSbJVgXO6fuZrjJXN+/4EH
 Xwpa5T81L4SDOtlXuvyIguu5ZWC5us/DJx6Da20rMggseljot/2Ym3Zt73LmuDia
 NBk/ndxv/FfYF+JrmOZDu29rGMPSvfKt9C7rtFQhx+6qaV99dtC9wmzV4+UOzKvH
 Ts4abtsOykyb6JaHt5X1C6fcMPDz3XASO0Uw4EGh6P8v3CG0hd5Ac268OmyK3kWs
 K0bhYgDAU0mQtbJ5n2axV3Lbjoy1uI2TKpTKmdJI1g1mkk2i3IHO2smRtRx7YJlA
 kK5hG/97PSGqoje4fQRe9GGECbAOgYpoae7LdXEUlwHKKjQC2Pm+wbdJ9Z5Z1bLV
 wnDQ0ELvtmoSGvGRM62HM6uZxclt3uFrzoPF/NMLgZtFqW2+EZtZMG8sX5GyS76H
 Ov3c2KHaNi/+UO7VKE2utNaTGpVbTYE48zeqVSIfhlYSU1tnPWKxtBNrHiqcMsWS
 KZscmUjDqu7kTPQursKxZ+8CXrO7zly++IAJhlbhidOqkUBFkgAYwa/iD/9mtzo6
 qCOh6Tz6e7y5UqHVWdrbzrF18fMTQrLU4xU6acj+yHAJiVLlZi8H/K1ldVbIrGGa
 BpUBDuPT77UYvbSeQP8kkAKGzOdhXbktk3VovnkDBVXEP+scwgBDzxHAV1xAHpcl
 cYM7pvtm37QLMulyLoY1gNqUIdTbxKxmbJ0iX8O5JoAXipXbXFflFTlo1hIPvsT7
 K0+5UM9jbqYXklFXUAUhhVRmPp/gdD+soAjkSnX61YLDgmEOvbs3p9D/AwlVghHD
 hpShrumHZvggg5ViWhS4lUdG8WpDk0e6zZvjzxOGAR28ID6FA4C34a3HBhr1wMzo
 SJztqVtkWtj53z7VWZ9APQwvaCzeIX8SNk3OXcE2P5Jgca3H6byz0RzvVeZBvKNN
 JDdSKEbzAZpjCeUtej4W9JjBfWo6Wgk4kl83poqlWXR6NIn75mICweBJfSJBo+mC
 zJ5mDmHXF40qsVWktneSsIxkrnl2qDoNR3R6kKzJnc1lZgHA146kpp2p+tArLZ5n
 KTyPmofVUIyzg1XfzkKSRHD/JEDvQHbWYlIBGNiPW3i1O3IlJ/dQFr6gXapHV6rG
 U8QKFHczm+umn7HsKHd+Dsfu9M+9tZGewx/e8WymFKi/Gz6ss+SM5OYPWpQFyHCY
 j+zrC75oRUeJ/gjLnmZleI3nvVxFdZsbwysv5LkCDQRaHWiAARAAwcfF4B6x0nU5
 KREy0CCv1HsiwHfeEKLgNlFRknZSfdAVVrwz/FHykYPLk/zpGBulf1DwH27v7oEa
 mGkLJkRRsAEGzoTvzkU+o5PET0EeKpat1x7d1Qu3P8KsTU98k+s180gzyari4CVo
 baArpNEMN3tsEyiwJOcv3Hg9fQOgylOxhMGlys8OrVTvaD8vPrbbgdTESdvOtr9N
 gAL2qH4UXPKNrB806zaR4DLLBmOtlivydNa/Ip8TTo1GucVTJ92uZH/0CZi1SxGt
 Jid2dCnmFTKcGaCeHKtmMY8jcnJhsRE+zk8fu8809gp5nwzNshU1kjPwN68qMo5O
 bS8uuzxcieCvOgTYdZwXW4PQtyaX0Kqo+5OceUYJhA5i3iIC/tOERZ6FZncTNJ2X
 DIOuiqIr3I6hlAgxgPAr24cxh26BlexB4VrA2IzgGo528hcnXbr5QJSjWG3DeZKb
 jf0kM4ZzE0bw5bnKCw/CDTMydW7QWrecXAoLnOAtkR03vUNYTRessikfDOzGfuYx
 vP3foEPKfmAsjcoUOj3I40PjlHtYlCW8jmIf6kB0EsMvQSTU9G4addLW83Mld81t
 dIK8iALmZrrTK5Y+7QLz/VGGQ3NDZh6WrAiGscDkm2JB3AMWe0SZxgZ7ooz2yHj0
 KMHdC5q8FQ8sgF24Hag0Mwl56E85RccAEQEAAYkEcgQYAQgAJgIbAhYhBA5j1xbX
 asCApKM1E/QIALYpjrljBQJg99tXBQkOX0DXAkAJEPQIALYpjrljwXQgBBkBCAAd
 FiEEhAodHH8+xLL+UwQ1RxniuKu/YhoFAlodaIAACgkQRxniuKu/Yhr+EA/8Duvs
 QsVbDsXnDyZybrV5bMmnHeJ091Q3u7vRkuWKbCJ9chzowXtjE/yDWyBuia94vcn2
 o4cJ+TsWss1ncrrlwCfX1eQrNCQIjba9ZJynNkJ1YPj4mH6RJFtg+Zau72CCJu5H
 GCHKFpoT05Xnp+6gQW/iylse3XhCgY35e7Psz0Qs591jWM4ASIrxQOI5E157uULw
 JdZ7n50aoz3ogMObL3v5l4tT1aLEb2sQcfBI1hwAzNi2lGAxkAHFbfjW8Qlo3PNq
 0tCouFyuUuckU83A4d4ohwZbryn3N+rTqGZT5Hls9I7MajsuXLF76nJkFDygkibd
 C848hX0pkY6GWDhT+RJb1tdYPvOVQFgevzS5F9sABM/6rZYpAjhFsS5YnqrrlNuV
 nFrIoSJm6APkg13dfSlhItc6n/K0NS8SrZcISxxVGLH4fv/BM8US1tnb1v0uB1dm
 2ekYFOoCBSk6qsBkj4JwB0MHOOHPE8MGXiX7u99Gwi3xzHcBKLfhRDHlK6LVdIgi
 +XneAM2QWWE3fHKnDwyK5PgxYLO1Pn/DnK/HHrqh+JEACefvtX6D7HVwonTOIoAL
 tO99wh2diWRk0qEbNG9kVrxRnS35hFtTDdrJDOuax3mqjNzaya/+5VnIk8jJJ90l
 8QNLuZDX2RmVKDBbzFqnJOsLDvLauUog0yvekXTNRg//Vvg9iwmU+5KBx1P8Fx4T
 JRcIjGon6WF76HLH4qVY4/eYGqU7X0v3HkqrPmi4gq7ncKwMfzm4XngYkaydv9Y2
 rbIWx0tcKxsTyMg7VIKqZ7P8kmE5sKXC9kNsOB0+77obIKGin/hJioGxXNHzFwfi
 ZSzpjWiyl4wwITuD6Y9Q9+g9yXm//kw4KY14HeWZ4KX0LD6iR+b1QVaeASmnO/4r
 DeCvGn/8oZPn/ygHZS9Pn7FLEp6QUB6Y98MXrVFCbtU2uhLWJ0G6VMuyxcawX3mV
 N3xzEqhqflpfJaDK7noTJ5aIYopE2NKcYvMeBiljLaw/8eK2reWrj8EgLytfi2VF
 nJ/fXxZNzz+QuuGwA+/rSE3KgirWZXTpd/ri80YV9CjXJn6D7fyAnibp1QmCd5RE
 PUZ1J3ddyVIhO9/ootqFBqjZm80zfF6QUbsMPJPe72CpFeaLmKojnsJpRERf76Yr
 c7vyiePbM7TgilksyrzyS/ogNc/h8zHw3NHZOq9GAeABGPOT7Xpexqw1QDl8r5Y4
 vHKYq6tCDKbWot+PdHPKBbn4nwuS8/R7c4pet5q90+i6XqVdeihL1OhuAfFjywIh
 5bCft5emlE6jJFIH0UsalwgrAPACrc1Ptfo6IQMy3CQAOZx1+QQBUbNO8ZPubfrL
 7Y8fNmEZnc77I3jKchrBHhe5Ag0EWh1o7wEQAMe9DvNr3jsjJnOwuRBpudWWY09P
 y3croZfPT4s4npGO1PfLJ5XOfucU5YtIu1q84RPopWnFjjO1EgPTXhTy5vBmkFzn
 5fb7Hk1T6isZzz/hiQ7q7WwcduByoC1ehQQYnCfTQGZWgceNKhKczTbZgJMGtVbz
 9QVpw0xg8HnhWXkYFLEQq03gKKNEGaXozKF8VwC/hFOu6BH543Zqd3gLpMVHiU1p
 VVKk6AjKXgR35Z39n/0k+/2u8pBUAFgPsMKRp1mZsBjDDeNOnt/qJP55QK3Ln3qX
 +ECqB8ZIQud00szC90AxfP/JMCh5+Idz1T/XnmSr081WiyHkfA5KBLXmYk9X4xEY
 3rWS1nNU6qLygnp8dJeiNzF+fRa4u7KNDi3mmT+purPzu6WVA/HgVMRoPlYDI/1T
 dmYWrREk2FR3K0C2lLBBer/3A4r+I6eMTKRuoqp7P/lFYNCdCWF5KefZmtQ5r5V7
 +Bw9yq/c2p66qiUqHpPZYY+fnlRL6ImP8NNXLmjnqqHVsbqMYGQkjJj73hWqr08m
 YTAnVxtKFPJpnnStsnpJd4iarbxO3ri6ejJF8tOtW6i6ALg1w700+XXV/tL82QWS
 scGBRds9Khbxltam6f9cJ/0WALYFklaa/VqLG+ixwyCfew/x1Ggi70m/fKXKaQeZ
 UZXBnIxVWk5XJBk9ABEBAAGJBHIEGAEIACYCGwIWIQQOY9cW12rAgKSjNRP0CAC2
 KY65YwUCYPfbVwUJDl9AaAJACRD0CAC2KY65Y8F0IAQZAQgAHRYhBC/PLVnYvt2I
 tWDuv0D3dJxPL97tBQJaHWjvAAoJEED3dJxPL97tAuYP/32FGXXOFAKir3El4yTL
 6xxCfBjlNcafkhT46BC8SkgW9SGUFzHdhMsTgML6iOirZVpnQw6WxoECy/X0FUvH
 J5YK9EXYJcUmS8WitKBjNphqcgKdy4RmwKknr/P8g9ZRPmBN+j1Ym/oZDzK5QNBw
 syiES6GJmpCs3WCWI29v+BV0bCtqJn9fNZrSzvA6Nv9/KV4I6u0JfEK1TkP43x2+
 Ws+ZoMFnOv02ZoxK2R/Y/WCPnHghNZ+TygUax+1nysP6MYYwKJRP75t3NWum6MZN
 94zmpXgVr1pGJVze7nzZH2HBuCK8Q3SSCkUA9rV/tKHrT9FQ4mQJs39BlNii68hu
 aOnAJ3jlXPpLWHsStiuxRwxAZOVct+MkDP0TXoBq6MREKBbmImhf88sGnNm7W9Mk
 0Kwj6INC6ysQMIDWLGm/4fiixVm524JHkvt2OWumFPxnv4fMdU3rd2v1dyscLMXv
 lyJDFzGvEp/dt4qt3fQDpSn0Gn8dJgqTAKDPAVgkTbaNrj0x1i+PCXhnwlKHPJwv
 58zgjaSG0xa+6jTNnMorZWBKhTHKmzNGLbQWZn2BT+MO0UxKzu81R5tUHGXiYOfn
 +osnT6XFjJSZEB9dCWy6DPL+0n6WU3pGNXSdgj4byu8HTzheqpYk3aeimZOlC+mu
 TAR/TDRb6XbrVAA7RZK5KX+dziIP/RBB8mo7P2PM58MQDDsUtvDyHW5cCitEzToo
 0H7MSlXMIF1B9ZtSXahdNLj29ibX77Mjd5ITm7ZFAkoOS1zlhs5HHq6weZzo8bDj
 9mZqcCX9DGlo5yMdjdYYpkCLfcb72G87JusncMsc9kzJaK4GRntjpUuLSbjM3qKp
 ioT/JIzmL9ln8bQHXK3CKdqIsC5BjfkBsMz6v7BTvwZcB3DQRmCF3dyZtIZ6ekzJ
 k+fMl5dWsvHfN+IR1SmiXeLYWTUvjAiQ7Fq+Yj2k//fa4HsDFZzO2cba/Q0b9Bom
 ZslAnTAAmxAWECG2LXX3mOwaY64cRBViNuC0FEVzsmRXZkTLMAkt78ox/5scYa7K
 phMkpogtEUUqk5tt6rMp35y9J+FDs64ECIV1wA/WZ2jgViGZVWzm5YVCbfgxIpc9
 RLgN+mo3tppjHp193cA205PLOIOqkYvSJi7t5tf4WZBt7QjNAQvcMb2hAC4g9hh2
 WG7E6hOBZm1ASoM/xsJ95fg7EuwUr5CWnPbrUKKUt0UoZjjlZyuKU60mITvas7Ry
 kjy20+zJLfl6cPwXXKwx7m633engvof7Nhy9jrMNoPh1Gbqn68y/ADj549uSQOOT
 mf7eqPHowV9rtNsF3T+EOrS9AoUbVGG6V3EBg6cwoRClIBXjp9stwecYdAED31oo
 HW63kq2FuQINBFodaCcBEADPJ2WVrwH6E/sQIADyG0M4T0fGDeZjj6/8ELqA9ePi
 9V43WGyvPR6oDuxBfQhdmDJl8Mv3s0bAAdZ0Ua8QScbOWrCVUaS3bNAC1ORype5R
 DfNYmlbd8zJPQEfXNC627RXPAxvzuBreYi8ZHEgVuRLDzq7cdDoYy3YxF0gqEgyW
 y/2v6+GXySXJ9/hTgzmdGg+NAHqiEggT/V3yR5wD9CnKSkacu7+WwrRHKZxPvHZ+
 72Awn1g00YVbkcSe00AC7OpY3CfRawoc7/44r+7r+DrTn+nRCwJJ782xZY92+XLW
 5nnm4OEWwf3i/6R8CXjKt7kEgn2um0pc4YG9UtXvpi5qCx7cP7VslPjgCtX5v8dR
 djMTIAsu+DIH10go/Z1OoWuP9SE8y67htnNdozqOGa+y5j5E+ryrYP4LKr3CkmIE
 Vih7khfRPg23xiPf8VNRA8uMKArKlsKBusiMMywV4iZTYsYVvIpnnHn2ddRPbkWW
 Um/DN+YRoLfCzGwQBnH3Xgd/RaO7JtT/VQkf3kz6f66IZeQGm5wmx0cuWrpno4mR
 gj5u7NswameJF5y1WATEuzsE9AdGbWnG6XBTeUyJIU1BV8sTgURcVvwABEhM/ABE
 Xc4pSmP8T0uP2vqn+IoRGLHkyoAtMnbkZfqxlYIcBXH2T2kRQp3nJ5BG16LL/Xbh
 HwARAQABiQRyBBgBCAAmAhsCFiEEDmPXFtdqwICkozUT9AgAtimOuWMFAmD321cF
 CQ5fQTACQAkQ9AgAtimOuWPBdCAEGQEIAB0WIQRA66dScVcpWs8Ls54lyuLm4GBo
 6AUCWh1oJwAKCRAlyuLm4GBo6L1MD/0c/keyynX6eP24B2+dP7X7Gj6Oqb3wfL5u
 A2jmg9tv66/lDGSqdF63oI7fE/2yBS7bO7WWYzbEiPJ6srosq0oBbqm3yxRFbmkq
 VIwuUdv3wFryZWN2Zhep86MSYfMkY0fAr01Q7kkJhfV9S6wem0Nf90POL8OedgSs
 RzTZrdngmC6gYk8OGdKpYUVaTilh2o2rV0LvbfYBobVzRPZValC0iayIkQaUn0OA
 S+JSnVmopnXtnSNuC4ePyB5agYdgD/EeoW58VkhQYQiQ1UKXPHilZXZKCLS3fpd9
 2Cq5Lu5rzBZano++NWfVkM/x4RHmQT5m5ekBJNIjSVJE3iD1rGAdnVppX9PSnS+P
 t3dgvaesin/oQbvc/OEQa0BBYhSqmNTvwmdqBesTYLtKtcZV5iihl7hgwqeiZO6d
 k6K6gAofQEhSRVPaPDtuO/nwGuL39oJlN++6TXmM//+AMCnfGEh+pYZIzM+xjUXn
 EuUnoj38AKSqx7cR5o1xx79dC/9zI4i5zmn2m/4mmp3oZ/tq2sT3H5ATN6APUCHW
 f8pq1uAVXEzfc/BN7LXqXMOpL3uSKAFZrVAF3jsATC6w2lXLB6zwp3/7cZ8tL73Q
 8eMQM6KP1ueIoyKjn9/7vc2M95FAFG4g6CSHDAXEWOvTPbzexwaax+dPjlFMth7D
 kMm+wV/pI4rlD/0anqJMTfSvKfJwrrIGWeii3hVUTqjEUDDWrNZ1vzyVq99BTjLd
 i77EomWk16XCZ/9gCFfcT/WEU+2rwohhoiy+t1TX3pCkRO1wJtGIiWqROi9Nz6aD
 NJ/NuDEqJydbZnZQiQUbk6ExsElS2/6wwVop9UWUvnrktmj/XhPlPkUoXVHyrgsz
 Bi+MqvIqokOyzuURMwei7FJZSl3oec0ixXpXLZczs4x/YKgtDMeS2aOuKL+HB+Gs
 pF1mrZ3BdahdsuttDiz5m4sJdUePy638szZ2JB+NJyDQjOSqF8NqGKyrwZjuxsIL
 jbT3xK2lSm4DEUrbyRn3EjcWqYcXQRLFUvGRKQEEt6F5Dp8KBhXQs2FX4ET9XL3L
 FSy/UDwv85Bm/Y2PkYckhRX8HTtgwaC2Tv+26z9bIdb7HXL+BHf9SNSx/yMDOgi1
 O+afJ7+e1uRQzAwV2b5RDvN8222Yznkcf+ByNBxlUrSuBQBS+JVaRyoltwNDHPEL
 Iw7y7W5StK7WFeANiE+SkngzR+YsTlZuRdLh7Awvil3qyUD5EXQNLPfGpkFt4jx9
 kOrn7JjyfLnoxRuVuBi1D4E6RyCO+4pxyN1cnLQ6RqD+y9WIlv+JX8J5zje+vpTB
 H0bAlzrkHPlw1NAJPI1DH1BvIhvWbsUylDVf0cjz11FJRZZ69sqg9D500LkCDQRh
 AYhRARAA57HTiyPSvbRmAhGiArcm1/XByTXx08WkvQoexGx0qJc2ON1p/5kabojf
 6TZ7FBXjFjSvq1ujneVcN4Oo1CU6GB3SAXW7hv1VIiEA6mpzF7mtzoE+wmqZaw8q
 +lBp1cHuCB5O6dkKAln0WqXwx83MoVXK20A4tOmDjYWuuBkYuaUj/08Yi5aKP/Um
 YrGT+CNbDX/qHkcOLDTfopXIv3SNJfzvSv9HhMbzlQO2/xQAxCNsS4Kz/vl7P0EN
 79Ys6o8RmYghwbS2OkNkzOnxoII+gFJchn3YZ7Zolv3GilqexH0dfEhy+d1nuxOs
 po07JVXSPwVV1LOTo4aWfhyTCiJRpnkLEgD1kehtlpTH5lyDFHuzL55EzoUcEffF
 8i4u//CBthjO91+b/PFn+Vg7XdJhu7c9NGy+Qxbx2lwQC3D9si3a6bdhH86qbtGy
 bj9evcoHMnuJY4YDuyUeynUjQzulEzEqmbAK8bl6jlEiGXhgWitv2Pq/021XB5M0
 0cKlA46jl/HOeZJ15/9nNkBWVj9dAVnuA11BbOPdgxZteT481vlcJRG3pHiMRjRZ
 j5by8tTjv0mkumhVU5diK7pQGdWQVVwscOILFTAySuk/3v2DEcBSDkOpHlEVrLYR
 IgCUaJom6S3XzBB9fj23wLnc2dU8JFC4pTzXCD84AtD9dbR/8D0AEQEAAYkEcgQY
 AQgAJhYhBA5j1xbXasCApKM1E/QIALYpjrljBQJhAYhRAhsCBQkJZgGAAkAJEPQI
 ALYpjrljwXQgBBkBCAAdFiEE+vQmaPxCY82Dw2UUn4U98kvC3+EFAmEBiFEACgkQ
 n4U98kvC3+GxZRAAm2kJp2XA3tVyaFMDAohB63lChMQN0+imkX6xswTAtwz/B1Sn
 hh7QUp6YtWJ4F/1Bg2xnS4y8HLBPw1od94EhXGYzm4+ONFmtjZ2sbca3OwEFuIex
 +PSHO7TgCiBks7LIkBM/fEg4UeutTqhzrR1SrmB4RoBtUPgnrfGk+esd8nVMa0gF
 GdPsQ8hdmj88cG1OwfQm2D7SgbY9ik2k7pRDzMQOThI6CxIfwE5nvY03CnNi8bNP
 IhkKWZF9d96+LTue22vhwl3tvlIryDTFJm0w0HXFNvAdVoOfpLsAtvh7uxpMO7fn
 Z3sbVlCdXjYrBbi6eHXRKdUCLBRkKlWI3vajDeXz736y8/Ar/qtsphQ7z1f9LiyM
 PP/8DiFIwfHme591jiHIS0C5IEyl4l0VwBpzDpUirM9RX/AIbmvI+1eGXXldTUme
 AHuqQuqxwwVxfpzk4sQXxPNfrHiBoPThKuyZdY2aiWyYrVtHXyfhYWMdoHoq0Zrs
 3AsNfjoSJ4rivrlOnBMGjOrz97VuC/DqArbNe011PH1ieW3GGeiHDYVUTN2dWpWw
 gL7IWk7WwI6b7LhACmGcjhG+9XZLBleh1djkLn7WrvqyA3FQSIVhzz904NhB3pVq
 1s8Vn7bUiATkABQVxXXhZveWv6yepSYlqC9CP8ofAcG2K0BM70Z6COUC9PlrsA//
 ZWb8+GYHOWCxNS/O2XTCZGk1zZrMZo5MmMlMv5N+TYa5f93sK6Qz9CJt7CBcqnnM
 NChc/qQais0tVS5nJ/JJEvB7TnDRKB3sTuMJ8oiTsQXQ1xzRDA5cUkVVYX90Xh1Z
 52aEb40L3Vhqk5BaQqLe7vnZphaJUm+HUfOYlqgvrDAFkzUmJS3xExppQiAxbW3h
 pvy/UWWE/tI9VLI/+f6V66mkqi698bxXSqXsQ2Id10p2iG5oyvoQZP+yYJBwWazb
 UCCpSw+Ghxh5CdsLttDA7lHD2MDunVd2pTFr359WonCTY6J/9yubTnZ2zVqXax3X
 9Z4ExbQMnvh3bwqgK72XmrdV1gkcwaiv9mmcdxrYDVLguAluxMK5uQQX2VskuW0/
 eB3/swK2FSmpQRlfhcaipcbAz/53GYUh+LDV7EfoCEJlFZybT/1555Nd1xt1rGfd
 gGldtXu//crdcEv3iB9Or4jjAI38mNfL04S+NBPxGTZ5lVw2zj48lF+dD63SHC4G
 JGTGsIMmV4FsxA/og/aU13u5ZQ7XcM7ZBfvEafsGPYhQDpKd0ajt3vrjGkv2YFGr
 ymsOltPwWWTk1xxOpND0xuO+rzW8dj99Vm3+e4kGfD08P0LXzgpMt8z1S6fxIdzg
 7rWspVlv967Of7t6TjfOIj6x8J+njPKXl14S5inazLU=
 =MITl
 -----END PGP PUBLIC KEY BLOCK-----
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,6 @@
 ---
 specname:
    match: suffix
 runpath:
    allowed_paths:
        - /usr/lib64/samba
--- a/2
+++ b/2
@ -0,0 +1,2 @@
 SHA512 (freeipa-4.12.2.tar.gz) = 2e1e67dbe73a458db5c59528799649629a1cb462283e4e9a4c56aff46d275782bcb3b0d57de615bbc7020a4350d4d383501e049ac19ed38250896b1e8fd27cb0
 SHA512 (freeipa-4.12.2.tar.gz.asc) = 07309bfdafd2ba9b1ced71374df5a84d242a5bf8e806765b4c3374ee2ddea0484f140d615a24b3f73f39a8ac34727d82a066ea399f91654077170519a12e2d27
--- a/tests/tests-DSP.yml
+++ b/tests/tests-DSP.yml
@ -0,0 +1,38 @@
 - hosts: localhost
  roles:
  - role: standard-test-beakerlib
    tags:
    - classic
    repositories:
      - repo: https://pagure.io/DSP_test.git
        dest: DSP_test
        version: master
    tests:
    - DSP_test
    environment:
      # RPM package containing the policy module
      TEST_RPM: freeipa-selinux
      # policy module name
      TEST_POLICY: ipa
      # policy sources will be extracted from corresponding .src.rpm
      # policy tar filename regexp (e.g. "usbguard-selinux*.tar.gz") 
      # or empty string if policy sources are not inside a tar archive
      POLICY_TAR: 'freeipa-*.tar.gz'
      # path to policy sources (in of the tar archive) -- <POLICY_TAR>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
      # or path in the src.rpm if there is no tar archive -- <src.rpm>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
      # can contain wildcards (e.g. for versions etc.)
      POLICY_PATH: 'freeipa-*/selinux'
    required_packages:
    - policycoreutils
    - selinux-policy
    - selinux-policy-targeted
    - setools-console
    - libselinux-utils
    - rpm
    - tar
    - git
    - freeipa-selinux
		`@ -1 +0,0 @@`
			`da1bb0220894d8dc06afb98dcf087fea38076a79 SOURCES/freeipa-4.9.13.tar.gz`
		`@ -0,0 +1,2 @@`
							`SHA512 (freeipa-4.12.2.tar.gz) = 2e1e67dbe73a458db5c59528799649629a1cb462283e4e9a4c56aff46d275782bcb3b0d57de615bbc7020a4350d4d383501e049ac19ed38250896b1e8fd27cb0`
							`SHA512 (freeipa-4.12.2.tar.gz.asc) = 07309bfdafd2ba9b1ced71374df5a84d242a5bf8e806765b4c3374ee2ddea0484f140d615a24b3f73f39a8ac34727d82a066ea399f91654077170519a12e2d27`