diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-31 06:59:35 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-13 12:36:33 +0100 |
| commit | 91a63cce6203cb8d0cf956d9e30842db365500da (patch) | |
| tree | 95e6876cb7621beeb6c18ac4336968ddab833c1a /ipaserver/dcerpc.py | |
| parent | 4e6a2a916d99c4eb9f5e6f5d622517e1b3fe323e (diff) | |
| download | freeipa-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/dcerpc.py')
| -rw-r--r-- | ipaserver/dcerpc.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index b8f83e9a4..150f72709 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -31,6 +31,7 @@ from ipapython import ipautil from ipapython.ipa_log_manager import * from ipapython.dn import DN from ipaserver.install import installutils +from ipaserver.plugins import ldap2 from ipalib.util import normalize_name import os, string, struct, copy @@ -48,7 +49,7 @@ try: except ImportError: from ldap.controls import LDAPControl as LDAPControl #pylint: disable=F0401 import ldap as _ldap -from ipaserver.ipaldap import IPAdmin +from ipapython.ipaldap import IPAdmin from ipalib.session import krbccache_dir, krbccache_prefix from dns import resolver, rdatatype from dns.exception import DNSException |