From 73bae8d90f55eda39c524b4eb5334cb3e6c97aa3 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Wed, 18 Aug 2010 22:59:45 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ modules/ldap/util_ldap.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index a140a47fc8..c5d4919d8a 100644 --- 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 5fa013b11b..95a88be3ed 100644 --- 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) -- 2.50.1