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
Obtained from:
Submitted by:
Reviewed by:	minfrin, bnicholes, jim

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

diff --git a/CHANGES b/CHANGES
index fcd8233ca26b86228a88a88533c32d409850fcb4..b524417f607a266d34c2d57f4595c9e83cbf4bf1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.53
 
+  *) 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_disk_cache: Do not store hop-by-hop headers.  [Justin Erenkrantz]
 
   *) Fix the re-linking issue when purging elements from the LDAP cache

diff --git a/STATUS b/STATUS
index 186d0e7d9b694305500904953234d3c4626b1852..0759ad586a8134810b92eeb2944982b0fa415831 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/10/11 18:06:49 $]
+Last modified at [$Date: 2004/10/13 15:25:05 $]
 
 Release:
 
@@ -103,12 +103,6 @@ PATCHES TO BACKPORT FROM 2.1
        PR 24437
        +1: minfrin
 
-    *) mod_ldap: fix a bogus error message to tell the user which file
-       is causing a potential problem with the LDAP shared memory cache.
-         modules/ldap/util_ldap.c: 1.14
-       PR 31431
-       +1: minfrin, bnicholes, jim
-
     *) mod_ldap: prevent the possiblity of an infinite loop in the LDAP
        statistics display.
          modules/ldap/util_ldap_cache_mgr.c: 1.11

diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index 0bff66d05cab214e3ef9513e1c5a4f84f2c2dd8c..d7fb0556cdb37b2246ea7e375d3fb17669434c1e 100644 (file)
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -1425,12 +1425,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());
     }
 }