svn commit: r986974 - in /httpd/httpd/trunk: CHANGES modules/ldap/util_ldap.c

[sf...@apache.org]

Author: sf
Date: Wed Aug 18 22:59:45 2010
New Revision: 986974

URL: http://svn.apache.org/viewvc?rev=986974&view=rev
Log:
Properly check the result returned by apr_ldap_init: There may have been an
error even if ldc->ldap != NULL.

PR 46076

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=986974&r1=986973&r2=986974&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Aug 18 22:59:45 2010
@@ -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]
 

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=986974&r1=986973&r2=986974&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Wed Aug 18 22:59:45 2010
@@ -317,6 +317,8 @@ static int uldap_connection_init(request
 
     if (result->rc) {
         ldc->reason = result->reason;
+        ldc->bound = 0;
+        return result->rc;
     }
 
     if (NULL == ldc->ldap)