From: Jeff Trawick <trawick@apache.org>
Date: Sun, 20 Sep 2009 20:09:29 +0000 (+0000)
Subject: try to supply a CHANGES entry for r817064
X-Git-Tag: 2.2.14~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f190ffc05e7ca4435a9a42a47050a1aa49e92c77;p=thirdparty%2Fapache%2Fhttpd.git

try to supply a CHANGES entry for r817064

* mod_ldap: Pre-scan the requirements array before doing any LDAP lookups,
  for cases where an LDAP URL is configured but non-LDAP authn/authz is in
  effect. This stops us from trying to resolve file-based userids to a DN
  when the AuthLDAPURL has been defined at a very high level.
  PR 45946


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@817093 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index b178f02fe1a..b8c850a5c9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@ Changes with Apache 2.2.14
      mod_proxy_ftp: NULL pointer dereference on error paths.
      [Stefan Fritsch <sf fritsch.de>, Joe Orton]
 
+  *) mod_ldap: Don't try to resolve file-based user ids to a DN when AuthLDAPURL
+     has been defined at a very high level.  PR 45946.  [Eric Covener]
+
   *) htcacheclean: 19 ways to fail, 1 error message. Fixed. [Graham Leggett]
 
   *) mod_ldap: Bring the LDAPCacheEntries and LDAPOpCacheEntries