admserv/newinst/src/register-ds-admin.pl.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 5923c77db0adeb62123e7208c8bd4695f8092e32
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Sep 10 17:21:53 2014 -0400
Ticket 47860 - register-ds-admin.pl problem when following steps to replicate
o=netscaperoot
Bug Description: When following the documented steps the script gets stuck in
a loop when it fails to add "o=netscaperoot". It's
failing
because it already exists.
Fix Description: Break out of the loop when the update operation fails.
https://fedorahosted.org/389/ticket/47860
Reviewed by: nhosoi(Thanks!)
diff --git a/admserv/newinst/src/register-ds-admin.pl.in
b/admserv/newinst/src/register-ds-admin.pl.in
index cd0f745..08c7108 100644
--- a/admserv/newinst/src/register-ds-admin.pl.in
+++ b/admserv/newinst/src/register-ds-admin.pl.in
@@ -613,12 +613,14 @@ if ( ($#admConfKeys >= 0 && ($orig_confdsid ne
$new_confdsid)) ||
@errs = ();
# First, let's register the Configuration Directory itself
- $setup->{inf}->{slapd}->{RootDNPwd} = $localrootpw;
+ if(!$setup->{inf}->{slapd}->{RootDNPwd}){
+ $setup->{inf}->{slapd}->{RootDNPwd} = $localrootpw;
+ }
while (!createConfigDS($setup->{inf}, \@errs))
{
foreach my $err (@errs)
{
- if ( $err eq "suffix_already_exists" )
+ if ( $err eq "suffix_already_exists" || $err eq
"error_creating_suffix_backend")
{
goto out;
}