ITS#1541 fix.

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 97d597d7af663ef12860b915288a4e6ce70c2fae..995b9e96cbe7f33710faec8fea8af35a6909a78c 100644 (file)
--- 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 d71e32933431281118b4a56c69dc28c6125ade99..6f56376262686cc328dcc7a637683efa4acc7ac1 100644 (file)
--- 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 ec41a96d3ddc7fe620a74df76c5c678e9b02c1f9..58c8e268ab5239bbfcd70a07c9e15ae543eb6f81 100644 (file)
--- 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: