diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-11-21 19:45:34 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-04-16 06:58:31 +0000 |
| commit | 45d9b82f404128926102750e28503de2b768cf9d (patch) | |
| tree | c374025f4cc06ce5aea89d5c07de71afc2bbed13 | |
| parent | 02e1ebe07cca92e2ae7ccdd52dd15428716d81bd (diff) | |
| download | freeipa-45d9b82f404128926102750e28503de2b768cf9d.tar.gz freeipa-45d9b82f404128926102750e28503de2b768cf9d.tar.xz freeipa-45d9b82f404128926102750e28503de2b768cf9d.zip | |
ldap: Use LDAPClient connection management in IPAdmin
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
| -rw-r--r-- | ipapython/ipaldap.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index 4f0ba800d..04b09f217 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -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) |