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

allow to call ldap2.destroy_connection multiple times

Browse Source 
A regression fix.

Reviewed-By: Nathaniel McCallum <npmccallum@redhat.com>
This commit is contained in:
Petr Vobornik 2015-04-23 12:03:49 +02:00
parent b88f5333ec
commit 7d10547ae3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipapython/ipaldap.py
View File

@ -1089,7 +1089,7 @@ class LDAPClient(object):
""" """
with self.error_handler(): with self.error_handler():
self._flush_schema() self._flush_schema()
self.conn.unbind_s() self._conn.unbind_s()
def make_dn_from_attr(self, attr, value, parent_dn=None): def make_dn_from_attr(self, attr, value, parent_dn=None):
""" """

5
ipaserver/plugins/ldap2.py
View File

@ -196,8 +196,9 @@ class ldap2(LDAPClient, CrudBackend):
def destroy_connection(self): def destroy_connection(self):
"""Disconnect from LDAP server.""" """Disconnect from LDAP server."""
try: try:
self.unbind() if self._conn is not None:
LDAPClient._disconnect(self) self.unbind()
LDAPClient._disconnect(self)
except errors.PublicError: except errors.PublicError:
# ignore when trying to unbind multiple times # ignore when trying to unbind multiple times
pass pass