X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_restore;h=27d4c946eefe4ac76efce9bbcea940ff3bc9b6b4;hp=7746a361110cdeb2f376c3cb0ca8950c0419c401;hb=9175f9157f0d54b50ebf11d2036c20f50ffc6d9d;hpb=0697368bbcef14908cd4684cf07744dc840464de diff --git a/bin/BackupPC_restore b/bin/BackupPC_restore index 7746a36..27d4c94 100755 --- a/bin/BackupPC_restore +++ b/bin/BackupPC_restore @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.0_CVS, released 18 Jan 2003. +# Version 2.0.0_CVS, released 3 Feb 2003. # # See http://backuppc.sourceforge.net. # @@ -417,7 +417,8 @@ exit(RestoreCleanup($client)); sub CorrectHostCheck { my($hostIP, $host) = @_; - return if ( $hostIP eq $host && !$Conf{FixedIPNetBiosNameCheck} ); + return if ( $hostIP eq $host && !$Conf{FixedIPNetBiosNameCheck} + || $Conf{NmbLookupCmd} eq "" ); my($netBiosHost, $netBiosUser) = $bpc->NetBiosInfoGet($hostIP); return "host $host has mismatching netbios name $netBiosHost" if ( $netBiosHost ne $host ); @@ -565,6 +566,7 @@ sub UserCommandRun hostIP => $hostIP, share => $RestoreReq{shareDest}, XferMethod => $Conf{XferMethod}, + sshPath => $Conf{SshPath}, LOG => *LOG, XferLOG => $RestoreLOG, stat => \%stat,