Attachment 158989 Details for Bug 246683 – cvs diff ds_create.in ds_remove.in

[patch] cvs diff ds_create.in ds_remove.in

ds_in.diffs (text/plain), 4.51 KB, created by Noriko Hosoi on 2007-07-11 19:06:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-07-11 19:06:11 UTC

Size: 4.51 KB

patch

obsolete

>Index: ds_create.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 ds_create.in
>--- ds_create.in	4 Jul 2007 01:31:33 -0000	1.1
>+++ ds_create.in	11 Jul 2007 18:56:42 -0000
>@@ -74,8 +74,9 @@
> my $output = `$prog 2>&1`;
> my $status = $?;
> # check for and report errors
> if ($status) {
>+    print "Content-type: text/plain\n\n";
>     print $output;
>     exit $status;
> }
> 
>@@ -91,8 +92,9 @@
> my $inst = $query->param('servid');
> my @errs;
> my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
> if (@errs) {
>+    print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>     print "NMC_Status: 1\n";
>     exit 1;
> }
>@@ -109,8 +111,9 @@
> $inf->{General}->{AdminDomain} = $query->param('admin_domain') ||
>     $admConf->{AdminDomain};
> 
> if (!createSubDSNoConn($inf, \@errs)) {
>+    print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>     print "NMC_Status: 1\n";
>     exit 1;
> }
>@@ -126,13 +129,15 @@
>         # run the CGI
>         my $output = `$prog 2>&1`;
>         my $status = $?;
>         if ($status) {
>+            print "Content-type: text/plain\n\n";
>             print "NMC_ErrInfo: Could not start directory server: $output\n";
>             print "NMC_Status: $status\n";
>             exit $status;
>         }
>     } else {
>+        print "Content-type: text/plain\n\n";
>         print "NMC_ErrInfo: The program $prog does not exist\n";
>         print "NMC_Status: 1\n";
>         exit 1;
>     }
>@@ -145,12 +150,14 @@
> # get admin domain
> # config ds info
> 
> if (!registerDSWithConfigDS($servid, \@errs, $inf)) {
>+    print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>     print "NMC_Status: 1\n";
>     exit 1;
> }
> 
> # if we got here, report success
>+print "Content-type: text/plain\n\n";
> print "NMC_Status: 0\n";
> exit 0;
>Index: ds_remove.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 ds_remove.in
>--- ds_remove.in	11 Jul 2007 01:20:22 -0000	1.1
>+++ ds_remove.in	11 Jul 2007 18:56:43 -0000
>@@ -105,9 +105,9 @@
> my ($slapd, $inst) = split(/-/, $instname, 2);
> my @errs;
> my $inf = createInfFromConfig("@instconfigdir@/slapd-$inst", $inst, \@errs);
> if (@errs) {
>-    print "Content-type: text/html\n\n";
>+    print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>     print "NMC_Status: 1\n";
>     exit 1;
> }
>@@ -128,9 +128,9 @@
> 
> my $dn = "cn=config";
> my $entry = $conn->search($dn, "base", "(cn=*)", 0);
> if (!$entry) {
>-    print "Content-type: text/html\n\n";
>+    print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
>     print "NMC_Status: 1\n";
>     exit 1;
> }
>@@ -148,14 +148,14 @@
>             my $output = `$prog 2>&1`;
>             my $status = $?;
>             if ($status) {
>                 # Ignore the stop failure
>-                print "Content-type: text/html\n\n";
>+                print "Content-type: text/plain\n\n";
>                 print "NMC_ErrInfo: Could not stop directory server: $output\n";
>             }
>             $instdir = $path;    # need to use it later...
>         } else {
>-            print "Content-type: text/html\n\n";
>+            print "Content-type: text/plain\n\n";
>             print "NMC_ErrInfo: The program $prog does not exist\n";
>             print "NMC_Status: 1\n";
>             exit 1;
>         }
>@@ -168,9 +168,9 @@
> # must get admin password from input (PASSWORD_PIPE?)
> # get admin domain
> # config ds info
> if (!unregisterDSWithConfigDS($inst, \@errs, $inf)) {
>-    print "Content-type: text/html\n\n";
>+    print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
>     print "NMC_Status: 1\n";
>     exit 1;
> }
>@@ -178,9 +178,9 @@
> # 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/html\n\n";
>+    print "Content-type: text/plain\n\n";
>     print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
>     print "NMC_Status: 1\n";
>     exit 1;
> }
>@@ -202,7 +202,7 @@
>     my $rc = rmtree($instdir);
> }
> 
> # if we got here, report success
>-print "Content-type: text/html\n\n";
>+print "Content-type: text/plain\n\n";
> print "NMC_Status: 0\n";
> exit 0;

Actions: View | Diff

Attachments on bug 246683: 158484 | 158485 | 158486 | 158487 | 158491 | 158494 | 158914 | 158989 | 159007