[Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl, 1.10, 1.11

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22953

Modified Files:
	ds_newinst.pl 
Log Message:
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



Index: ds_newinst.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ds_newinst.pl	9 Nov 2006 15:41:40 -0000	1.10
+++ ds_newinst.pl	10 Nov 2006 04:24:25 -0000	1.11
@@ -53,6 +53,7 @@
   my $content = "";
   my $firsttime = 1;
   while (my ($kk, $vv) = each %{$args}) {
+    next if (!$kk || !$vv);
 	if ($firsttime) {
 	  $firsttime = 0;
 	} else {
@@ -73,7 +74,6 @@
 
   # 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 @@
 
 # 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"};