[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.12, 1.13 register-ds-admin.pl.in, 1.2, 1.3

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20185/newinst/src

Modified Files:
	AdminUtil.pm.in register-ds-admin.pl.in 
Log Message:
Resolves: #251090
Summary: ds_remove cannot remove/rename directories (Comment #3)
Description:
ds_remove.in: fixing a syntax error
AdminUtil.pm.in: return an error when connection fails
register-ds-admin.pl: fixing the error checking



Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AdminUtil.pm.in	27 Jul 2007 01:35:29 -0000	1.12
+++ AdminUtil.pm.in	7 Aug 2007 23:30:02 -0000	1.13
@@ -327,6 +327,10 @@
                                        $inf->{slapd}->{RootDN},
                                        $inf->{slapd}->{RootDNPwd},
                                        $inf->{General}->{certdir});
+    if (!$conn) {
+        @{$errs} = ('error_connection_failed');
+        return 1;
+    }
 
     return internalCreateSubDS($conn, $inf, $errs);
 }


Index: register-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.pl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- register-ds-admin.pl.in	2 Aug 2007 14:44:10 -0000	1.2
+++ register-ds-admin.pl.in	7 Aug 2007 23:30:02 -0000	1.3
@@ -81,9 +81,9 @@
 my $instconfigdir = $setup->{configdir};
 my @instances = ();
 for my $dir (glob("$setup->{configdir}/slapd-*")) {
-	if (-d $dir) {
-		push @instances, basename($dir);
-	}
+    if (-d $dir) {
+        push @instances, basename($dir);
+    }
 }
 if ( $#instances < 0 )
 {
@@ -320,10 +320,9 @@
         $setup->{inf}->{slapd} = $subinf->{slapd};
         $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
                                                  'input_rootdn_passwd', $subid);
-        while (!createSubDS($setup->{inf}, \@errs))
+        while (createSubDS($setup->{inf}, \@errs))
         {
             $setup->msg($FATAL, @errs);
-            $setup->msg($FATAL, 'error_create_configds');
             $setup->{inf}->{slapd}->{RootDNPwd} = reg_get_passwd($setup,
                                                  'input_rootdn_passwd', $subid);
         }