diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:59 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:59 +0100 |
| commit | e8bb7adda7f73e53cdab823e9cab2a49ccbdf188 (patch) | |
| tree | 87b13ae8f9f3b5c0059acca2796667726cddb838 /modules/ldap | |
| parent | db26b587c04799e75b6dd0fcd4b46aaa168f9161 (diff) | |
| download | apache2-e8bb7adda7f73e53cdab823e9cab2a49ccbdf188.tar.gz | |
Upstream tarball 2.2.16upstream/2.2.16
Diffstat (limited to 'modules/ldap')
| -rw-r--r-- | modules/ldap/util_ldap.c | 4 | ||||
| -rw-r--r-- | modules/ldap/util_ldap_cache_mgr.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index a894b6ea..08f21496 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -1837,6 +1837,9 @@ static void *util_ldap_create_config(apr_pool_t *p, server_rec *s) return st; } +/* cache-related settings are not merged here, but in the post_config hook, + * since the cache has not yet sprung to life + */ static void *util_ldap_merge_config(apr_pool_t *p, void *basev, void *overridesv) { @@ -1983,6 +1986,7 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, st_vhost->cache_shm = st->cache_shm; st_vhost->cache_rmm = st->cache_rmm; st_vhost->cache_file = st->cache_file; + st_vhost->util_ldap_cache = st->util_ldap_cache; ap_log_error(APLOG_MARK, APLOG_DEBUG, result, s, "LDAP merging Shared Cache conf: shm=0x%pp rmm=0x%pp " "for VHOST: %s", st->cache_shm, st->cache_rmm, diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c index 6bb066ab..b0283715 100644 --- a/modules/ldap/util_ldap_cache_mgr.c +++ b/modules/ldap/util_ldap_cache_mgr.c @@ -605,7 +605,8 @@ char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st) if (!util_ldap_cache) { - return "<tr valign='top'><td nowrap colspan=7>Cache has not been enabled/initialised.</td></tr>"; + ap_rputs("<tr valign='top'><td nowrap colspan=7>Cache has not been enabled/initialised.</td></tr>", r); + return NULL; } if (r->args && strlen(r->args)) { |