From 2c393ab641ee96892093e3a5952828827077e76e Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Sep 24 2018 06:25:28 +0000 Subject: ipaserver/install/adtrust.py: Do not use DOMAIN_LEVEL_0 for minimum As there is the minimal domain level setting MIN_DOMAIN_LEVEL, it should be used instead of DOMAIN_LEVEL_0. See: https://pagure.io/freeipa/issue/7669 Signed-off-by: Thomas Woerner Reviewed-By: Christian Heimes Reviewed-By: Rob Crittenden --- diff --git a/ipaserver/install/adtrust.py b/ipaserver/install/adtrust.py index f4496ad..e9ae3fa 100644 --- a/ipaserver/install/adtrust.py +++ b/ipaserver/install/adtrust.py @@ -13,7 +13,7 @@ import os import six -from ipalib.constants import DOMAIN_LEVEL_0 +from ipalib.constants import MIN_DOMAIN_LEVEL from ipalib import errors from ipalib.install.service import ServiceAdminInstallInterface from ipalib.install.service import replica_install_only @@ -258,7 +258,7 @@ def retrieve_potential_adtrust_agents(api): # because only these masters will have SSSD recent enough # to support AD trust agents dl_enabled_masters = api.Command.server_find( - ipamindomainlevel=DOMAIN_LEVEL_0, all=True)['result'] + ipamindomainlevel=MIN_DOMAIN_LEVEL, all=True)['result'] except (errors.DatabaseError, errors.NetworkError) as e: logger.error( "Could not retrieve a list of existing IPA masters: %s", e)