diff options
Diffstat (limited to 'install')
-rw-r--r-- | install/migration/migration.py | 2 | ||||
-rwxr-xr-x | install/tools/ipa-csreplica-manage | 5 | ||||
-rwxr-xr-x | install/tools/ipa-managed-entries | 3 | ||||
-rwxr-xr-x | install/tools/ipa-replica-manage | 4 | ||||
-rwxr-xr-x | install/tools/ipactl | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/install/migration/migration.py b/install/migration/migration.py index 38f280f4b..81b15b021 100644 --- a/install/migration/migration.py +++ b/install/migration/migration.py @@ -29,8 +29,8 @@ import wsgiref from ipapython.ipa_log_manager import root_logger from ipapython.ipautil import get_ipa_basedn from ipapython.dn import DN +from ipapython.ipaldap import IPAdmin from ipalib import errors -from ipaserver.ipaldap import IPAdmin def convert_exception(error): diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index 2c8d03a9d..cd2fd010b 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -25,12 +25,9 @@ import os import krbV from ipapython.ipa_log_manager import * -from ipapython import ipautil from ipaserver.install import replication, installutils -from ipaserver import ipaldap -from ipapython import version -from ipapython import dogtag from ipalib import api, errors, util +from ipapython import ipautil, ipaldap, version, dogtag from ipapython.dn import DN CACERT = "/etc/ipa/ca.crt" diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index df1b8930b..5bf3ad64b 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -22,9 +22,8 @@ import re import sys from optparse import OptionParser -from ipapython import ipautil, config +from ipapython import ipautil, config, ipaldap from ipaserver.install import installutils -from ipaserver import ipaldap from ipalib import api, errors from ipapython.ipa_log_manager import * from ipapython.dn import DN diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 82648bd52..fb80ca752 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -27,8 +27,8 @@ from urllib2 import urlparse from ipapython import ipautil from ipaserver.install import replication, dsinstance, installutils from ipaserver.install import bindinstance -from ipaserver import ipaldap -from ipapython import version +from ipaserver.plugins import ldap2 +from ipapython import version, ipaldap from ipalib import api, errors, util from ipapython.ipa_log_manager import * from ipapython.dn import DN diff --git a/install/tools/ipactl b/install/tools/ipactl index 86632f886..6500c274c 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -27,8 +27,8 @@ import ldapurl from ipaserver.install import service, installutils from ipaserver.install.dsinstance import config_dirname, realm_to_serverid from ipaserver.install.installutils import is_ipa_configured, ScriptError -from ipaserver.ipaldap import IPAdmin from ipalib import api, errors +from ipapython.ipaldap import IPAdmin from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket from ipapython import services as ipaservices from ipapython import config, dogtag |