From 2ef53196c6a012ad7d02aed5672d69fbcb5d0a4e Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 2 Oct 2020 15:06:58 -0400 Subject: [PATCH] Enable importing LDIF files not shipped by IPA This is to be able to import ACME schema provided by dogtag. https://pagure.io/freeipa/issue/8524 Signed-off-by: Rob Crittenden Reviewed-By: Fraser Tweedale Reviewed-By: Christian Heimes Reviewed-By: Alexander Bokovoy Reviewed-By: Rob Crittenden Reviewed-By: Mohammad Rizwan --- .../profiles/{acmeServerCert.cfg => acmeIPAServerCert.cfg} | 0 ipaserver/install/service.py | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) rename install/share/profiles/{acmeServerCert.cfg => acmeIPAServerCert.cfg} (100%) diff --git a/install/share/profiles/acmeServerCert.cfg b/install/share/profiles/acmeIPAServerCert.cfg similarity index 100% rename from install/share/profiles/acmeServerCert.cfg rename to install/share/profiles/acmeIPAServerCert.cfg diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index b1ea6883c..2afb251fc 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -347,7 +347,10 @@ class Service: ldap_uri=None, dm_password=None): pw_name = None fd = None - path = os.path.join(paths.USR_SHARE_IPA_DIR, ldif) + if not os.path.isabs(ldif): + path = os.path.join(paths.USR_SHARE_IPA_DIR, ldif) + else: + path = ldif nologlist = [] if sub_dict is not None: