From 9bfb4d89f9872774dca806bffb0452121e2a31cc Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Thu, 13 Jun 2024 12:00:45 +0200 Subject: [PATCH] Bump version to 1.4.3.39-5 Resolves: RHEL-16277 - LDAP connections are closed with code T2 before the IO block timeout is reached. [rhel-8.10.0.z] --- ...onnection-timeout-error-breaks-error.patch | 44 +++++++++++++++++++ 389-ds-base.spec | 7 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0009-Issue-6103-New-connection-timeout-error-breaks-error.patch diff --git a/0009-Issue-6103-New-connection-timeout-error-breaks-error.patch b/0009-Issue-6103-New-connection-timeout-error-breaks-error.patch new file mode 100644 index 0000000..4d577ec --- /dev/null +++ b/0009-Issue-6103-New-connection-timeout-error-breaks-error.patch @@ -0,0 +1,44 @@ +From a112394af3a20787755029804684d57a9c3ffa9a Mon Sep 17 00:00:00 2001 +From: James Chapman +Date: Wed, 21 Feb 2024 12:43:03 +0000 +Subject: [PATCH] Issue 6103 - New connection timeout error breaks errormap + (#6104) + +Bug description: A recent addition to the connection disconnect error +messaging, conflicts with how errormap.c maps error codes/strings. + +Fix description: errormap expects error codes/strings to be in ascending +order. Moved the new error code to the bottom of the list. + +Relates: https://github.com/389ds/389-ds-base/issues/6103 + +Reviewed by: @droideck. @progier389 (Thank you) +--- + ldap/servers/slapd/disconnect_error_strings.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ldap/servers/slapd/disconnect_error_strings.h b/ldap/servers/slapd/disconnect_error_strings.h +index c2d9e283b..f603a08ce 100644 +--- a/ldap/servers/slapd/disconnect_error_strings.h ++++ b/ldap/servers/slapd/disconnect_error_strings.h +@@ -14,7 +14,8 @@ + /* disconnect_error_strings.h + * + * Strings describing the errors used in logging the reason a connection +- * was closed. ++ * was closed. Ensure definitions are in the same order as the error codes ++ * defined in disconnect_errors.h + */ + #ifndef __DISCONNECT_ERROR_STRINGS_H_ + #define __DISCONNECT_ERROR_STRINGS_H_ +@@ -35,6 +36,6 @@ ER2(SLAPD_DISCONNECT_NTSSL_TIMEOUT, "T2") + ER2(SLAPD_DISCONNECT_SASL_FAIL, "S1") + ER2(SLAPD_DISCONNECT_PROXY_INVALID_HEADER, "P3") + ER2(SLAPD_DISCONNECT_PROXY_UNKNOWN, "P4") +- ++ER2(SLAPD_DISCONNECT_PAGED_SEARCH_LIMIT, "T3") + + #endif /* __DISCONNECT_ERROR_STRINGS_H_ */ +-- +2.45.0 + diff --git a/389-ds-base.spec b/389-ds-base.spec index d7fb6ba..902f7f0 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -48,7 +48,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.4.3.39 -Release: %{?relprefix}5%{?prerel}%{?dist} +Release: %{?relprefix}6%{?prerel}%{?dist} License: GPLv3+ and (ASL 2.0 or MIT) URL: https://www.port389.org Group: System Environment/Daemons @@ -301,6 +301,7 @@ Patch05: 0005-Issue-3527-Support-HAProxy-and-Instance-on-the-same-.patc Patch06: 0006-CVE-2024-2199.patch Patch07: 0007-CVE-2024-3657.patch Patch08: 0008-Issue-6096-Improve-connection-timeout-error-logging-.patch +Patch09: 0009-Issue-6103-New-connection-timeout-error-breaks-error.patch %description 389 Directory Server is an LDAPv3 compliant server. The base package includes @@ -922,6 +923,10 @@ exit 0 %doc README.md %changelog +* Thu Jun 13 2024 Viktor Ashirov - 1.4.3.39-6 +- Bump version to 1.4.3.39-6 +- Resolves: RHEL-16277 - LDAP connections are closed with code T2 before the IO block timeout is reached. [rhel-8.10.0.z] + * Tue Jun 11 2024 Viktor Ashirov - 1.4.3.39-5 - Bump version to 1.4.3.39-5 - Resolves: RHEL-16277 - LDAP connections are closed with code T2 before the IO block timeout is reached. [rhel-8.10.0.z]