Fix from Jonghyuk Choi jongchoi@us.ibm.com; return 0 IDs when bdb_key_read

returns DB_NOTFOUND.

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index da857b9e0ad6e8e0c632e344e641bdd7ff9778ce..b1d0059aee918893c5a5745c2c29c7129debde0b 100644 (file)
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -232,8 +232,8 @@ presence_candidates(
        rc = bdb_key_read( be, db, NULL, &prefix, ids );
 
        if( rc == DB_NOTFOUND ) {
+               BDB_IDL_ZERO( ids );
                rc = 0;
-
        } else if( rc != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_presense_candidates: key read failed (%d)\n",
@@ -319,7 +319,10 @@ equality_candidates(
        for ( i= 0; keys[i].bv_val != NULL; i++ ) {
                rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
 
-               if( rc != LDAP_SUCCESS ) {
+               if( rc == DB_NOTFOUND ) {
+                       BDB_IDL_ZERO( ids );
+                       rc = 0;
+               } else if( rc != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE,
                                "<= bdb_equality_candidates key read failed (%d)\n",
                                rc, 0, 0 );
@@ -424,7 +427,11 @@ approx_candidates(
        for ( i= 0; keys[i].bv_val != NULL; i++ ) {
                rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
 
-               if( rc != LDAP_SUCCESS ) {
+               if( rc == DB_NOTFOUND ) {
+                       BDB_IDL_ZERO( ids );
+                       rc = 0;
+                       break;
+               } else if( rc != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates key read failed (%d)\n",
                                rc, 0, 0 );
                        break;
@@ -523,7 +530,11 @@ substring_candidates(
        for ( i= 0; keys[i].bv_val != NULL; i++ ) {
                rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
 
-               if( rc != LDAP_SUCCESS ) {
+               if( rc == DB_NOTFOUND ) {
+                       BDB_IDL_ZERO( ids );
+                       rc = 0;
+                       break;
+               } else if( rc != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates key read failed (%d)\n",
                                rc, 0, 0 );
                        break;