* removed Host_or_User_name from lang files

* udpated configure.pl

diff --git a/ChangeLog b/ChangeLog
index 4f9edef..5eca062 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
 # Version __VERSION__, __RELEASEDATE__
 #------------------------------------------------------------------------
 
+* Replace PingClientPath with PingPath in configure.pl.
+
 * GFK updated fr.pm from en.pm.
 
 * Various tweaks to recent changes, including additional patches

diff --git a/configure.pl b/configure.pl
index 8c9c361..0ca5862 100755 (executable)
--- 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;
            }

diff --git a/lib/BackupPC/Lang/de.pm b/lib/BackupPC/Lang/de.pm
index f1d17f2..5ae2a03 100644 (file)
--- a/lib/BackupPC/Lang/de.pm
+++ b/lib/BackupPC/Lang/de.pm
@@ -790,7 +790,7 @@ $Lang{Hosts_file} = "Hosts Datei";
 $Lang{Current_queues} = "Warteschlangen";
 $Lang{Documentation} = "Dokumentation";
 
-$Lang{Host_or_User_name} = "<small>Computer oder User Name:</small>";
+#$Lang{Host_or_User_name} = "<small>Computer oder User Name:</small>";
 $Lang{Go} = "gehe zu";
 $Lang{Hosts} = "Computer";
 

diff --git a/lib/BackupPC/Lang/en.pm b/lib/BackupPC/Lang/en.pm
index 7a38167..ff82605 100644 (file)
--- a/lib/BackupPC/Lang/en.pm
+++ b/lib/BackupPC/Lang/en.pm
@@ -987,7 +987,7 @@ $Lang{Hosts_file} = "Hosts file";
 $Lang{Current_queues} = "Current queues";
 $Lang{Documentation} = "Documentation";
 
-$Lang{Host_or_User_name} = "<small>Host or User name:</small>";
+#$Lang{Host_or_User_name} = "<small>Host or User name:</small>";
 $Lang{Go} = "Go";
 $Lang{Hosts} = "Hosts";
 

diff --git a/lib/BackupPC/Lang/es.pm b/lib/BackupPC/Lang/es.pm
index 8a66930..b0aace2 100644 (file)
--- a/lib/BackupPC/Lang/es.pm
+++ b/lib/BackupPC/Lang/es.pm
@@ -790,7 +790,7 @@ $Lang{Hosts_file} = "Archivo Hosts";
 $Lang{Current_queues} = "Colas actuales";
 $Lang{Documentation} = "Documentación";
 
-$Lang{Host_or_User_name} = "<small>Host o usuario:</small>";
+#$Lang{Host_or_User_name} = "<small>Host o usuario:</small>";
 $Lang{Go} = "Aceptar";
 $Lang{Hosts} = "Hosts";
 

diff --git a/lib/BackupPC/Lang/fr.pm b/lib/BackupPC/Lang/fr.pm
index f81c6f2..268faa6 100644 (file)
--- a/lib/BackupPC/Lang/fr.pm
+++ b/lib/BackupPC/Lang/fr.pm
@@ -986,7 +986,7 @@ $Lang{Hosts_file} = "Fichiers des h
 $Lang{Current_queues} = "Files actuelles";
 $Lang{Documentation} = "Documentation";
 
-$Lang{Host_or_User_name} = "<small>Hôte ou Nom d\'utilisateur:</small>";
+#$Lang{Host_or_User_name} = "<small>Hôte ou Nom d\'utilisateur:</small>";
 $Lang{Go} = "Chercher";
 $Lang{Hosts} = "Hôtes";