[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_create.in, 1.1, 1.2 ds_remove.in, 1.1, 1.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1046

Modified Files:
	ds_create.in ds_remove.in 
Log Message:
Resolves: #246683
Summary: Reimplement ds_create without setuputil code (comment #16)
Description: adding 'print "Content-type: text/plain\n\n";' to each output.



Index: ds_create.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_create.in	4 Jul 2007 01:31:33 -0000	1.1
+++ ds_create.in	11 Jul 2007 21:36:47 -0000	1.2
@@ -75,6 +75,7 @@
 my $status = $?;
 # check for and report errors
 if ($status) {
+    print "Content-type: text/plain\n\n";
     print $output;
     exit $status;
 }
@@ -92,6 +93,7 @@
 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;
@@ -110,6 +112,7 @@
     $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;
@@ -127,11 +130,13 @@
         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;
@@ -146,11 +151,13 @@
 # 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
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_remove.in	11 Jul 2007 01:20:22 -0000	1.1
+++ ds_remove.in	11 Jul 2007 21:36:47 -0000	1.2
@@ -106,7 +106,7 @@
 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;
@@ -129,7 +129,7 @@
 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;
@@ -149,12 +149,12 @@
             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;
@@ -169,7 +169,7 @@
 # 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;
@@ -179,7 +179,7 @@
 $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;
@@ -203,6 +203,6 @@
 }
 
 # 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;