From 91a63cce6203cb8d0cf956d9e30842db365500da Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 31 Jan 2013 06:59:35 -0500 Subject: 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 --- ipaserver/dcerpc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ipaserver/dcerpc.py') 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 -- cgit