/[packages]/cauldron/autofs/current/SOURCES/autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
ViewVC logotype

Contents of /cauldron/autofs/current/SOURCES/autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 49039 - (show annotations) (download)
Tue Feb 8 16:35:13 2011 UTC (10 years, 5 months ago) by ennael
File size: 1442 byte(s)
imported package autofs
1 autofs-5.0.5 - remove ERR_remove_state() openssl call
2
3 From: Ian Kent <raven@themaw.net>
4
5 autofs should never have had to use ERR_remove_state() so remove that call.
6 ---
7
8 CHANGELOG | 1 +
9 modules/lookup_ldap.c | 12 +-----------
10 2 files changed, 2 insertions(+), 11 deletions(-)
11
12
13 diff --git a/CHANGELOG b/CHANGELOG
14 index e9deabf..ce9c385 100644
15 --- a/CHANGELOG
16 +++ b/CHANGELOG
17 @@ -47,6 +47,7 @@
18 - remove extra read master map call.
19 - fix error handing in do_mount_indirect().
20 - expire thread use pending mutex.
21 +- remove ERR_remove_state() openssl call.
22
23 03/09/2009 autofs-5.0.5
24 -----------------------
25 diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
26 index e9d1fa2..3d47048 100644
27 --- a/modules/lookup_ldap.c
28 +++ b/modules/lookup_ldap.c
29 @@ -169,18 +169,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c
30 int rv;
31
32 #ifdef WITH_SASL
33 - /*
34 - * The OpenSSL library can't handle having its message and error
35 - * string database loaded multiple times and segfaults if the
36 - * TLS environment is not reset at the right times. As there
37 - * is no ldap_stop_tls call in the openldap library we have
38 - * to do the job ourselves, here and in lookup_done when the
39 - * module is closed.
40 - */
41 - if (ctxt->use_tls == LDAP_TLS_RELEASE) {
42 - ERR_remove_state(0);
43 + if (ctxt->use_tls == LDAP_TLS_RELEASE)
44 ctxt->use_tls = LDAP_TLS_INIT;
45 - }
46 autofs_sasl_unbind(ctxt);
47 #endif
48

  ViewVC Help
Powered by ViewVC 1.1.28