"relax" previous commit; don't leave locks 'round (ITS#4204)

This commit is contained in:
Pierangelo Masarati 2005-11-23 09:35:44 +00:00
parent de31e7aa91
commit 59c4fb1fcd

View File

@ -733,6 +733,7 @@ static void cache_replacement(query_manager* qm, struct berval *result)
Debug ( LDAP_DEBUG_ANY, Debug ( LDAP_DEBUG_ANY,
"Cache replacement invoked without " "Cache replacement invoked without "
"any query in LRU list\n", 0, 0, 0 ); "any query in LRU list\n", 0, 0, 0 );
ldap_pvt_thread_mutex_unlock(&qm->lru_mutex);
return; return;
} }
@ -1851,7 +1852,7 @@ pc_cf_gen( ConfigArgs *c )
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
return( 1 ); return( 1 );
} }
if ( cm->num_entries_limit >= cm->max_entries ) { if ( cm->num_entries_limit > cm->max_entries ) {
snprintf( c->msg, sizeof( c->msg ), "entry limit (arg #4) must be less than max entries %d (arg #2)", cm->max_entries ); snprintf( c->msg, sizeof( c->msg ), "entry limit (arg #4) must be less than max entries %d (arg #2)", cm->max_entries );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
return( 1 ); return( 1 );