summaryrefslogtreecommitdiffstats
path: root/install/tools
diff options
context:
space:
mode:
Diffstat (limited to 'install/tools')
-rwxr-xr-xinstall/tools/ipa-csreplica-manage5
-rwxr-xr-xinstall/tools/ipa-managed-entries3
-rwxr-xr-xinstall/tools/ipa-replica-manage4
-rwxr-xr-xinstall/tools/ipactl2
4 files changed, 5 insertions, 9 deletions
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage
index 2c8d03a9..cd2fd010 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 df1b8930..5bf3ad64 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 82648bd5..fb80ca75 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 86632f88..6500c274 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