Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28074/ldap/admin/src/scripts
Modified Files: template-bak2db.pl template-cl-dump.pl template-db2bak.pl template-db2index.pl template-db2ldif.pl template-ldif2db.pl template-ns-accountstatus.pl template-ns-activate.pl template-ns-inactivate.pl template-ns-newpwpolicy.pl template-repl-monitor-cgi.pl template-repl-monitor.pl template-verify-db.pl Log Message: Resolves: #210947 Summary: parameterizing the hardcoded paths (phase 3. installed binaries, change log, setup) Comment #23
Index: template-bak2db.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-bak2db.pl 13 Oct 2006 01:06:21 -0000 1.6 +++ template-bak2db.pl 25 Oct 2006 00:04:42 -0000 1.7 @@ -56,7 +56,6 @@ $dbtype = "ldbm database"; $instance = ""; $prefix = "{{DS-ROOT}}"; -$mydsroot = "{{MY-DS-ROOT}}"; $verbose = 0; $rootdn = ""; $passwd = ""; @@ -127,7 +126,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsarchivedir}${nsdbtype}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -chdir("$prefix{{SEP}}shared{{SEP}}bin"); -open(FOO, "| $prefix{{SEP}}shared{{SEP}}bin{{SEP}}ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -a" ); +$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'; +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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- template-cl-dump.pl 21 Oct 2005 19:21:11 -0000 1.7 +++ template-cl-dump.pl 25 Oct 2006 00:04:42 -0000 1.8 @@ -99,19 +99,8 @@ # enable the use of our bundled perldap with our bundled ldapsdk libraries # all of this nonsense can be omitted if the mozldapsdk and perldap are # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5) -BEGIN { - my $sroot = "{{DS-ROOT}}"; - push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl"; - if ($ENV{LD_LIBRARY_PATH}) { - $ENV{LD_LIBRARY_PATH} .= ":"; - } - $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib"; - # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms - if ($ENV{SHLIB_PATH}) { - $ENV{SHLIB_PATH} .= ":"; - } - $ENV{SHLIB_PATH} .= "$sroot/shared/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-db2bak.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-db2bak.pl 13 Oct 2006 01:06:21 -0000 1.5 +++ template-db2bak.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -115,7 +115,9 @@ $entry = "${dn}${misc}${cn}${nsarchivedir}${nsdbtype}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -chdir("$prefix{{SEP}}shared{{SEP}}bin"); -open(FOO, "| $prefix{{SEP}}shared{{SEP}}bin{{SEP}}ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -a" ); +$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'; +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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-db2index.pl 13 Oct 2006 01:06:21 -0000 1.6 +++ template-db2index.pl 25 Oct 2006 00:04:42 -0000 1.7 @@ -67,6 +67,10 @@
$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'; + $i = 0; while ($i <= $#ARGV) { @@ -162,13 +166,12 @@ $indexes_list=""; $vlvattribute=""; $vlvindexes_list=""; -chdir("$prefix{{SEP}}shared{{SEP}}bin"); +chdir("$prefix{{SEP}}usr{{SEP}}bin"); if ( $attribute_arg eq "" && $vlvattribute_arg eq "" ) { # Get the list of indexes from the entry - $indexes_list="$prefix{{SEP}}shared{{SEP}}bin{{SEP}}ldapsearch $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -s one " . + $indexes_list="ldapsearch $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -s one " . "-b "cn=index,cn="$instance", cn=ldbm database,cn=plugins,cn=config" "(&(objectclass=*)(nsSystemIndex=false))" cn"; - # build the values of the attribute nsIndexAttribute open(LDAP1, "$indexes_list |"); while (<LDAP1>) { @@ -186,7 +189,7 @@ }
# Get the list of indexes from the entry - $vlvindexes_list="$prefix{{SEP}}shared{{SEP}}bin{{SEP}}ldapsearch $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -s sub -b "cn="$instance", cn=ldbm database,cn=plugins,cn=config" "objectclass=vlvIndex" cn"; + $vlvindexes_list="ldapsearch $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -s sub -b "cn="$instance", cn=ldbm database,cn=plugins,cn=config" "objectclass=vlvIndex" cn";
# build the values of the attribute nsIndexVlvAttribute open(LDAP1, "$vlvindexes_list |"); @@ -219,6 +222,6 @@ $nsinstance = "nsInstance: ${instance}\n";
$entry = "${dn}${misc}${cn}${nsinstance}${attribute}${vlvattribute}"; -open(FOO, "| $prefix{{SEP}}shared{{SEP}}bin{{SEP}}ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -a" ); +open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -a" ); print(FOO "$entry"); close(FOO);
Index: template-db2ldif.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-db2ldif.pl 13 Oct 2006 01:06:21 -0000 1.5 +++ template-db2ldif.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -242,7 +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"; } -chdir("$prefix{{SEP}}shared{{SEP}}bin"); -open(FOO, "| $prefix{{SEP}}shared{{SEP}}bin{{SEP}}ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -a" ); +$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'; +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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-ldif2db.pl 13 Oct 2006 01:06:21 -0000 1.5 +++ template-ldif2db.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -94,7 +94,6 @@ $uniqidname = ""; $taskname = ""; $prefix = "{{DS-ROOT}}"; -$mydsroot = "{{MY-DS-ROOT}}"; $verbose = 0; $rootdn = ""; $passwd = ""; @@ -219,7 +218,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsldiffiles}${nsnoattrindexes}${nsimportencrypt}${nsmergechunksiz}${nsgenuniqid}${nsuniqidname}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -chdir("$prefix{{SEP}}shared{{SEP}}bin"); -open(FOO, "| $prefix{{SEP}}shared{{SEP}}bin{{SEP}}ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D "$rootdn" -w "$passwd" -a" ); +$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'; +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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-ns-accountstatus.pl 13 Oct 2006 01:06:21 -0000 1.5 +++ template-ns-accountstatus.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -392,9 +392,12 @@
debug("Running ** $cmd ** $operation\n");
-$dsbinroot="$prefix{{SEP}}shared{{SEP}}bin"; -$ldapsearch="$dsbinroot{{SEP}}ldapsearch -1"; -$ldapmodify="$dsbinroot{{SEP}}ldapmodify"; +$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'; + +$ldapsearch="ldapsearch -1"; +$ldapmodify="ldapmodify";
# Default values $defrootdn= "{{ROOT-DN}}"; @@ -412,8 +415,6 @@ $single=0; $role=0;
-chdir("$dsbinroot"); - # Process the command line arguments while( $arg = shift) {
Index: template-ns-activate.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-activate.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-ns-activate.pl 13 Oct 2006 01:06:21 -0000 1.5 +++ template-ns-activate.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -392,9 +392,12 @@
debug("Running ** $cmd ** $operation\n");
-$dsbinroot="$prefix{{SEP}}shared{{SEP}}bin"; -$ldapsearch="$dsbinroot{{SEP}}ldapsearch -1"; -$ldapmodify="$dsbinroot{{SEP}}ldapmodify"; +$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'; + +$ldapsearch="ldapsearch -1"; +$ldapmodify="ldapmodify";
# Default values $defrootdn= "{{ROOT-DN}}"; @@ -412,8 +415,6 @@ $single=0; $role=0;
-chdir("$dsbinroot"); - # Process the command line arguments while( $arg = shift) {
Index: template-ns-inactivate.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-inactivate.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-ns-inactivate.pl 13 Oct 2006 01:06:21 -0000 1.5 +++ template-ns-inactivate.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -392,9 +392,12 @@
debug("Running ** $cmd ** $operation\n");
-$dsbinroot="$prefix{{SEP}}shared{{SEP}}bin"; -$ldapsearch="$dsbinroot{{SEP}}ldapsearch -1"; -$ldapmodify="$dsbinroot{{SEP}}ldapmodify"; +$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'; + +$ldapsearch="ldapsearch -1"; +$ldapmodify="ldapmodify";
# Default values $defrootdn= "{{ROOT-DN}}"; @@ -412,8 +415,6 @@ $single=0; $role=0;
-chdir("$dsbinroot"); - # Process the command line arguments while( $arg = shift) {
Index: template-ns-newpwpolicy.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-ns-newpwpolicy.pl 21 Oct 2005 19:21:11 -0000 1.5 +++ template-ns-newpwpolicy.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -42,19 +42,9 @@ # enable the use of our bundled perldap with our bundled ldapsdk libraries # all of this nonsense can be omitted if the mozldapsdk and perldap are # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5) -BEGIN { - my $sroot = "{{DS-ROOT}}"; - push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl"; - if ($ENV{LD_LIBRARY_PATH}) { - $ENV{LD_LIBRARY_PATH} .= ":"; - } - $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib"; - # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms - if ($ENV{SHLIB_PATH}) { - $ENV{SHLIB_PATH} .= ":"; - } - $ENV{SHLIB_PATH} .= "$sroot/shared/lib"; -} +$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'; # Add new password policy specific entries
############################################################################# @@ -74,11 +64,15 @@ $opt_h = "{{SERVER-NAME}}"; $opt_v = 0;
-# Variables -$ldapsearch="{{DS-ROOT}}{{SEP}}shared{{SEP}}bin{{SEP}}ldapsearch"; -$ldapmodify="{{DS-ROOT}}{{SEP}}shared{{SEP}}bin{{SEP}}ldapmodify"; +$ENV{'PATH'} = '$prefix{{SEP}}usr{{SEP}}lib:{{SEP}}usr{{SEP}}lib{{SEP}}mozldap'; +$ENV{'LD_LIBRARY_PATH'} .= ":"; +$ENV{'LD_LIBRARY_PATH'} .= "$prefix{{SEP}}usr{{SEP}}lib:{{SEP}}usr{{SEP}}lib{{SEP}}mozldap"; +$ENV{'SHLIB_PATH'} .= ":"; +$ENV{'SHLIB_PATH'} .= "$prefix{{SEP}}usr{{SEP}}lib:{{SEP}}usr{{SEP}}lib{{SEP}}mozldap";
-chdir("{{DS-ROOT}}{{SEP}}shared{{SEP}}bin"); +# Variables +$ldapsearch="ldapsearch -1"; +$ldapmodify="ldapmodify";
#############################################################################
Index: template-repl-monitor-cgi.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor-cgi.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-repl-monitor-cgi.pl 21 Oct 2005 19:21:11 -0000 1.5 +++ template-repl-monitor-cgi.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -56,8 +56,9 @@ $params .= " -u "$admurl""; } $siteroot = $cgiVars{'siteroot'}; -$ENV{'LD_LIBRARY_PATH'} = "$siteroot/shared/lib"; -$ENV{'SHLIB_PATH'} = "$siteroot/shared/lib"; +$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';
# 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.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- template-repl-monitor.pl 21 Oct 2005 19:21:11 -0000 1.7 +++ template-repl-monitor.pl 25 Oct 2006 00:04:42 -0000 1.8 @@ -150,7 +150,7 @@ # e.g. PERL5LIB="serverroot/lib/perl/arch:serverroot/lib/perl" # # 4. Set LD_LIBRARY_PATH (or SHLIB_PATH) to point to the location of our -# bundled shared libraries e.g. LD_LIBRARY_PATH="serverroot/shared/lib" +# bundled shared libraries e.g. LD_LIBRARY_PATH="serverroot/lib" # # 5. Invoke the script as follows if <MYPERLDIR> (serverroot/lib/perl) contains # Mozilla/LDAP: @@ -163,19 +163,6 @@ # this script is always invoked by repl-monitor-cgi.pl, which sets all of these # If using this script standalone, be sure to set the shared lib path and # the path to the perldap modules. -# BEGIN { -# my $sroot = "{{DS-ROOT}}"; -# push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl"; -# if ($ENV{LD_LIBRARY_PATH}) { -# $ENV{LD_LIBRARY_PATH} .= ":"; -# } -# $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib"; -# # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms -# if ($ENV{SHLIB_PATH}) { -# $ENV{SHLIB_PATH} .= ":"; -# } -# $ENV{SHLIB_PATH} .= "$sroot/shared/lib"; -# } $usage = "\nusage: $0 -f configuration-file [-h host] [-p port] [-r] [-u refresh-url] [-t refresh-interval]\n\nor : $0 -v\n";
use Getopt::Std; # parse command line arguments
Index: template-verify-db.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-verify-db.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template-verify-db.pl 21 Oct 2005 19:21:11 -0000 1.5 +++ template-verify-db.pl 25 Oct 2006 00:04:42 -0000 1.6 @@ -111,12 +111,16 @@
# get dirs having DBVERSION my $dbdirs = getDbDir("."); +my $brand_ds = {{DS-BRAND}}; +$ENV{'PATH'} = '$prefix/usr/bin:$prefix/usr/lib:/usr/bin:/usr/lib'; +$ENV{'LD_LIBRARY_PATH'} = ':/usr/lib'; +$ENV{'SHLIB_PATH'} = ':/usr/lib';
for (my $i = 0; $i < @$dbdirs; $i++) { - # run ../bin/slapd/server/db_printlog -h <dbdir> for each <dbdir> + # run db_printlog -h <dbdir> for each <dbdir> print "Verify log files in $$dbdirs[$i] ... "; - open(PRINTLOG, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_printlog -h $$dbdirs[$i] 2>&1 1> $NULL |"); + open(PRINTLOG, "db_printlog -h $$dbdirs[$i] 2>&1 1> $NULL |"); sleep 1; my $haserr = 0; while ($l = <PRINTLOG>) @@ -154,7 +158,7 @@ { my $thisdb = $$dbdirs[$i] . "{{SEP}}" . $db; print "Verify $thisdb ... "; - open(DBVERIFY, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_verify $thisdb 2>&1 1> $NULL |"); + open(DBVERIFY, "db_verify $thisdb 2>&1 1> $NULL |"); sleep 1; my $haserr = 0; while ($l = <DBVERIFY>) @@ -195,7 +199,7 @@ { my $thisdb = $$instdirs[$j] . "{{SEP}}" . $db; print "Verify $thisdb ... "; - open(DBVERIFY, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_verify $thisdb 2>&1 1> $NULL |"); + open(DBVERIFY, "db_verify $thisdb 2>&1 1> $NULL |"); sleep 1; my $haserr = 0; while ($l = <DBVERIFY>)
389-commits@lists.fedoraproject.org