ITS#1541 fix.

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:

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;

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: