From c6a45e144e3f2611a2fa3f3a444696c08a729b3e Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 23 Oct 2007 17:41:23 +0000 Subject: [PATCH] ITS#5189 --- CHANGES | 1 + servers/slapd/back-bdb/tools.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 7728c3f1d6..e50a7453df 100644 --- 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 f8cf1e138d..9437953137 100644 --- 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", -- 2.39.5