moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

test harness: fix detection of test harness client knownhosts file

Browse Source 
Regenerate curl's tests client knownhosts file also when, somehow,
this file is empty.
This commit is contained in:
Yang Tse 2011-08-31 19:59:26 +02:00
parent 38fff918f9
commit 437848d754
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/sshserver.pl
View File

@ -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)) {