andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 5 months ago
Clone

Blame SOURCES/0013-Ticket-49946-upgrade-of-389-ds-base-could-remove-rep.patch

26521d
From 11f8ecf946c0b56d7d49f7b46429d153d5c19ee1 Mon Sep 17 00:00:00 2001
26521d
From: German Parente <gparente@redhat.com>
26521d
Date: Wed, 10 Oct 2018 10:24:08 +0200
26521d
Subject: [PATCH] Ticket #49946 upgrade of 389-ds-base could remove replication
26521d
 agreements.
26521d
26521d
Bug Description:
26521d
26521d
when a replication agreement starts with "cn=->...", the upgrade is removing
26521d
the entry.
26521d
26521d
Fix Description:
26521d
26521d
a check is missing when re-building dse.ldif in "setup-ds.pl -u" that provoked this entry not to be re-added to the file.
26521d
26521d
https://pagure.io/389-ds-base/issue/49946
26521d
26521d
Author: German Parente <gparente@redhat.com>
26521d
26521d
Review by: ???
26521d
---
26521d
 ldap/admin/src/scripts/FileConn.pm | 2 +-
26521d
 1 file changed, 1 insertion(+), 1 deletion(-)
26521d
26521d
diff --git a/ldap/admin/src/scripts/FileConn.pm b/ldap/admin/src/scripts/FileConn.pm
26521d
index dcea70904..8a2a1afe6 100644
26521d
--- a/ldap/admin/src/scripts/FileConn.pm
26521d
+++ b/ldap/admin/src/scripts/FileConn.pm
26521d
@@ -360,7 +360,7 @@ sub add {
26521d
         return $self->write();
26521d
     }
26521d
 
26521d
-    if (exists($self->{$ndn})) {
26521d
+    if ($ndn && exists($self->{$ndn})) {
26521d
         $self->setErrorCode(LDAP_ALREADY_EXISTS);
26521d
         return 0;
26521d
     }
26521d
-- 
26521d
2.17.2
26521d