Attachment 159393 Details for Bug 247215 – cvs diff (adminserver)

[patch] cvs diff (adminserver)

ds_remove.diffs (text/plain), 5.26 KB, created by Noriko Hosoi on 2007-07-17 00:42:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-07-17 00:42:05 UTC

Size: 5.26 KB

patch

obsolete

>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.23
>diff -t -w -U4 -r1.23 Makefile.am
>--- Makefile.am	11 Jul 2007 01:20:21 -0000	1.23
>+++ Makefile.am	17 Jul 2007 00:29:43 -0000
>@@ -162,9 +162,9 @@
>         ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
> 
> bin_SCRIPTS = admserv/newinst/src/register_server.pl
> cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
>-nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
>+nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin admserv/cfgstuff/ds_removal
> 
> cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
>         admserv/newinst/src/migrate-ds-admin.pl
> 
>Index: admserv/cgi-src40/ds_remove.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 ds_remove.in
>--- admserv/cgi-src40/ds_remove.in	11 Jul 2007 21:36:47 -0000	1.2
>+++ admserv/cgi-src40/ds_remove.in	17 Jul 2007 00:29:43 -0000
>@@ -70,9 +70,8 @@
>         }
>         if ( -d $rmdir && $rmdir =~ /$instname/ )
>         {
>             my $rc = rmtree($rmdir);
>-            print STDERR "rmtree: $rmdir => RC: $rc\n";
>         }
>     }
> }
> 
>@@ -102,14 +101,25 @@
> $ENV{QUERY_STRING} = $query->query_string();
> 
> my $instname = $query->param('InstanceName');
> my ($slapd, $inst) = split(/-/, $instname, 2);
>+my $configdir = "@instconfigdir@/slapd-$inst";
>+if ( ! -d $configdir )
>+{
>+    print "Content-type: text/plain\n\n";
>+    print "NMC_ErrInfo: $configdir does not exist\n";
>+    print "NMC_Status: 1\n";
>+    print STDERR "Error: $configdir does not exist\n";
>+    exit 1;
>+}
> my @errs;
>-my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
>-if (@errs) {
>+my $inf = createInfFromConfig($configdir, $inst, \@errs);
>+if (@errs)
>+{
>     print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>     print "NMC_Status: 1\n";
>+    print STDERR "Error: ", $res->getText(@errs), "\n";
>     exit 1;
> }
> 
> # add the parmeters necessary to configure this DS to be managed
>@@ -127,16 +137,44 @@
> my $conn = new FileConn($dseldif);
> 
> my $dn = "cn=config";
> my $entry = $conn->search($dn, "base", "(cn=*)", 0);
>-if (!$entry) {
>+if (!$entry)
>+{
>     print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
>     print "NMC_Status: 1\n";
>+    print STDERR "Error: Search $dn in $dseldif failed: $entry\n";
>+    exit 1;
>+}
>+
>+# Unregister the server from the configuration ds
>+# get config ds url from input or admconf
>+# get admin id from input or admconf
>+# must get admin password from input (PASSWORD_PIPE?)
>+# get admin domain
>+# config ds info
>+if (!unregisterDSWithConfigDS($inst, \@errs, $inf))
>+{
>+    print "Content-type: text/plain\n\n";
>+    print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>+    print "NMC_Status: 1\n";
>+    print STDERR "Error:", $res->getText(@errs), "\n";
>+    exit 1;
>+}
>+
>+$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
>+my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
>+if (!$dbentry)
>+{
>+    print "Content-type: text/plain\n\n";
>+    print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
>+    print "NMC_Status: 1\n";
>+    print "Error: Search $dn in $dseldif failed: $dbentry\n";
>     exit 1;
> }
> 
>-# stop the server first
>+# stop the server
> my $instdir = "";
> foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
> {
>     if ( -d $path )
>@@ -150,41 +188,22 @@
>             if ($status) {
>                 # Ignore the stop failure
>                 print "Content-type: text/plain\n\n";
>                 print "NMC_ErrInfo: Could not stop directory server: $output\n";
>+                print STDERR "Warning: Could not stop directory server: $output\n";
>             }
>             $instdir = $path;    # need to use it later...
>         } else {
>             print "Content-type: text/plain\n\n";
>             print "NMC_ErrInfo: The program $prog does not exist\n";
>             print "NMC_Status: 1\n";
>+            print STDERR "Error: The program $prog does not exist\n";
>             exit 1;
>         }
>     }
> }
> 
>-# Unregister the server from the configuration ds
>-# get config ds url from input or admconf
>-# get admin id from input or admconf
>-# must get admin password from input (PASSWORD_PIPE?)
>-# get admin domain
>-# config ds info
>-if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) {
>-    print "Content-type: text/plain\n\n";
>-    print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>-    print "NMC_Status: 1\n";
>-    exit 1;
>-}
>-
> # remove physical dirs/files
>-$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
>-my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
>-if (!$dbentry) {
>-    print "Content-type: text/plain\n\n";
>-    print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
>-    print "NMC_Status: 1\n";
>-    exit 1;
>-}
> remove_tree($dbentry, "nsslapd-directory", $instname, 1);
> remove_tree($dbentry, "nsslapd-db-logdirectory", $instname, 1);
> remove_tree($entry, "nsslapd-lockdir", $instname);
> remove_tree($entry, "nsslapd-tmpdir", $instname);

Actions: View | Diff

Attachments on bug 247215: 158634 | 158635 | 158676 | 158876 | 158879 | 158913 | 158917 | 158918 | 158919 | 159392 | 159393 | 159487 | 160087