From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 4 Aug 2004 20:47:21 +0000 (+0000)
Subject: Copy the share memory pointers down through the cache hierarchy so that they can... 
X-Git-Tag: STRIKER_2_0_51_RC1^2~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e9f4a44d2eb3ae24f560283ab4b170d2af67ed;p=thirdparty%2Fapache%2Fhttpd.git

Copy the share memory pointers down through the cache hierarchy so that they can be referenced and used in the lower level caches.

Reviewed by: bnicholes, minfrin, jjclar


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

diff --git a/modules/experimental/util_ldap_cache_mgr.c b/modules/experimental/util_ldap_cache_mgr.c
index c5f9e0fb80f..eb8cc11c227 100644
--- a/modules/experimental/util_ldap_cache_mgr.c
+++ b/modules/experimental/util_ldap_cache_mgr.c
@@ -284,6 +284,10 @@ util_ald_cache_t *util_ald_create_cache(util_ldap_state_t *st,
     if (!cache)
         return NULL;
 
+#if APR_HAS_SHARED_MEMORY
+    cache->rmm_addr = st->cache_rmm;
+    cache->shm_addr = st->cache_shm;
+#endif
     cache->maxentries = st->search_cache_size;
     cache->numentries = 0;
     cache->size = st->search_cache_size / 3;
@@ -542,7 +546,6 @@ char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st)
     if (r->args && strlen(r->args)) {
         char cachetype[5], lint[2];
         unsigned int id, off;
-        int ret;
         char date_str[APR_CTIME_LEN+1];
 
         if ((3 == sscanf(r->args, scanfmt, cachetype, &id, &off, lint)) &&