diff --git a/CHANGES b/CHANGES index ccff568a69..ef56e33685 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) mod_ldap: fix a bogus error message to tell the user which file + is causing a potential problem with the LDAP shared memory cache. + PR 31431 [Graham Leggett] + *) mod_ldap: prevent the possiblity of an infinite loop in the LDAP statistics display. PR 29216 [Graham Leggett] diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index 238ad28e69..19fed12d67 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -1276,12 +1276,15 @@ static void util_ldap_child_init(apr_pool_t *p, server_rec *s) sts = apr_global_mutex_child_init(&st->util_ldap_cache_lock, st->lock_file, p); if (sts != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, sts, s, "failed to init caching lock in child process"); + ap_log_error(APLOG_MARK, APLOG_CRIT, sts, s, + "Failed to initialise global mutex %s in child process %d.", + st->lock_file, getpid()); return; } else { ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, - "INIT global mutex %s in child %d ", st->lock_file, getpid()); + "Initialisation of global mutex %s in child process %d successful.", + st->lock_file, getpid()); } }