From 437848d75443aa1a189cb81dfaaad9f19d0cc60b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 31 Aug 2011 19:59:26 +0200 Subject: test harness: fix detection of test harness client knownhosts file Regenerate curl's tests client knownhosts file also when, somehow, this file is empty. --- tests/sshserver.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 5fda35fa5..8bb8bcdcf 100755 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -708,8 +708,9 @@ if(system "$sshd -t -f $sshdconfig > $sshdlog 2>&1") { #*************************************************************************** # Generate ssh client host key database file for curl's tests # -if(! -e $knownhosts) { +if((! -e $knownhosts) || (! -s $knownhosts)) { logmsg 'generating ssh client known hosts file...' if($verbose); + unlink($knownhosts); if(open(DSAKEYFILE, "<$hstpubkeyf")) { my @dsahostkey = do { local $/ = ' '; }; if(close(DSAKEYFILE)) { -- cgit v1.2.3