summaryrefslogtreecommitdiffstats
path: root/ipaserver/install
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-01-17 11:25:47 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-01 16:59:43 +0100
commit5476b144f671f87d833f9cb5dbeda3220639d4c8 (patch)
treebb8c9130ee9febe49f8e833f45f5a1e6a0d58d78 /ipaserver/install
parentdf4ed77962e906b2456c99e57084314000768569 (diff)
downloadfreeipa-5476b144f671f87d833f9cb5dbeda3220639d4c8.tar.gz
freeipa-5476b144f671f87d833f9cb5dbeda3220639d4c8.tar.xz
freeipa-5476b144f671f87d833f9cb5dbeda3220639d4c8.zip
Make IPAdmin not inherit from IPASimpleLDAPObject
Instead of inheritance, the LDAPObject is kept in a `conn` attribute, as the ldap2 class does it. However, all IPASimpleLDAPObject methods are still available as before (using __getattr__-based proxying). Also, remove the IPAEntryLDAPObject class. The methods it overrode were never called in ways that would make them behave differently than the superclass. Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install')
-rw-r--r--ipaserver/install/service.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 88b47da34..38ee45e31 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -153,7 +153,7 @@ class Service(object):
# use URI of admin connection
if not self.admin_conn:
self.ldap_connect()
- args += ["-H", self.admin_conn.uri]
+ args += ["-H", self.admin_conn.ldap_uri]
auth_parms = []
if self.dm_password: