[Fedora-directory-commits] ldapserver/ldap/admin/src upgradeServer, 1.5, 1.6

[Doctor Conrad]

Author: nhosoi

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

Modified Files:
	upgradeServer 
Log Message:
[167679] modify upgradeServer to upgrade db2index.pl
To fix the bug "[160003] db2index.pl cannot find libldap50.so if only certain
parameters are used", template-db2index.pl has been modified.
When upgrading existing servers, the perl scripts are not touched unless forced
to.  This upgradeServer provides the framework.



Index: upgradeServer
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/upgradeServer,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upgradeServer	19 Apr 2005 22:06:55 -0000	1.5
+++ upgradeServer	7 Sep 2005 00:54:20 -0000	1.6
@@ -419,7 +419,7 @@
 sub instantiate_new_scripts {
 
   @newtemplates = (
-    "$sroot/bin/slapd/admin/scripts/template-ns-newpwpolicy.pl"
+    "$sroot/bin/slapd/admin/scripts/template-db2index.pl"
   );
 
   $host = localhost;
@@ -435,7 +435,6 @@
 
   foreach $src ( @newtemplates ) {
     $dest = "$sroot/$prefix/$1" if $src =~ /.*template-(.*)$/;
-    next if -f $dest;
     unless ( open ( template, $src )) {
       print "Can't open $src: $!\n";
       next;
@@ -451,6 +450,7 @@
       s#{{ROOT-DN}}#$rootdn#g;
       s#{{SERVER-PORT}}#$port#g;
       s#{{SERVER-NAME}}#$host#g;
+      s#{{MY-DS-ROOT}}#$sroot/$prefix#g;
       printf target;
     }
     close template;