From: Jeff Trawick <trawick@apache.org>
Date: Fri, 10 Aug 2012 12:23:41 +0000 (+0000)
Subject: make LDAPSharedCacheFile relative to DefaultRuntimeDir
X-Git-Tag: 2.5.0-alpha~6448
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d937659e3f596d57e31485a1594e0dedc20ae06;p=thirdparty%2Fapache%2Fhttpd.git

make LDAPSharedCacheFile relative to DefaultRuntimeDir


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

diff --git a/CHANGES b/CHANGES
index bdc2194e3e9..883b801fe44 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ Changes with Apache 2.5.0
        mutexes (Mutex)
      - mod_auth_digest: shared memory file
      - mod_lbmethod_heartbeat, mod_heartmonitor: heartbeat storage file
+     - mod_ldap: shared memory cache
      - mod_socache_shmcb, mod_socache_dbm: shared memory or dbm for cache
      [Jeff Trawick]
 
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index bce703e884a..6afb1779bee 100644
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -418,13 +418,16 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
 <directivesynopsis>
 <name>LDAPSharedCacheFile</name>
 <description>Sets the shared memory cache file</description>
-<syntax>LDAPSharedCacheFile <var>directory-path/filename</var></syntax>
+<syntax>LDAPSharedCacheFile <var>file-path</var></syntax>
 <contextlist><context>server config</context></contextlist>
 
 <usage>
-    <p>Specifies the directory path and file name of the shared memory
-    cache file. If not set, anonymous shared memory will be used if the
-    platform supports it.</p>
+    <p>Specifies the path of the shared memory cache file. If not set, 
+    anonymous shared memory will be used if the platform supports it.</p>
+
+    <p>If <var>file-path</var> is not an absolute path, the location specified
+    will be relative to the value of 
+    <directive module="core">DefaultRuntimeDir</directive>.</p>
 </usage>
 </directivesynopsis>
 
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index c7f7b93df1f..ad2c3959488 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -2103,7 +2103,7 @@ static const char *util_ldap_set_cache_file(cmd_parms *cmd, void *dummy,
     }
 
     if (file) {
-        st->cache_file = ap_server_root_relative(st->pool, file);
+        st->cache_file = ap_runtime_dir_relative(st->pool, file);
     }
     else {
         st->cache_file = NULL;