upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-30 11:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6981 pcache: don't reference rs->sr_entry in op_cleanup

Browse source
This commit is contained in:
Howard Chu 2011-11-02 09:26:50 -07:00
parent 49c6ddf99c
commit bc54aa1078
1 changed files with 53 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
servers/slapd/overlays/pcache.c
View file

@ -2343,62 +2343,6 @@ pcache_op_cleanup( Operation *op, SlapReply *rs ) {
cache_manager *cm = on->on_bi.bi_private;
query_manager* qm = cm->qm;
if ( rs->sr_type == REP_SEARCH ) {
Entry *e;
/* don't return more entries than requested by the client */
if ( si->slimit > 0 && rs->sr_nentries >= si->slimit ) {
si->slimit_exceeded = 1;
}
/* If we haven't exceeded the limit for this query,
* build a chain of answers to store. If we hit the
* limit, empty the chain and ignore the rest.
*/
if ( !si->over ) {
/* check if the entry contains undefined
* attributes/objectClasses (ITS#5680) */
if ( cm->check_cacheability && test_filter( op, rs->sr_entry, si->query.filter ) != LDAP_COMPARE_TRUE ) {
Debug( pcache_debug, "%s: query not cacheable because of schema issues in DN \"%s\"\n",
op->o_log_prefix, rs->sr_entry->e_name.bv_val, 0 );
goto over;
}
/* check for malformed entries: attrs with no values */
{
Attribute *a = rs->sr_entry->e_attrs;
for (; a; a=a->a_next) {
if ( !a->a_numvals ) {
Debug( pcache_debug, "%s: query not cacheable because of attrs without values in DN \"%s\" (%s)\n",
op->o_log_prefix, rs->sr_entry->e_name.bv_val,
a->a_desc->ad_cname.bv_val );
goto over;
}
}
}
if ( si->count < si->max ) {
si->count++;
e = entry_dup( rs->sr_entry );
if ( !si->head ) si->head = e;
if ( si->tail ) si->tail->e_private = e;
si->tail = e;
} else {
over:;
si->over = 1;
si->count = 0;
for (;si->head; si->head=e) {
e = si->head->e_private;
si->head->e_private = NULL;
entry_free(si->head);
}
si->tail = NULL;
}
}
}
if ( rs->sr_type == REP_RESULT ||
op->o_abandon || rs->sr_err == SLAPD_ABANDON )
{
@ -2498,11 +2442,64 @@ pcache_response(
}
if ( rs->sr_type == REP_SEARCH ) {
Entry *e;
/* don't return more entries than requested by the client */
if ( si->slimit > 0 && rs->sr_nentries >= si->slimit ) {
si->slimit_exceeded = 1;
}
if ( si->slimit_exceeded ) {
return 0;
}
/* If we haven't exceeded the limit for this query,
* build a chain of answers to store. If we hit the
* limit, empty the chain and ignore the rest.
*/
if ( !si->over ) {
slap_overinst *on = si->on;
cache_manager *cm = on->on_bi.bi_private;
/* check if the entry contains undefined
* attributes/objectClasses (ITS#5680) */
if ( cm->check_cacheability && test_filter( op, rs->sr_entry, si->query.filter ) != LDAP_COMPARE_TRUE ) {
Debug( pcache_debug, "%s: query not cacheable because of schema issues in DN \"%s\"\n",
op->o_log_prefix, rs->sr_entry->e_name.bv_val, 0 );
goto over;
}
/* check for malformed entries: attrs with no values */
{
Attribute *a = rs->sr_entry->e_attrs;
for (; a; a=a->a_next) {
if ( !a->a_numvals ) {
Debug( pcache_debug, "%s: query not cacheable because of attrs without values in DN \"%s\" (%s)\n",
op->o_log_prefix, rs->sr_entry->e_name.bv_val,
a->a_desc->ad_cname.bv_val );
goto over;
}
}
}
if ( si->count < si->max ) {
si->count++;
e = entry_dup( rs->sr_entry );
if ( !si->head ) si->head = e;
if ( si->tail ) si->tail->e_private = e;
si->tail = e;
} else {
over:;
si->over = 1;
si->count = 0;
for (;si->head; si->head=e) {
e = si->head->e_private;
si->head->e_private = NULL;
entry_free(si->head);
}
si->tail = NULL;
}
}
} else if ( rs->sr_type == REP_RESULT ) {
if ( si->count ) {