From 578e9e3ce9a748cf70ab77d08d83561c4de35ade Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 20 Nov 2007 19:46:34 +0000 Subject: [PATCH] ITS#5232 --- CHANGES | 1 + servers/slapd/back-bdb/search.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index ac850033f4..a076603d36 100644 --- 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 819ca26ea9..d2222d87c9 100644 --- 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 ) { -- 2.39.2