IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ldap: Use LDAPClient connection management in IPAdmin

Browse Source 
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
Jan Cholasta
2014-11-21 19:45:34 +01:00
parent 02e1ebe07c
commit 45d9b82f40
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ipapython/ipaldap.py
View File

@@ -1709,14 +1709,11 @@ class IPAdmin(LDAPClient):
if not ldap_uri:
ldap_uri = self.__get_ldap_uri(protocol or self.__guess_protocol())
LDAPClient.__init__(self, ldap_uri)
super(IPAdmin, self).__init__(
ldap_uri, force_schema_updates=force_schema_updates,
no_schema=no_schema, decode_attrs=decode_attrs)
with self.error_handler():
self._conn = IPASimpleLDAPObject(ldap_uri,
force_schema_updates=True,
no_schema=no_schema,
decode_attrs=decode_attrs)
if demand_cert:
ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, True)
self.conn.set_option(ldap.OPT_X_TLS_DEMAND, True)
@@ -1727,12 +1724,6 @@ class IPAdmin(LDAPClient):
if start_tls:
self.conn.start_tls_s()
def _connect(self):
pass
def _disconnect(self):
pass
def __str__(self):
return self.host + ":" + str(self.port)