ReconnectLDAPObject.reconnect(): Fixed invoking start_tls_s()

ECN · Sep 8, 2014 · 7a318bf · 7a318bf
1 parent c4e7647
commit 7a318bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -8,6 +8,8 @@ Lib/
 * New convenience function ldap.escape_str()
 * New convenience methods LDAPObject.read_s() and
   LDAPObject.find_unique_entry()
+* Fixed invoking start_tls_s() in ReconnectLDAPObject.reconnect()
+  (thanks to Philipp Hahn)
 
 Modules/
 
@@ -1110,4 +1112,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.322 2014/07/25 17:08:56 stroeder Exp $
+$Id: CHANGES,v 1.323 2014/09/08 19:48:11 stroeder Exp $
diff --git a/Lib/ldap/ldapobject.py b/Lib/ldap/ldapobject.py
@@ -3,7 +3,7 @@
 
 See http://www.python-ldap.org/ for details.
 
-\$Id: ldapobject.py,v 1.139 2014/07/25 17:08:56 stroeder Exp $
+\$Id: ldapobject.py,v 1.140 2014/09/08 19:48:11 stroeder Exp $
 
 Compability:
 - Tested with Python 2.0+ but should work with Python 1.5.x
@@ -826,7 +826,7 @@ def reconnect(self,uri,retry_max=1,retry_delay=60.0):
           self._restore_options()
           # StartTLS extended operation in case this was called before
           if self._start_tls:
-            self.start_tls_s()
+            SimpleLDAPObject.start_tls_s()
           # Repeat last simple or SASL bind
           self._apply_last_bind()
         except (ldap.SERVER_DOWN,ldap.TIMEOUT),e: