[389-commits] Branch '389-ds-base-1.2.10' - 2 commits - ldap/servers VERSION.sh

[Richard Allen Megginson]

 VERSION.sh                           |    2 +-
 ldap/servers/slapd/back-ldbm/index.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 987edff26338efc91f6db6f2b14e8de0088ff659
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Apr 10 14:07:01 2012 -0600

    bump version to 1.2.10.6

diff --git a/VERSION.sh b/VERSION.sh
index 5117203..7ee84c0 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
 # PACKAGE_VERSION is constructed from these
 VERSION_MAJOR=1
 VERSION_MINOR=2
-VERSION_MAINT=10.5
+VERSION_MAINT=10.6
 # if this is a PRERELEASE, set VERSION_PREREL
 # otherwise, comment it out
 # be sure to include the dot prefix in the prerel


commit 182ab2e0229fc3bd66b6c0301a9c564f5afcac68
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Apr 10 13:49:26 2012 -0600

    Ticket #336 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV)
    
    https://fedorahosted.org/389/ticket/336
    Resolves: Ticket #336
    Bug Description: [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV)
    Reviewed by: nhosoi (Thanks!)
    Branch: master
    Fix Description: previous fix had a typo and failed index tests
    Platforms tested: RHEL6 x86_64
    Flag Day: no
    Doc impact: no
    BZ: 808770
    (cherry picked from commit a50f8c048801dfa50b692055aa7eabd7486a0051)

diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index 0ede6de..da1952e 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -1496,7 +1496,7 @@ index_range_read_ext(
         if(retry_count == IDL_FETCH_RETRY_COUNT) {
           ldbm_nasty("index_range_read retry count exceeded",1095,*err);
         }
-        if (!idl) {
+        if (!tmp) {
             if (slapi_is_loglevel_set(LDAP_DEBUG_TRACE)) {
                 char encbuf[BUFSIZ];
                 LDAPDebug2Args(LDAP_DEBUG_TRACE,