Import Upstream version 4.12.4

ipaplatform/rhel/constants.py

@@ -9,12 +9,19 @@ This RHEL base platform module exports platform related constants.
 # Fallback to default constant definitions
 from __future__ import absolute_import
 
-from ipaplatform.redhat.constants import RedHatConstantsNamespace
+from ipaplatform.redhat.constants import (
+    RedHatConstantsNamespace, User, Group
+)
 from ipaplatform.osinfo import osinfo
 
 # RHEL 7 and earlier use /etc/sysconfig/nfs
 # 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,)
+
+
+__all__ = ("constants", "User", "Group")
 
 
 class RHELConstantsNamespace(RedHatConstantsNamespace):
@@ -22,5 +29,7 @@ class RHELConstantsNamespace(RedHatConstantsNamespace):
     IPA_DNS_PACKAGE_NAME = "ipa-server-dns"
     if HAS_NFS_CONF:
         SECURE_NFS_VAR = None
+    if HAS_PKCS11_OPENSSL_ENGINE:
+        NAMED_OPENSSL_ENGINE = "pkcs11"
 
 constants = RHELConstantsNamespace()

ipaplatform/rhel/paths.py

@@ -30,6 +30,7 @@ from ipaplatform.rhel.constants import HAS_NFS_CONF
 
 
 class RHELPathNamespace(RedHatPathNamespace):
+    NAMED_CRYPTO_POLICY_FILE = "/etc/crypto-policies/back-ends/bind.config"
     if HAS_NFS_CONF:
         SYSCONFIG_NFS = '/etc/nfs.conf'
 

ipaplatform/rhel/services.py

@@ -24,11 +24,15 @@ Contains RHEL-specific service class implementations.
 
 from __future__ import absolute_import
 
+from ipaplatform.osinfo import osinfo
 from ipaplatform.redhat import services as redhat_services
 
 # Mappings from service names as FreeIPA code references to these services
 # to their actual systemd service names
 rhel_system_units = redhat_services.redhat_system_units.copy()
+if osinfo.version_number >= (9,):
+    rhel_system_units['named'] = rhel_system_units['named-regular']
+    rhel_system_units['named-conflict'] = rhel_system_units['named-pkcs11']
 
 
 # Service classes that implement RHEL-specific behaviour
@@ -41,6 +45,8 @@ class RHELService(redhat_services.RedHatService):
 # of specified name
 
 def rhel_service_class_factory(name, api=None):
+    if name in ['named', 'named-conflict']:
+        return RHELService(name, api)
     return redhat_services.redhat_service_class_factory(name, api)