Branch '389-ds-base-1.3.5' - ldap/admin

[Noriko Hosoi]

ldap/admin/src/scripts/DSUtil.pm.in |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1abb0ffb2930d019f58d5dac1937ddbb56c9287f
Author: Thierry Bordaz 
Date:   Mon Jan 30 17:38:01 2017 +0100

Ticket 49016 - (un)register/migration/remove may fail if there is no suffix on 'userRoot' backend

Bug Description:
        Previous fix was incomplete in case none of the backend entries have
        'nsslapd-suffix' value

Fix Description:

Just return if $suffix keep unmodified

https://fedorahosted.org/389/ticket/49016

Reviewed by: nhosoi

Platforms tested: F23, F25

Flag Day: no

Doc impact: no

(cherry picked from commit bd5fdfc8f4a560eae99672b712235c1260ee42b0)

diff --git a/ldap/admin/src/scripts/DSUtil.pm.in b/ldap/admin/src/scripts/DSUtil.pm.in
index c972805..805a9b9 100644
--- a/ldap/admin/src/scripts/DSUtil.pm.in
+++ b/ldap/admin/src/scripts/DSUtil.pm.in
@@ -965,7 +965,7 @@ sub createInfFromConfig {
     $inf->{slapd}->{ServerPort} = $ent->getValues('nsslapd-port');
     $inf->{slapd}->{ServerIdentifier} = $id;

-    my $suffix;
+    my $suffix = "";
     $ent = $conn->search("cn=ldbm database,cn=plugins,cn=config",
                          "one", "(objectclass=*)");
     if (!$ent) {
@@ -981,6 +981,12 @@ sub createInfFromConfig {
         last if ($ent->hasValue('cn', 'userRoot', 1));
         $ent = $conn->nextEntry();
     }
+    if ( "" eq "$suffix" )
+    {
+        push @{$errs}, "error_opening_dseldif", $fname, $!;
+        $conn->close();
+        return 0;
+    }

# we also need the instance dir
     $ent = $conn->search("cn=config", "base", "(objectclass=*)");