diff --git a/SOURCES/0015-Issue-4219-fix-crash-around-logging-internal-unindex.patch b/SOURCES/0015-Issue-4219-fix-crash-around-logging-internal-unindex.patch new file mode 100644 index 0000000..9a89297 --- /dev/null +++ b/SOURCES/0015-Issue-4219-fix-crash-around-logging-internal-unindex.patch @@ -0,0 +1,48 @@ +From 004aa9ef4f4ce967089d0a999617f19f4a3a7706 Mon Sep 17 00:00:00 2001 +From: Mark Reynolds +Date: Tue, 8 Dec 2020 09:19:36 -0500 +Subject: [PATCH 1/2] Issue 4219 - fix crash around logging internal unindexed + searches + +Description: In 1.3.x there is no function get_internal_conn_op() + which was beign called and crashing the server. Just + use the regular conn and op numbers. + +Fixes: https://github.com/389ds/389-ds-base/issues/4219 + +Reviewed by: tmihinto(Thanks!) +--- + ldap/servers/slapd/back-ldbm/ldbm_search.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c +index 212b6cb61..81eef3ac9 100644 +--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c ++++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c +@@ -831,10 +831,6 @@ ldbm_back_search(Slapi_PBlock *pb) + char *plugin_dn; + char *base_dn; + int32_t internal_op = operation_is_flag_set(operation, OP_FLAG_INTERNAL); +- uint64_t connid; +- int32_t op_id; +- int32_t op_internal_id; +- int32_t op_nested_count; + + /* + * Return error if nsslapd-require-index is set and +@@ -873,10 +869,9 @@ ldbm_back_search(Slapi_PBlock *pb) + slapi_pblock_get(pb, SLAPI_PLUGIN, &plugin); + } + plugin_dn = plugin_get_dn(plugin); +- get_internal_conn_op(&connid, &op_id, &op_internal_id, &op_nested_count); + slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_search", +- "Internal unindexed search: source (%s) search base=\"%s\" scope=%d filter=\"%s\" conn=%" PRIu64 " op=%d (internal op=%d count=%d)\n", +- plugin_dn, base_dn, scope, filter_str, connid, op_id, op_internal_id, op_nested_count); ++ "Internal unindexed search: source (%s) search base=\"%s\" scope=%d filter=\"%s\" conn=%" PRIu64 " op=%d\n", ++ plugin_dn, base_dn, scope, filter_str, pb_op->o_connid, pb_op->o_opid); + slapi_ch_free_string(&plugin_dn); + } else { + slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_search", +-- +2.26.2 + diff --git a/SPECS/389-ds-base.spec b/SPECS/389-ds-base.spec index 866c711..17de959 100644 --- a/SPECS/389-ds-base.spec +++ b/SPECS/389-ds-base.spec @@ -39,7 +39,7 @@ Summary: 389 Directory Server (%{variant}) Name: 389-ds-base Version: 1.3.10.2 -Release: %{?relprefix}8%{?prerel}%{?dist} +Release: %{?relprefix}9%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org/ Group: System Environment/Daemons @@ -160,6 +160,7 @@ Patch11: 0011-Issue-51233-ds-replcheck-crashes-in-offline-mode.patch Patch12: 0012-Issue-51166-Log-an-error-when-a-search-is-fully-unin.patch Patch13: 0013-Issue-4297-2nd-fix-for-on-ADD-replication-URP-issue-.patch Patch14: 0014-0002-Issue-4383-Do-not-normalize-escaped-spaces-in-a-DN.patch +Patch15: 0015-Issue-4219-fix-crash-around-logging-internal-unindex.patch %description 389 Directory Server is an LDAPv3 compliant server. The base package includes @@ -513,6 +514,10 @@ fi %{_sysconfdir}/%{pkgname}/dirsrvtests %changelog +* Thu Jan 7 2021 Mark Reynolds - 1.3.10.2-9 +- Bump version to 1.3.10.2-8 +- Resolves: Bug 1905450 - Internal unindexed search crashes the server + * Thu Dec 3 2020 Mark Reynolds - 1.3.10.2-8 - Bump version to 1.3.10.2-8 - Resolves: Bug 1904145 - group rdn with leading space char and add fails error 21 invalid syntax and delete fails error 32