[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-bak2db.pl, 1.7, 1.8 template-bak2db.pl.in, 1.1, 1.2 template-cl-dump.pl, 1.9, 1.10 template-cl-dump.pl.in, 1.1, 1.2 template-db2bak.pl, 1.6, 1.7 template-db2bak.pl.in, 1.1, 1.2 template-db2index.pl, 1.7, 1.8 template-db2index.pl.in, 1.1, 1.2 template-db2ldif.pl, 1.6, 1.7 template-db2ldif.pl.in, 1.1, 1.2 template-ldif2db.pl, 1.6, 1.7 template-ldif2db.pl.in, 1.1, 1.2 template-ns-accountstatus.pl, 1.6, 1.7 template-ns-accountstatus.pl.in, 1.

[Doctor Conrad]

Author: nhosoi

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

Modified Files:
	template-bak2db.pl template-bak2db.pl.in template-cl-dump.pl 
	template-cl-dump.pl.in template-db2bak.pl 
	template-db2bak.pl.in template-db2index.pl 
	template-db2index.pl.in template-db2ldif.pl 
	template-db2ldif.pl.in template-ldif2db.pl 
	template-ldif2db.pl.in template-ns-accountstatus.pl 
	template-ns-accountstatus.pl.in template-ns-activate.pl 
	template-ns-activate.pl.in template-ns-inactivate.pl 
	template-ns-inactivate.pl.in template-ns-newpwpolicy.pl 
	template-ns-newpwpolicy.pl.in template-repl-monitor-cgi.pl 
	template-repl-monitor-cgi.pl.in template-verify-db.pl 
	template-verify-db.pl.in 
Log Message:
Resolves: #210947
Summary: Processed: parameterizing the hardcoded paths (phase 3. installed binaries,
change log, setup)
Comment #29



Index: template-bak2db.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template-bak2db.pl	25 Oct 2006 00:04:42 -0000	1.7
+++ template-bak2db.pl	2 Nov 2006 02:22:33 -0000	1.8
@@ -126,9 +126,9 @@
 $entry = "${dn}${misc}${cn}${nsinstance}${nsarchivedir}${nsdbtype}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-bak2db.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-bak2db.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-bak2db.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -126,9 +126,9 @@
 $entry = "${dn}${misc}${cn}${nsinstance}${nsarchivedir}${nsdbtype}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-cl-dump.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-cl-dump.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- template-cl-dump.pl	25 Oct 2006 20:36:46 -0000	1.9
+++ template-cl-dump.pl	2 Nov 2006 02:22:33 -0000	1.10
@@ -101,8 +101,8 @@
 # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 
 $usage="Usage: $0 [-h host] [-p port] [-D bind-dn] [-w bind-password | -P bind-cert]
[-r replica-roots] [-o output-file] [-c] [-v]\n\n       $0 -i
changelog-ldif-file-with-base64encoding [-o output-file] [-c]";
 


Index: template-cl-dump.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-cl-dump.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-cl-dump.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-cl-dump.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -101,8 +101,8 @@
 # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
 $usage="Usage: $0 [-h host] [-p port] [-D bind-dn] [-w bind-password | -P bind-cert]
[-r replica-roots] [-o output-file] [-c] [-v]\n\n       $0 -i
changelog-ldif-file-with-base64encoding [-o output-file] [-c]";
 


Index: template-db2bak.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-db2bak.pl	25 Oct 2006 00:04:42 -0000	1.6
+++ template-db2bak.pl	2 Nov 2006 02:22:33 -0000	1.7
@@ -115,9 +115,9 @@
 $entry = "${dn}${misc}${cn}${nsarchivedir}${nsdbtype}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-db2bak.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-db2bak.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-db2bak.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -115,9 +115,9 @@
 $entry = "${dn}${misc}${cn}${nsarchivedir}${nsdbtype}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-db2index.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template-db2index.pl	25 Oct 2006 00:04:42 -0000	1.7
+++ template-db2index.pl	2 Nov 2006 02:22:33 -0000	1.8
@@ -67,9 +67,9 @@
 
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 
 $i = 0;
 while ($i <= $#ARGV) 


Index: template-db2index.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-db2index.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-db2index.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -67,9 +67,9 @@
 
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
 $i = 0;
 while ($i <= $#ARGV) 


Index: template-db2ldif.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-db2ldif.pl	25 Oct 2006 00:04:42 -0000	1.6
+++ template-db2ldif.pl	2 Nov 2006 02:22:33 -0000	1.7
@@ -242,9 +242,9 @@
 $entry =
"${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsreplica}${nsnobase64}${nsnowrap}${nsnoversion}${nsnouniqueid}${nsuseid2entry}${nsonefile}${nsexportdecrypt}${nsprintkey}${nsldiffile}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-db2ldif.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-db2ldif.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-db2ldif.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -242,9 +242,9 @@
 $entry =
"${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsreplica}${nsnobase64}${nsnowrap}${nsnoversion}${nsnouniqueid}${nsuseid2entry}${nsonefile}${nsexportdecrypt}${nsprintkey}${nsldiffile}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-ldif2db.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-ldif2db.pl	25 Oct 2006 00:04:42 -0000	1.6
+++ template-ldif2db.pl	2 Nov 2006 02:22:33 -0000	1.7
@@ -218,9 +218,9 @@
 $entry =
"${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsldiffiles}${nsnoattrindexes}${nsimportencrypt}${nsmergechunksiz}${nsgenuniqid}${nsuniqidname}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-ldif2db.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-ldif2db.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-ldif2db.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -218,9 +218,9 @@
 $entry =
"${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsldiffiles}${nsnoattrindexes}${nsimportencrypt}${nsmergechunksiz}${nsgenuniqid}${nsuniqidname}";
 $vstr = "";
 if ($verbose != 0) { $vstr = "-v"; }
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D
\"$rootdn\" -w \"$passwd\" -a" );
 print(FOO "$entry");
 close(FOO);


Index: template-ns-accountstatus.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-accountstatus.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-ns-accountstatus.pl	25 Oct 2006 00:04:42 -0000	1.6
+++ template-ns-accountstatus.pl	2 Nov 2006 02:22:33 -0000	1.7
@@ -392,9 +392,9 @@
 
 debug("Running ** $cmd ** $operation\n");
 
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 
 $ldapsearch="ldapsearch -1";
 $ldapmodify="ldapmodify";


Index: template-ns-accountstatus.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-accountstatus.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-ns-accountstatus.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-ns-accountstatus.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -392,9 +392,9 @@
 
 debug("Running ** $cmd ** $operation\n");
 
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
 $ldapsearch="ldapsearch -1";
 $ldapmodify="ldapmodify";


Index: template-ns-activate.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-activate.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-ns-activate.pl	25 Oct 2006 00:04:42 -0000	1.6
+++ template-ns-activate.pl	2 Nov 2006 02:22:33 -0000	1.7
@@ -392,9 +392,9 @@
 
 debug("Running ** $cmd ** $operation\n");
 
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 
 $ldapsearch="ldapsearch -1";
 $ldapmodify="ldapmodify";


Index: template-ns-activate.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-activate.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-ns-activate.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-ns-activate.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -392,9 +392,9 @@
 
 debug("Running ** $cmd ** $operation\n");
 
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
 $ldapsearch="ldapsearch -1";
 $ldapmodify="ldapmodify";


Index: template-ns-inactivate.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-inactivate.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-ns-inactivate.pl	25 Oct 2006 00:04:42 -0000	1.6
+++ template-ns-inactivate.pl	2 Nov 2006 02:22:33 -0000	1.7
@@ -392,9 +392,9 @@
 
 debug("Running ** $cmd ** $operation\n");
 
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 
 $ldapsearch="ldapsearch -1";
 $ldapmodify="ldapmodify";


Index: template-ns-inactivate.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-inactivate.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-ns-inactivate.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-ns-inactivate.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -392,9 +392,9 @@
 
 debug("Running ** $cmd ** $operation\n");
 
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
 $ldapsearch="ldapsearch -1";
 $ldapmodify="ldapmodify";


Index: template-ns-newpwpolicy.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template-ns-newpwpolicy.pl	25 Oct 2006 20:36:46 -0000	1.7
+++ template-ns-newpwpolicy.pl	2 Nov 2006 02:22:33 -0000	1.8
@@ -44,9 +44,9 @@
 # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 # Add new password policy specific entries
 
 #############################################################################


Index: template-ns-newpwpolicy.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-ns-newpwpolicy.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-ns-newpwpolicy.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -44,9 +44,9 @@
 # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 # Add new password policy specific entries
 
 #############################################################################


Index: template-repl-monitor-cgi.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor-cgi.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template-repl-monitor-cgi.pl	25 Oct 2006 20:36:46 -0000	1.7
+++ template-repl-monitor-cgi.pl	2 Nov 2006 02:22:33 -0000	1.8
@@ -58,9 +58,9 @@
 $siteroot = $cgiVars{'siteroot'};
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} =
'$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib';
+$ENV{'PATH'} =
"$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib";
 
 # Save user-specified parameters as cookies in monreplication.properties.
 # Sync up with the property file so that monreplication2 is interval, and


Index: template-repl-monitor-cgi.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor-cgi.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-repl-monitor-cgi.pl.in	25 Oct 2006 20:36:46 -0000	1.1
+++ template-repl-monitor-cgi.pl.in	2 Nov 2006 02:22:33 -0000	1.2
@@ -58,9 +58,9 @@
 $siteroot = $cgiVars{'siteroot'};
 $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} =
