diff --git a/0071-Issue-6846-Attribute-uniqueness-is-not-enforced-with.patch b/0071-Issue-6846-Attribute-uniqueness-is-not-enforced-with.patch deleted file mode 100644 index e4e503d..0000000 --- a/0071-Issue-6846-Attribute-uniqueness-is-not-enforced-with.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0fc6dd8ecf8db540f452c8dc385272279cee2f54 Mon Sep 17 00:00:00 2001 -From: James Chapman -Date: Tue, 14 Oct 2025 20:35:01 +0100 -Subject: [PATCH] Issue 6846 - Attribute uniqueness is not enforced with modrdn - (#7026) - -Description: The attribute uniqueness plugin fails to enforce -uniqueness on the CN attribute during a MODRDN operation. If no -new superior DN is specified, the destinationSDN is an empty SDN -struct, breaking marker and subtree searches later. - -In this case we fall back to using the parent of the source entry -as the destination. - -Fixes: https://github.com/389ds/389-ds-base/issues/6846 - -Reviewed by: @progier389, @tbordaz (Thank you) - -(cherry picked from commit 1d2b3ba2b08382245d15602fc4f96077845fe35b) -Signed-off-by: Masahiro Matsuya ---- - ldap/servers/plugins/uiduniq/uid.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c -index 5a0d61b86..486bca341 100644 ---- a/ldap/servers/plugins/uiduniq/uid.c -+++ b/ldap/servers/plugins/uiduniq/uid.c -@@ -1343,8 +1343,13 @@ preop_modrdn(Slapi_PBlock *pb) - * its current level in the tree. Use the source SDN for - * determining which managed tree this belongs to - */ -- if (!destinationSDN) -+ if (!destinationSDN) { -+ destinationSDN = slapi_sdn_new(); -+ } -+ if (slapi_sdn_get_dn(destinationSDN) == NULL) { -+ /* If no superior was specified fall back to the parent of source */ - slapi_sdn_get_parent(sourceSDN, destinationSDN); -+ } - - /* Get the new RDN - this has the attribute values */ - err = slapi_pblock_get(pb, SLAPI_MODRDN_NEWRDN, &rdn); --- -2.51.1 - diff --git a/0072-Issue-7007-Improve-paged-result-search-locking.patch b/0071-Issue-7007-Improve-paged-result-search-locking.patch similarity index 100% rename from 0072-Issue-7007-Improve-paged-result-search-locking.patch rename to 0071-Issue-7007-Improve-paged-result-search-locking.patch diff --git a/0073-Issue-6966-2nd-On-large-DB-unlimited-IDL-scan-limit-.patch b/0072-Issue-6966-2nd-On-large-DB-unlimited-IDL-scan-limit-.patch similarity index 100% rename from 0073-Issue-6966-2nd-On-large-DB-unlimited-IDL-scan-limit-.patch rename to 0072-Issue-6966-2nd-On-large-DB-unlimited-IDL-scan-limit-.patch diff --git a/389-ds-base.spec b/389-ds-base.spec index ab567da..bd01660 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -52,7 +52,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.4.3.39 -Release: %{?relprefix}17%{?prerel}%{?dist} +Release: %{?relprefix}18%{?prerel}%{?dist} License: GPL-3.0-or-later WITH GPL-3.0-389-ds-base-exception AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSD-2-Clause OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR LGPL-2.1-or-later OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0) AND Unicode-3.0 AND (MIT OR Unlicense) AND Apache-2.0 AND BSD-3-Clause AND MIT AND MPL-2.0 URL: https://www.port389.org Group: System Environment/Daemons @@ -368,9 +368,8 @@ Patch67: 0067-Issue-7047-MemberOf-plugin-logs-null-attribute-name-.patc Patch68: 0068-Issue-7032-The-new-ipahealthcheck-test-ipahealthchec.patch Patch69: 0069-Issue-6947-Revise-time-skew-check-in-healthcheck-too.patch Patch70: 0070-Issue-6901-Update-changelog-trimming-logging-7102.patch -Patch71: 0071-Issue-6846-Attribute-uniqueness-is-not-enforced-with.patch -Patch72: 0072-Issue-7007-Improve-paged-result-search-locking.patch -Patch73: 0073-Issue-6966-2nd-On-large-DB-unlimited-IDL-scan-limit-.patch +Patch71: 0071-Issue-7007-Improve-paged-result-search-locking.patch +Patch72: 0072-Issue-6966-2nd-On-large-DB-unlimited-IDL-scan-limit-.patch #Patch100: cargo.patch @@ -996,6 +995,9 @@ exit 0 %doc README.md %changelog +* Wed Dec 03 2025 Masahiro Matsuya - 1.4.3.39-18 +- Reverts: RHEL-123241 - Attribute uniqueness is not enforced upon modrdn operation [rhel-8.10.z] + * Wed Nov 26 2025 Masahiro Matsuya - 1.4.3.39-17 - Resolves: RHEL-80491 - Can't rename users member of automember rule [rhel-8.10.z] - Resolves: RHEL-87191 - Some replication status data are reset upon a restart. [rhel-8.10.z]