X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=configure.pl;h=0ca58624203387a5a5dcfa416355ed34d5ed9c14;hp=8c9c3610cf441defbbdb82f0767dbbe7beeed594;hb=72b87b178ae8dcc10f1ae0f441d13e30d5f1ecf1;hpb=87ebd8c2a7b8b43ced46fee203347afe1fe0b1b8;ds=sidebyside

diff --git a/configure.pl b/configure.pl
index 8c9c361..0ca5862 100755
--- a/configure.pl
+++ b/configure.pl
@@ -121,21 +121,21 @@ EOF
 # These are the programs whose paths we need to find
 #
 my %Programs = (
-    perl       => "PerlPath",
-    'gtar/tar' => "TarClientPath",
-    smbclient  => "SmbClientPath",
-    nmblookup  => "NmbLookupPath",
-    rsync      => "RsyncClientPath",
-    ping       => "PingPath",
-    df         => "DfPath",
-    'ssh/ssh2' => "SshPath",
-    sendmail   => "SendmailPath",
-    hostname   => "HostnamePath",
-    split      => "SplitPath",
+    perl           => "PerlPath",
+    'gtar/tar'     => "TarClientPath",
+    smbclient      => "SmbClientPath",
+    nmblookup      => "NmbLookupPath",
+    rsync          => "RsyncClientPath",
+    ping           => "PingPath",
+    df             => "DfPath",
+    'ssh/ssh2'     => "SshPath",
+    sendmail       => "SendmailPath",
+    hostname       => "HostnamePath",
+    split          => "SplitPath",
     'parchive/par' => "ParPath",
-    cat        => "CatPath",
-    gzip       => "GzipPath",
-    bzip2      => "Bzip2Path",
+    cat            => "CatPath",
+    gzip           => "GzipPath",
+    bzip2          => "Bzip2Path",
 );
 
 foreach my $prog ( sort(keys(%Programs)) ) {
@@ -545,7 +545,7 @@ if ( defined($Conf{PingArgs}) ) {
     if ( $^O eq "solaris" || $^O eq "sunos" ) {
 	$Conf{PingCmd} = '$pingPath -s $host 56 1';
     } elsif ( ($^O eq "linux" || $^O eq "openbsd" || $^O eq "netbsd")
-	    && !system("$Conf{PingClientPath} -c 1 -w 3 localhost") ) {
+	    && !system("$Conf{PingPath} -c 1 -w 3 localhost") ) {
 	$Conf{PingCmd} = '$pingPath -c 1 -w 3 $host';
     } else {
 	$Conf{PingCmd} = '$pingPath -c 1 $host';
@@ -690,18 +690,10 @@ sub InstallFile
 	    s/__BACKUPPCUSER__/$Conf{BackupPCUser}/g;
 	    s/__CGIDIR__/$Conf{CgiDir}/g;
 	    if ( $first && /^#.*bin\/perl/ ) {
-		if ( $Perl56 ) {
-		    #
-		    # perl56 and later is taint ok
-		    #
-		    print OUT "#!$Conf{PerlPath} -T\n";
-		} else {
-		    #
-		    # prior to perl56, File::Find fails taint checks,
-		    # so we run without -T.  It's still safe.
-		    #
-		    print OUT "#!$Conf{PerlPath}\n";
-		}
+		#
+		# Fill in correct path to perl (no taint for >= 2.1.0).
+		#
+		print OUT "#!$Conf{PerlPath}\n";
 	    } else {
 		print OUT;
 	    }