Commit 8bbd101e authored by Howard Chu's avatar Howard Chu
Browse files

ITS#6021, sync with HEAD (not yet fixed)

parent a05913bf
...@@ -1175,6 +1175,8 @@ free_query (CachedQuery* qc) ...@@ -1175,6 +1175,8 @@ free_query (CachedQuery* qc)
{ {
free(qc->q_uuid.bv_val); free(qc->q_uuid.bv_val);
filter_free(qc->filter); filter_free(qc->filter);
ldap_pvt_thread_rdwr_destroy( &qc->rwlock );
memset(qc, 0, sizeof(*qc));
free(qc); free(qc);
} }
...@@ -1264,6 +1266,7 @@ add_query( ...@@ -1264,6 +1266,7 @@ add_query(
new_cached_query = find_filter( op, qbase->scopes[query->scope], new_cached_query = find_filter( op, qbase->scopes[query->scope],
query->filter, first ); query->filter, first );
filter_free( query->filter ); filter_free( query->filter );
query->filter = NULL;
} }
Debug( pcache_debug, "TEMPLATE %p QUERIES++ %d\n", Debug( pcache_debug, "TEMPLATE %p QUERIES++ %d\n",
(void *) templ, templ->no_of_queries, 0 ); (void *) templ, templ->no_of_queries, 0 );
...@@ -2750,7 +2753,8 @@ pc_cfadd( Operation *op, SlapReply *rs, Entry *p, ConfigArgs *ca ) ...@@ -2750,7 +2753,8 @@ pc_cfadd( Operation *op, SlapReply *rs, Entry *p, ConfigArgs *ca )
/* FIXME: should not hardcode "olcDatabase" here */ /* FIXME: should not hardcode "olcDatabase" here */
bv.bv_len = snprintf( ca->cr_msg, sizeof( ca->cr_msg ), bv.bv_len = snprintf( ca->cr_msg, sizeof( ca->cr_msg ),
"olcDatabase=%s", cm->db.bd_info->bi_type ); "olcDatabase=" SLAP_X_ORDERED_FMT "%s",
0, cm->db.bd_info->bi_type );
if ( bv.bv_len >= sizeof( ca->cr_msg ) ) { if ( bv.bv_len >= sizeof( ca->cr_msg ) ) {
return -1; return -1;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment