summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/bindinstance.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-01-31 06:59:35 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-13 12:36:33 +0100
commit91a63cce6203cb8d0cf956d9e30842db365500da (patch)
tree95e6876cb7621beeb6c18ac4336968ddab833c1a /ipaserver/install/bindinstance.py
parent4e6a2a916d99c4eb9f5e6f5d622517e1b3fe323e (diff)
downloadfreeipa-91a63cce6203cb8d0cf956d9e30842db365500da.tar.gz
freeipa-91a63cce6203cb8d0cf956d9e30842db365500da.tar.xz
freeipa-91a63cce6203cb8d0cf956d9e30842db365500da.zip
Remove ipaserver/ipaldap.py
In addition to removing the module, fix all places where it was imported. Preparation for: https://fedorahosted.org/freeipa/ticket/3446
Diffstat (limited to 'ipaserver/install/bindinstance.py')
-rw-r--r--ipaserver/install/bindinstance.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index dff661dd6..c14f2423e 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -27,11 +27,10 @@ import ldap
import installutils
import service
-from ipaserver import ipaldap
+from ipaserver.plugins import ldap2
from ipaserver.install.dsinstance import realm_to_serverid
from ipaserver.install.cainstance import IPA_CA_CNAME
-from ipapython import sysrestore
-from ipapython import ipautil
+from ipapython import sysrestore, ipautil, ipaldap
from ipapython.ipa_log_manager import *
from ipapython.dn import DN
import ipalib