'$prefix@ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} =
'$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} =
"$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
 # Save user-specified parameters as cookies in monreplication.properties.
 # Sync up with the property file so that monreplication2 is interval, and


Index: template-verify-db.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-verify-db.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template-verify-db.pl	25 Oct 2006 20:36:46 -0000	1.7
+++ template-verify-db.pl	2 Nov 2006 02:22:33 -0000	1.8
@@ -111,12 +111,11 @@
 
 # get dirs having DBVERSION
 my $dbdirs = getDbDir(".");
-my $brand_ds = {{DS-BRAND}};
 my $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} = '$prefix/usr/bin:$prefix/usr/lib:/usr/bin:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} = ':/usr/lib';
-$ENV{'SHLIB_PATH'} = ':/usr/lib';
+$ENV{'PATH'} = "$prefix/usr/bin:$prefix/usr/bin:/usr/bin:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} = ":/usr/lib";
+$ENV{'SHLIB_PATH'} = ":/usr/lib";
 
 for (my $i = 0; $i < @$dbdirs; $i++)
 {


Index: template-verify-db.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-verify-db.pl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template-verify-db.pl.in	26 Oct 2006 17:45:28 -0000	1.2
+++ template-verify-db.pl.in	2 Nov 2006 02:22:33 -0000	1.3
@@ -113,9 +113,9 @@
 my $dbdirs = getDbDir(".");
 my $prefix = "{{DS-ROOT}}";
 
-$ENV{'PATH'} =
'$prefix@db_bindir@:$prefix/usr/lib:@db_bindir@:/usr/lib';
-$ENV{'LD_LIBRARY_PATH'} = '@db_libdir@:/usr/lib';
-$ENV{'SHLIB_PATH'} = '@db_libdir@:/usr/lib';
+$ENV{'PATH'} =
"$prefix@db_bindir@:$prefix/usr/bin:@db_bindir@:/usr/bin";
+$ENV{'LD_LIBRARY_PATH'} = "@db_libdir@:/usr/lib";
+$ENV{'SHLIB_PATH'} = "@db_libdir@:/usr/lib";
 
 for (my $i = 0; $i < @$dbdirs; $i++)
 {