Attachment 160835 Details for Bug 251090 – cvs diff (adminserver)

[patch] cvs diff (adminserver)

as.diffs (text/plain), 2.26 KB, created by Noriko Hosoi on 2007-08-07 18:20:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-08-07 18:20:38 UTC

Size: 2.26 KB

patch

obsolete

>Index: cgi-src40/ds_remove.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 ds_remove.in
>--- cgi-src40/ds_remove.in	2 Aug 2007 14:44:10 -0000	1.5
>+++ cgi-src40/ds_remove.in	7 Aug 2007 18:16:51 -0000
>@@ -16,9 +16,9 @@
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
>-use lib qw(@perlpath@)
>+use lib qw(@perlpath@);
> 
> use strict;
> 
> use File::Basename;
>Index: newinst/src/AdminUtil.pm.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
>retrieving revision 1.12
>diff -t -w -U4 -r1.12 AdminUtil.pm.in
>--- newinst/src/AdminUtil.pm.in	27 Jul 2007 01:35:29 -0000	1.12
>+++ newinst/src/AdminUtil.pm.in	7 Aug 2007 18:16:51 -0000
>@@ -326,8 +326,12 @@
>                                        $inf->{slapd}->{ServerPort},
>                                        $inf->{slapd}->{RootDN},
>                                        $inf->{slapd}->{RootDNPwd},
>                                        $inf->{General}->{certdir});
>+    if (!$conn) {
>+        @{$errs} = ('error_connection_failed');
>+        return 1;
>+    }
> 
>     return internalCreateSubDS($conn, $inf, $errs);
> }
> 
>Index: newinst/src/register-ds-admin.pl.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.pl.in,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 register-ds-admin.pl.in
>--- newinst/src/register-ds-admin.pl.in	2 Aug 2007 14:44:10 -0000	1.2
>+++ newinst/src/register-ds-admin.pl.in	7 Aug 2007 18:16:51 -0000
>@@ -319,12 +319,11 @@
>         }
>         $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);
>         }
>     }

Actions: View | Diff

Attachments on bug 251090: 160789 | 160834 | 160835 | 160872 | 208571 | 208641 | 208681