mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
ldap: Use SimpleLDAPObject instead of IPASimpleLDAPObject in LDAPClient
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
@@ -830,7 +830,7 @@ class LDAPClient(object):
|
|||||||
if not self._has_schema:
|
if not self._has_schema:
|
||||||
try:
|
try:
|
||||||
schema = schema_cache.get_schema(
|
schema = schema_cache.get_schema(
|
||||||
self.conn.uri, self.conn.conn,
|
self.ldap_uri, self.conn,
|
||||||
force_update=self._force_schema_updates)
|
force_update=self._force_schema_updates)
|
||||||
except (errors.ExecutionError, IndexError):
|
except (errors.ExecutionError, IndexError):
|
||||||
schema = None
|
schema = None
|
||||||
@@ -1137,7 +1137,7 @@ class LDAPClient(object):
|
|||||||
with self.error_handler():
|
with self.error_handler():
|
||||||
# bypass ldap2's locking
|
# bypass ldap2's locking
|
||||||
object.__setattr__(self, '_conn',
|
object.__setattr__(self, '_conn',
|
||||||
IPASimpleLDAPObject(self.ldap_uri))
|
ldap.initialize(self.ldap_uri))
|
||||||
|
|
||||||
if self._start_tls:
|
if self._start_tls:
|
||||||
self._conn.start_tls_s()
|
self._conn.start_tls_s()
|
||||||
|
|||||||
Reference in New Issue
Block a user