Import ITS#3731 fix from HEAD

diff --git a/CHANGES b/CHANGES
index 1944e0a96ab788e54bb7ee0c6e6ade76d1778bac..de3957d34e0fa4e42e57234915df9908de10bf9d 100644 (file)
--- 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 397db0a97da39aabd615ce6e0b7df23888e187fd..e4d6c0adc656737c64348e0b6372511d7564135f 100644 (file)
--- 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;
 }