Commit 437848d7 authored by Yang Tse's avatar Yang Tse
Browse files

test harness: fix detection of test harness client knownhosts file 

Regenerate curl's tests client knownhosts file also when, somehow,
this file is empty.
parent 38fff918

tests/sshserver.pl

+3 −2
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
#                            | (__| |_| |  _ <| |___

#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#                             \___|\___/|_| \_\_____|

#

#

# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

#

#

# This software is licensed as described in the file COPYING, which

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms

# 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

# 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);

    logmsg 'generating ssh client known hosts file...' if($verbose);

    unlink($knownhosts);

    if(open(DSAKEYFILE, "<$hstpubkeyf")) {

    if(open(DSAKEYFILE, "<$hstpubkeyf")) {

        my @dsahostkey = do { local $/ = ' '; <DSAKEYFILE> };

        my @dsahostkey = do { local $/ = ' '; <DSAKEYFILE> };

        if(close(DSAKEYFILE)) {

        if(close(DSAKEYFILE)) {