From 896e61348e526a5d60ad52734d14a5a919fbf045 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Apr 10 2012 20:14:17 +0000 Subject: Bug 808770 - [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) - typo in previous patch --- diff --git a/0004-Ticket-336-abrt-389-ds-base-1.2.10.4-2.fc16-index_ra.patch b/0004-Ticket-336-abrt-389-ds-base-1.2.10.4-2.fc16-index_ra.patch new file mode 100644 index 0000000..5aeaf1c --- /dev/null +++ b/0004-Ticket-336-abrt-389-ds-base-1.2.10.4-2.fc16-index_ra.patch @@ -0,0 +1,36 @@ +From 182ab2e0229fc3bd66b6c0301a9c564f5afcac68 Mon Sep 17 00:00:00 2001 +From: Rich Megginson +Date: Tue, 10 Apr 2012 13:49:26 -0600 +Subject: [PATCH 4/5] 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) +--- + ldap/servers/slapd/back-ldbm/index.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +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, +-- +1.7.1 + diff --git a/389-ds-base.spec b/389-ds-base.spec index 3ff7aa5..acf6d09 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -18,7 +18,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.10.4 -Release: %{?relprefix}4%{?prerel}%{?dist} +Release: %{?relprefix}5%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -106,7 +106,7 @@ Source2: %{name}-devel.README Patch0: 0001-Ticket-331-transaction-errors-with-db-4.3-and-db-4.2.patch Patch1: 0002-Bug-808770-abrt-389-ds-base-1.2.10.4-2.fc16-index_ra.patch Patch2: 0003-Ticket-336-abrt-389-ds-base-1.2.10.4-2.fc16-index_ra.patch - +Patch3: 0004-Ticket-336-abrt-389-ds-base-1.2.10.4-2.fc16-index_ra.patch %description 389 Directory Server is an LDAPv3 compliant server. The base package includes @@ -166,6 +166,7 @@ cp %{SOURCE2} README.devel %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %if %{use_openldap} @@ -355,6 +356,10 @@ exit 0 %{_libdir}/%{pkgname}/libslapd.so.* %changelog +* Tue Apr 10 2012 Rich Megginson - 1.2.10.4-5 +- Bug 808770 - [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) +- typo in previous patch + * Tue Apr 10 2012 Rich Megginson - 1.2.10.4-4 - Bug 808770 - [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) - same as Ticket #336