IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipautil: move is_fips_enabled() to ipaplatform.tasks

Browse Source 
The FIPS setting is platform-specific.

https://fedorahosted.org/freeipa/ticket/6474

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Jan Cholasta
2016-11-23 16:13:31 +01:00
committed by Martin Basti
parent d911f49348
commit 75b70e3f0d
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ipaserver/install/server/install.py
View File

@@ -19,8 +19,7 @@ from ipapython import ipautil
from ipapython.dn import DN
from ipapython.ipa_log_manager import root_logger
from ipapython.ipautil import (
decrypt_file, format_netloc, ipa_generate_password, run, user_input,
is_fips_enabled)
decrypt_file, format_netloc, ipa_generate_password, run, user_input)
from ipapython.admintool import ScriptError
from ipaplatform import services
from ipaplatform.paths import paths
@@ -322,7 +321,7 @@ def install_check(installer):
external_ca_file = installer._external_ca_file
http_ca_cert = installer._ca_cert
if is_fips_enabled():
if tasks.is_fips_enabled():
raise RuntimeError(
"Installing IPA server in FIPS mode is not supported")

2
ipaserver/install/server/replicainstall.py
View File

@@ -520,7 +520,7 @@ def check_remote_version(api):
def common_check(no_ntp):
if ipautil.is_fips_enabled():
if tasks.is_fips_enabled():
raise RuntimeError(
"Installing IPA server in FIPS mode is not supported")