From cc99b64c7d42901742d1bedd66ce67ed4da9c030 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Fri, 10 Nov 2006 04:24:25 +0000
Subject: Bug: 214733 Description: be able to pass in all configurable paths to
 ds_newinst Fix Description: There were a couple of other minor problems with
 ds_newinst.pl 1) Should only set cgi parameters for those items which have a
 value 2) Should not setenv NETSITE_ROOT - this overrides prefix settings 3)
 Should not set prefix here - it is set elsewhere

---
 ldap/admin/src/ds_newinst.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ldap/admin/src/ds_newinst.pl b/ldap/admin/src/ds_newinst.pl
index d3edbd9a..3c78eab8 100644
--- a/ldap/admin/src/ds_newinst.pl
+++ b/ldap/admin/src/ds_newinst.pl
@@ -53,6 +53,7 @@ sub getCgiContentAndLength {
   my $content = "";
   my $firsttime = 1;
   while (my ($kk, $vv) = each %{$args}) {
+    next if (!$kk || !$vv);
 	if ($firsttime) {
 	  $firsttime = 0;
 	} else {
@@ -73,7 +74,6 @@ sub cgiFake {
 
   # setup CGI environment
   $ENV{REQUEST_METHOD} = "POST";
-  $ENV{NETSITE_ROOT} = $sroot;
   $ENV{CONTENT_LENGTH} = $length;
   $ENV{SERVER_NAMES} = 'slapd-' . $args->{servid};
 
@@ -179,7 +179,6 @@ addAndCheck(\%cgiargs, "suffix", \%table, "slapd", "Suffix");
 
 # the following items are optional
 
-$cgiargs{"prefix"} = $table{"slapd"}->{"prefix"};
 $cgiargs{"lock_dir"} = $table{"slapd"}->{"lock_dir"};
 $cgiargs{"log_dir"} = $table{"slapd"}->{"log_dir"};
 $cgiargs{"run_dir"} = $table{"slapd"}->{"run_dir"};
-- 
cgit