ITS#5232

diff --git a/CHANGES b/CHANGES
index ac850033f438f907c9c79253587b8dcfceedadc1..a076603d36d49080404639235dd62cbf6056ae45 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ OpenLDAP 2.4.7 Engineering
        Fixed slapd paged results handling when using rootdn (ITS#5230)
        Fixed slapd syncrepl presentlist handling (ITS#5231)
        Fixed slapd core schema 'c' definition for RFC4519 (ITS#5236)
+       Fixed slapd-bdb to report and fail on internal errors (ITS#5232)
        Fixed slapo-ppolicy single password check on modify (ITS#5146)
        Fixed slapo-syncprov refresh and persist cookie sending (ITS#5210)
        Fixed slapo-syncprov ignore invalid cookies (ITS#5211)

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 819ca26ea9cf8e88e50af29991ed6c9a3311db86..d2222d87c98154431182546ed5166a0462358279 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -692,6 +692,10 @@ fetch_entry_retry:
                                || rs->sr_err == DB_LOCK_NOTGRANTED )
                        {
                                goto fetch_entry_retry;
+                       } else if ( rs->sr_err == LDAP_OTHER ) {
+                               rs->sr_text = "internal error";
+                               send_ldap_result( op, rs );
+                               goto done;
                        }
 
                        if ( ei && rs->sr_err == LDAP_SUCCESS ) {