Import cache debugging bug (ITS#501) fix from HEAD.

diff --git a/CHANGES b/CHANGES
index b8efbe15378eeaabceff5caafbd09f11a2983f34..d7ecda2a4f373be5d91191e82ab8644940ce3aa4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.20 Engineering
+       Fixed -lldap cache debug bug (ITS#1501)
+       Updated BerkeleyDB 4 support
 
 OpenLDAP 2.0.19 Release
        Fixed back-ldbm not filter indexing (ITS#1405)

diff --git a/libraries/libldap/cache.c b/libraries/libldap/cache.c
index 69e496d3acd8ef2020d0b6ad918e9d14b443a7be..b839bf7f757a50ef1a6d9e7859e2faa633602aff 100644 (file)
--- a/libraries/libldap/cache.c
+++ b/libraries/libldap/cache.c
@@ -387,9 +387,11 @@ ldap_check_cache( LDAP *ld, ber_tag_t msgtype, BerElement *request )
                return( -1 );
        }
 
+       memset( &reqber, '\0', sizeof(reqber) );
        reqber.ber_valid = LBER_VALID_BERELEMENT;
        reqber.ber_buf = reqber.ber_ptr = request->ber_buf;
        reqber.ber_end = request->ber_ptr;
+       reqber.ber_debug = ber_int_debug;
 
        c_time = time( NULL );