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 /install/tools | |
| 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 'install/tools')
| -rwxr-xr-x | install/tools/ipactl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/install/tools/ipactl b/install/tools/ipactl index 13a1a272c..ce4fe0254 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -31,8 +31,7 @@ from ipaserver.install.dsinstance import config_dirname from ipaserver.install.installutils import is_ipa_configured, ScriptError from ipalib import api, errors from ipapython.ipaldap import LDAPClient -from ipapython.ipautil import ( - wait_for_open_ports, wait_for_open_socket, is_fips_enabled) +from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket from ipapython import config from ipaplatform.tasks import tasks from ipapython.dn import DN @@ -544,7 +543,7 @@ def main(): elif args[0] != "start" and args[0] != "stop" and args[0] != "restart" and args[0] != "status": raise IpactlError("Unrecognized action [" + args[0] + "]", 2) - if is_fips_enabled(): + if tasks.is_fips_enabled(): raise IpactlError("Starting IPA server in FIPS mode is not supported") # check if IPA is configured at all |