diff options
| author | Arno Töll <arno@debian.org> | 2013-02-28 21:57:03 +0100 |
|---|---|---|
| committer | Arno Töll <arno@debian.org> | 2013-02-28 21:57:03 +0100 |
| commit | 1697a801fb875664f7b269260511f5f4126a5e83 (patch) | |
| tree | 89da4a9495e2ba6d6cb4e4dbae4184c7238a985a /modules/ldap | |
| parent | 5c4fba3ffbe778bdffe10a93d04821579601a020 (diff) | |
| download | apache2-1697a801fb875664f7b269260511f5f4126a5e83.tar.gz | |
Imported Upstream version 2.4.4upstream/2.4.4
Diffstat (limited to 'modules/ldap')
| -rw-r--r-- | modules/ldap/util_ldap.c | 12 | ||||
| -rw-r--r-- | modules/ldap/util_ldap_cache_mgr.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index c7f7b93d..7c6a5e30 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -1290,8 +1290,8 @@ start_over: int sgindex; char **group; res = apr_pcalloc(r->pool, sizeof(util_compare_subgroup_t)); - res->subgroupDNs = apr_pcalloc(r->pool, - sizeof(char *) * (subgroups->nelts)); + res->subgroupDNs = apr_palloc(r->pool, + sizeof(char *) * (subgroups->nelts)); for (sgindex = 0; (group = apr_array_pop(subgroups)); sgindex++) { res->subgroupDNs[sgindex] = apr_pstrdup(r->pool, *group); } @@ -1435,8 +1435,8 @@ static int uldap_cache_check_subgroups(request_rec *r, sizeof(util_compare_subgroup_t)); tmp_local_sgl->len = compare_nodep->subgroupList->len; tmp_local_sgl->subgroupDNs = - apr_pcalloc(r->pool, - sizeof(char *) * compare_nodep->subgroupList->len); + apr_palloc(r->pool, + sizeof(char *) * compare_nodep->subgroupList->len); for (i = 0; i < compare_nodep->subgroupList->len; i++) { tmp_local_sgl->subgroupDNs[i] = apr_pstrdup(r->pool, @@ -1647,7 +1647,7 @@ static int uldap_cache_checkuserid(request_rec *r, util_ldap_connection_t *ldc, *binddn = apr_pstrdup(r->pool, search_nodep->dn); if (attrs) { int i; - *retvals = apr_pcalloc(r->pool, sizeof(char *) * search_nodep->numvals); + *retvals = apr_palloc(r->pool, sizeof(char *) * search_nodep->numvals); for (i = 0; i < search_nodep->numvals; i++) { (*retvals)[i] = apr_pstrdup(r->pool, search_nodep->vals[i]); } @@ -1905,7 +1905,7 @@ static int uldap_cache_getuserdn(request_rec *r, util_ldap_connection_t *ldc, *binddn = apr_pstrdup(r->pool, search_nodep->dn); if (attrs) { int i; - *retvals = apr_pcalloc(r->pool, sizeof(char *) * search_nodep->numvals); + *retvals = apr_palloc(r->pool, sizeof(char *) * search_nodep->numvals); for (i = 0; i < search_nodep->numvals; i++) { (*retvals)[i] = apr_pstrdup(r->pool, search_nodep->vals[i]); } diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c index 82675770..ae7e652a 100644 --- a/modules/ldap/util_ldap_cache_mgr.c +++ b/modules/ldap/util_ldap_cache_mgr.c @@ -604,7 +604,7 @@ char *util_ald_cache_display_stats(request_rec *r, util_ald_cache_t *cache, char if (id) { buf2 = apr_psprintf(p, "<a href=\"%s?%s\">%s</a>", - r->uri, + ap_escape_html(r->pool, ap_escape_uri(r->pool, r->uri)), id, name); } |