diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-23 16:13:31 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | 75b70e3f0d52a9c98f443d3fc2f7cef92bdc7b1a (patch) | |
| tree | b96ee0dcba2c031f1ac685e468e1d97183ffdade /ipaserver | |
| parent | d911f493482d29829199cce2f91f88a9b53369e1 (diff) | |
| download | freeipa-75b70e3f0d52a9c98f443d3fc2f7cef92bdc7b1a.tar.gz freeipa-75b70e3f0d52a9c98f443d3fc2f7cef92bdc7b1a.tar.xz freeipa-75b70e3f0d52a9c98f443d3fc2f7cef92bdc7b1a.zip | |
ipautil: move is_fips_enabled() to ipaplatform.tasks
The FIPS setting is platform-specific.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/server/install.py | 5 | ||||
| -rw-r--r-- | ipaserver/install/server/replicainstall.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 644578dc7..9bb1e120a 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -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") diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 3b57c7f5c..1aad308bc 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -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") |