This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.1 by this push:
new 04c110e Issue 50779 - lib389 - conflict compare fails for DN's with spaces
04c110e is described below
commit 04c110e926a86fa14ff2d0d38205c55ca39411dc
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Mon Dec 16 12:34:07 2019 -0500
Issue 50779 - lib389 - conflict compare fails for DN's with spaces
Description: When processing the attribute nsds5ReplConflict we were
splitting the value into its 3 components:
namingConflict (ADD) ENTRY_DN
But we split the "spaced out" values one too many times,
and that broke the entry DN if the DN contained any
spaces.
relates:
https://pagure.io/389-ds-base/issue/50779
Reviewed by: mreynolds (one line commit rule)
---
src/lib389/lib389/conflicts.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib389/lib389/conflicts.py b/src/lib389/lib389/conflicts.py
index ec7b67f..a57d6d9 100644
--- a/src/lib389/lib389/conflicts.py
+++ b/src/lib389/lib389/conflicts.py
@@ -38,7 +38,7 @@ class ConflictEntry(DSLdapObject):
# Get the conflict entry info
conflict_value = self.get_attr_val_utf8('nsds5ReplConflict')
- entry_dn = conflict_value.split(' ', 3)[2]
+ entry_dn = conflict_value.split(' ', 2)[2]
entry_rdn = ldap.explode_dn(entry_dn, 1)[0]
rdn_attr = entry_dn.split('=', 1)[0]
@@ -58,7 +58,7 @@ class ConflictEntry(DSLdapObject):
# Get the conflict entry info
conflict_value = self.get_attr_val_utf8('nsds5ReplConflict')
- entry_dn = conflict_value.split(' ', 3)[2]
+ entry_dn = conflict_value.split(' ', 2)[2]
entry_rdn = ldap.explode_dn(entry_dn, 1)[0]
# Gather the RDN details
@@ -91,7 +91,7 @@ class ConflictEntry(DSLdapObject):
"""
# Get the conflict entry info
conflict_value = self.get_attr_val_utf8('nsds5ReplConflict')
- entry_dn = conflict_value.split(' ', 3)[2]
+ entry_dn = conflict_value.split(' ', 2)[2]
# Get the valid entry
return DSLdapObject(self._instance, dn=entry_dn)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.