From f868e4b34e9a673ae0d93932ecf0a05b16fc53f5 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 20 Jan 2002 17:27:53 +0000 Subject: [PATCH] ITS#1541 fix. --- servers/slapd/back-bdb/filterindex.c | 4 ++-- servers/slapd/back-bdb/init.c | 7 ++++++- servers/slapd/back-ldbm/filterindex.c | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c index 97d597d7af..995b9e96cb 100644 --- a/servers/slapd/back-bdb/filterindex.c +++ b/servers/slapd/back-bdb/filterindex.c @@ -87,13 +87,13 @@ bdb_filter_candidates( case LDAP_FILTER_GE: /* no GE index, use pres */ Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 ); - rc = presence_candidates( be, f->f_desc, ids ); + rc = presence_candidates( be, f->f_ava->aa_desc, ids ); break; case LDAP_FILTER_LE: /* no LE index, use pres */ Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 ); - rc = presence_candidates( be, f->f_desc, ids ); + rc = presence_candidates( be, f->f_ava->aa_desc, ids ); break; case LDAP_FILTER_NOT: diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index d71e329334..6f56376262 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -99,14 +99,19 @@ static void *lock_detect_task( void *arg ) while( bdb->bi_dbenv != NULL ) { int rc; + int aborted; sleep( bdb->bi_lock_detect_seconds ); rc = LOCK_DETECT( bdb->bi_dbenv, 0, - bdb->bi_lock_detect, NULL ); + bdb->bi_lock_detect, &aborted ); if( rc != 0 ) { break; } + + Debug( LDAP_DEBUG_ANY, + "bdb_lock_detect: aborted %d locks\n", + aborted, 0, 0 ); } return NULL; diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c index ec41a96d3d..58c8e268ab 100644 --- a/servers/slapd/back-ldbm/filterindex.c +++ b/servers/slapd/back-ldbm/filterindex.c @@ -135,7 +135,7 @@ filter_candidates( Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 ); #endif - result = presence_candidates( be, f->f_desc ); + result = presence_candidates( be, f->f_ava->aa_desc ); break; case LDAP_FILTER_LE: @@ -146,7 +146,7 @@ filter_candidates( Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 ); #endif - result = presence_candidates( be, f->f_desc ); + result = presence_candidates( be, f->f_ava->aa_desc ); break; case LDAP_FILTER_AND: -- 2.39.5