From f8030a05d8d7c750b3c7c78fd4e46ecfac957375 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 9 Jun 2005 07:40:19 +0000 Subject: [PATCH] Import ITS#3731 fix from HEAD --- CHANGES | 1 + servers/slapd/back-bdb/index.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CHANGES b/CHANGES index 1944e0a96a..de3957d34e 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ OpenLDAP 2.2 Change Log OpenLDAP 2.2.27 Engineering Fixed back-bdb/hdb slapcat checkpoint on close (ITS#3703) + Fixed back-bdb/hdb internal error code assert (ITS#3731) Fixed back-ldap/back-meta debug output of NULL strings (ITS#3698) Fixed back-meta sizelimit bug (ITS#3720) Fixed back-meta/backglue sizelimit interaction (ITS#3724) diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c index 397db0a97d..e4d6c0adc6 100644 --- a/servers/slapd/back-bdb/index.c +++ b/servers/slapd/back-bdb/index.c @@ -260,6 +260,16 @@ static int indexer( } done: + switch( rc ) { + /* The callers all know how to deal with these results */ + case 0: + case DB_LOCK_DEADLOCK: + case DB_LOCK_NOTGRANTED: + break; + /* Anything else is bad news */ + default: + rc = LDAP_OTHER; + } return rc; } -- 2.39.2