You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

88 lines
2.6 KiB

autofs-5.1.1 - fix error handling on ldap bind fail
From: Ian Kent <raven@themaw.net>
When calling unbind_ldap_connection() if a sasl connection is
being used then autofs_sasl_unbind() should be called and not
ldap_unbind_ext(), otherwise the ldap connection release code
could be called twice.
So, in unbind_ldap_connection() check if a sasl connection is in
use and unbind it if it is otherwise call ldap_unbind_ext() to
release the ldap connection.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/lookup_ldap.c | 17 ++++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
--- autofs-5.0.7.orig/CHANGELOG
+++ autofs-5.0.7/CHANGELOG
@@ -191,6 +191,7 @@
- fix rwlock unlock crash.
- fix handle_mounts() termination condition check.
- fix config old name lookup.
+- fix error handling on ldap bind fail.
25/07/2012 autofs-5.0.7
=======================
--- autofs-5.0.7.orig/modules/lookup_ldap.c
+++ autofs-5.0.7/modules/lookup_ldap.c
@@ -216,15 +216,18 @@ int bind_ldap_simple(unsigned logopt, LD
int __unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
{
- int rv;
+ int rv = LDAP_SUCCESS;
if (ctxt->use_tls == LDAP_TLS_RELEASE)
ctxt->use_tls = LDAP_TLS_INIT;
#ifdef WITH_SASL
- autofs_sasl_unbind(ctxt);
-#endif
-
+ if (ctxt->auth_required & LDAP_NEED_AUTH)
+ autofs_sasl_unbind(ctxt);
+ else
+ rv = ldap_unbind_ext(ldap, NULL, NULL);
+#else
rv = ldap_unbind_ext(ldap, NULL, NULL);
+#endif
if (rv != LDAP_SUCCESS)
error(logopt, "unbind failed: %s", ldap_err2string(rv));
@@ -302,7 +305,7 @@ LDAP *__init_ldap_connection(unsigned lo
rv = ldap_start_tls_s(ldap, NULL, NULL);
if (rv != LDAP_SUCCESS) {
- __unbind_ldap_connection(logopt, ldap, ctxt);
+ ldap_unbind_ext(ldap, NULL, NULL);
if (ctxt->tls_required) {
error(logopt, MODPREFIX
"TLS required but START_TLS failed: %s",
@@ -576,14 +579,13 @@ static int do_bind(unsigned logopt, LDAP
char *host = NULL, *nhost;
int rv;
+ ldapinit_mutex_lock();
#ifdef WITH_SASL
debug(logopt, MODPREFIX "auth_required: %d, sasl_mech %s",
ctxt->auth_required, ctxt->sasl_mech);
if (ctxt->auth_required & LDAP_NEED_AUTH) {
- ldapinit_mutex_lock();
rv = autofs_sasl_bind(logopt, ldap, ctxt);
- ldapinit_mutex_unlock();
debug(logopt, MODPREFIX "autofs_sasl_bind returned %d", rv);
} else {
rv = bind_ldap_simple(logopt, ldap, uri, ctxt);
@@ -593,6 +595,7 @@ static int do_bind(unsigned logopt, LDAP
rv = bind_ldap_simple(logopt, ldap, uri, ctxt);
debug(logopt, MODPREFIX "ldap simple bind returned %d", rv);
#endif
+ ldapinit_mutex_unlock();
if (rv != 0)
return 0;