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

update cachedQueryURL only when requested

Browse source
This commit is contained in:
Pierangelo Masarati 2009-08-18 08:38:42 +00:00
parent 7442e58dc2
commit 87321c3fae
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2876,7 +2876,7 @@ refresh_query( Operation *op, SlapReply *rs, CachedQuery *query,
Filter filter = {LDAP_FILTER_EQUALITY};
AttributeName attrs[ 2 ] = {{{ 0 }}};
dnlist *dn;
int i, rc;
int rc;
ldap_pvt_thread_mutex_lock( &query->answerable_cnt_mutex );
query->refcnt = 0;
@ -4563,10 +4563,12 @@ pcache_monitor_update(
CachedQuery *qc;
BerVarray vals = NULL;
Attribute *a;
int num = 0;
assert( ad_cachedQueryURL != NULL );
if ( qm->templates != NULL ) {
attr_delete( &e->e_attrs, ad_cachedQueryURL );
if ( ( SLAP_OPATTRS( rs->sr_attr_flags ) || ad_inlist( ad_cachedQueryURL, rs->sr_attrs ) )
&& qm->templates != NULL )
{
QueryTemplate *tm;
for ( tm = qm->templates; tm != NULL; tm = tm->qmnext ) {
@ -4575,22 +4577,17 @@ pcache_monitor_update(
if ( query2url( op, qc, &bv, 1 ) == 0 ) {
ber_bvarray_add_x( &vals, &bv, op->o_tmpmemctx );
num++;
}
}
}
if ( vals != NULL ) {
attr_merge_normalize( e, ad_cachedQueryURL, vals, NULL );
ber_bvarray_free_x( vals, op->o_tmpmemctx );
}
}
assert( ad_cachedQueryURL != NULL );
attr_delete( &e->e_attrs, ad_cachedQueryURL );
if ( vals == NULL ) {
return SLAP_CB_CONTINUE;
}
attr_merge_normalize( e, ad_cachedQueryURL, vals, NULL );
ber_bvarray_free_x( vals, op->o_tmpmemctx );
return SLAP_CB_CONTINUE;
}