Ian Kent e6b420
autofs-5.0.5 - remove ERR_remove_state() openssl call
Ian Kent e6b420
Ian Kent e6b420
From: Ian Kent <raven@themaw.net>
Ian Kent e6b420
Ian Kent e6b420
autofs should never have had to use ERR_remove_state() so remove that call.
Ian Kent e6b420
---
Ian Kent e6b420
Ian Kent e6b420
 CHANGELOG             |    1 +
Ian Kent e6b420
 modules/lookup_ldap.c |   12 +-----------
Ian Kent e6b420
 2 files changed, 2 insertions(+), 11 deletions(-)
Ian Kent e6b420
Ian Kent e6b420
Ian Kent e6b420
--- autofs-5.0.5.orig/CHANGELOG
Ian Kent e6b420
+++ autofs-5.0.5/CHANGELOG
Ian Kent e6b420
@@ -46,6 +46,7 @@
Ian Kent e6b420
 - remove extra read master map call.
Ian Kent e6b420
 - fix error handing in do_mount_indirect().
Ian Kent e6b420
 - expire thread use pending mutex.
Ian Kent e6b420
+- remove ERR_remove_state() openssl call.
Ian Kent e6b420
 
Ian Kent e6b420
 03/09/2009 autofs-5.0.5
Ian Kent e6b420
 -----------------------
Ian Kent e6b420
--- autofs-5.0.5.orig/modules/lookup_ldap.c
Ian Kent e6b420
+++ autofs-5.0.5/modules/lookup_ldap.c
Ian Kent e6b420
@@ -169,18 +169,8 @@ int unbind_ldap_connection(unsigned logo
Ian Kent e6b420
 	int rv;
Ian Kent e6b420
 
Ian Kent e6b420
 #ifdef WITH_SASL
Ian Kent e6b420
-	/*
Ian Kent e6b420
-	 * The OpenSSL library can't handle having its message and error
Ian Kent e6b420
-	 * string database loaded multiple times and segfaults if the
Ian Kent e6b420
-	 * TLS environment is not reset at the right times. As there
Ian Kent e6b420
-	 * is no ldap_stop_tls call in the openldap library we have
Ian Kent e6b420
-	 * to do the job ourselves, here and in lookup_done when the
Ian Kent e6b420
-	 * module is closed.
Ian Kent e6b420
-	 */
Ian Kent e6b420
-	if (ctxt->use_tls == LDAP_TLS_RELEASE) {
Ian Kent e6b420
-		ERR_remove_state(0);
Ian Kent e6b420
+	if (ctxt->use_tls == LDAP_TLS_RELEASE)
Ian Kent e6b420
 		ctxt->use_tls = LDAP_TLS_INIT;
Ian Kent e6b420
-	}
Ian Kent e6b420
 	autofs_sasl_unbind(ctxt);
Ian Kent e6b420
 #endif
Ian Kent e6b420