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

fix previous commit

Browse source
This commit is contained in:
Pierangelo Masarati 2007-08-06 12:48:35 +00:00
parent add25c2f45
commit 5f386d3e31
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ typedef struct cached_query_s {
Qbase *qbase; Qbase *qbase;
int scope; int scope;
struct berval q_uuid; /* query identifier */ struct berval q_uuid; /* query identifier */
struct query_template_s *qtemp; /* template of the query */ struct query_template_s *qtemp; /* template of the query */
time_t expiry_time; /* time till the query is considered valid */ time_t expiry_time; /* time till the query is considered valid */
struct cached_query_s *next; /* next query in the template */ struct cached_query_s *next; /* next query in the template */
struct cached_query_s *prev; /* previous query in the template */ struct cached_query_s *prev; /* previous query in the template */
@ -1371,8 +1371,8 @@ add_filter_attrs(
count++; count++;
} }
*new_attrs = (AttributeName*)ch_malloc((count+1)* *new_attrs = (AttributeName*)ch_calloc( count + 1,
sizeof(AttributeName)); sizeof(AttributeName) );
for (i=0; i<attrs->count; i++) { for (i=0; i<attrs->count; i++) {
(*new_attrs)[i].an_name = attrs->attrs[i].an_name; (*new_attrs)[i].an_name = attrs->attrs[i].an_name;
(*new_attrs)[i].an_desc = attrs->attrs[i].an_desc; (*new_attrs)[i].an_desc = attrs->attrs[i].an_desc;
@ -1383,13 +1383,16 @@ add_filter_attrs(
j = i; j = i;
for ( i=0; i<fattr_cnt; i++ ) { for ( i=0; i<fattr_cnt; i++ ) {
if ( an_find(*new_attrs, &filter_attrs[i].an_name )) if ( an_find(*new_attrs, &filter_attrs[i].an_name ) ) {
continue; continue;
}
if ( is_at_operational(filter_attrs[i].an_desc->ad_type) ) { if ( is_at_operational(filter_attrs[i].an_desc->ad_type) ) {
if (allop) if ( allop ) {
continue; continue;
} else if (alluser) }
} else if ( alluser ) {
continue; continue;
}
(*new_attrs)[j].an_name = filter_attrs[i].an_name; (*new_attrs)[j].an_name = filter_attrs[i].an_name;
(*new_attrs)[j].an_desc = filter_attrs[i].an_desc; (*new_attrs)[j].an_desc = filter_attrs[i].an_desc;
(*new_attrs)[j].an_oc = NULL; (*new_attrs)[j].an_oc = NULL;
@ -1456,7 +1459,7 @@ pcache_op_search(
AttributeName *filter_attrs = NULL; AttributeName *filter_attrs = NULL;
Query query; Query query;
QueryTemplate *qtemp = NULL; QueryTemplate *qtemp = NULL;
int attr_set = -1; int attr_set = -1;
CachedQuery *answerable = NULL; CachedQuery *answerable = NULL;
@ -1554,7 +1557,7 @@ pcache_op_search(
} }
ldap_pvt_thread_rdwr_wunlock(&qtemp->t_rwlock); ldap_pvt_thread_rdwr_wunlock(&qtemp->t_rwlock);
cb = op->o_tmpalloc( sizeof(*cb) + sizeof(*si), op->o_tmpmemctx); cb = op->o_tmpalloc( sizeof(*cb) + sizeof(*si), op->o_tmpmemctx );
cb->sc_response = pcache_response; cb->sc_response = pcache_response;
cb->sc_cleanup = NULL; cb->sc_cleanup = NULL;
cb->sc_private = (cb+1); cb->sc_private = (cb+1);
@ -2384,7 +2387,7 @@ pcache_db_close(
avl_free( tm->qbase, pcache_free_qbase ); avl_free( tm->qbase, pcache_free_qbase );
free( tm->querystr.bv_val ); free( tm->querystr.bv_val );
ldap_pvt_thread_rdwr_destroy( &tm->t_rwlock ); ldap_pvt_thread_rdwr_destroy( &tm->t_rwlock );
if (tm->t_attrs.count ) free( tm->t_attrs.attrs ); free( tm->t_attrs.attrs );
free( tm ); free( tm );
} }