Properly check the result returned by apr_ldap_init: There may have been an

error even if ldc->ldap != NULL.

PR 46076

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@986974 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a140a47fc8af342ee7d8368202c30ef7e90898e1..c5d4919d8ab5fa50248e552a741f0bdbb29bf0f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.3.7
      mod_dav, mod_cache, mod_session: Fix Handling of requests without a path 
      segment. PR: 49246 [Mark Drayton, Jeff Trawick]
 
+  *) mod_ldap: Properly check the result returned by apr_ldap_init. PR 46076.
+     [Stefan Fritsch]
+
   *) mod_rewrite: Log errors if rewrite map files cannot be opened. PR 49639.
      [Stefan Fritsch]
 

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 5fa013b11b1ab56a44138bfcb6f1c84fc59fe4b5..95a88be3ed8a2ab017be3ac02c97798247faee45 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -317,6 +317,8 @@ static int uldap_connection_init(request_rec *r,
 
     if (result->rc) {
         ldc->reason = result->reason;
+        ldc->bound = 0;
+        return result->rc;
     }
 
     if (NULL == ldc->ldap)