ITS#5189

diff --git a/CHANGES b/CHANGES
index 7728c3f1d608f49ed1fad2cef695f3884bdb860d..e50a7453df7609919732e349dd797c2372ef6916 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ OpenLDAP 2.4.6 Engineering
        Fixed slapd-bdb/hdb suffix logging (ITS#5128)
        Fixed slapd-bdb/hdb IDL LRU handling (ITS#5121)
        Fixed slapd-bdb/hdb cachesize config check (ITS#5122)
+       Fixed slapd-bdb/hdb ldap result code as system errno (ITS#5189)
        Fixed slapd-config objectclass handling (ITS#4884)
        Fixed slapd-ldap SASL idassert w/o authcId
        Fixed slapd-ldap search control parsing (ITS#5138)

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index f8cf1e138dec0cd0b50300b97d7938e5061e3b61..9437953137dfc239495bd7a45dd9fd9ec7fa6408 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -532,6 +532,7 @@ ID bdb_tool_entry_put(
        if( rc != 0 ) {
                snprintf( text->bv_val, text->bv_len,
                                "index_entry_add failed: %s (%d)",
+                               rc == LDAP_OTHER ? "Internal error" :
                                db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
                        "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
@@ -571,6 +572,7 @@ done:
                TXN_ABORT( tid );
                snprintf( text->bv_val, text->bv_len,
                        "txn_aborted! %s (%d)",
+                       rc == LDAP_OTHER ? "Internal error" :
                        db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
                        "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",