moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

sshserver.pl: clarify and streamline variable names

This commit is contained in:
Marc Hoersken 2014-12-22 00:30:02 +01:00
parent 03e206d18a
commit 003dd2e7de
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/sshserver.pl
View File

@ -89,6 +89,7 @@ my $path = getcwd(); # current working directory
my $logdir = $path .'/log'; # directory for log files my $logdir = $path .'/log'; # directory for log files
my $username = $ENV{USER}; # default user my $username = $ENV{USER}; # default user
my $pidfile; # ssh daemon pid file my $pidfile; # ssh daemon pid file
my $identity = 'curl_client_key'; # default identity file
my $error; my $error;
my @cfgarr; my @cfgarr;
@ -758,13 +759,13 @@ if((! -e $knownhosts) || (! -s $knownhosts)) {
#*************************************************************************** #***************************************************************************
# Convert paths for curl's tests running on Windows using Cygwin OpenSSH # Convert paths for curl's tests running on Windows using Cygwin OpenSSH
# #
my $identityf = abs_path("$path/curl_client_key"); my $identity_config = abs_path("$path/$identity");
my $knownhostsf = abs_path("$path/$knownhosts"); my $knownhosts_config = abs_path("$path/$knownhosts");
if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') { if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') {
# convert MinGW drive paths to Cygwin drive paths # convert MinGW drive paths to Cygwin drive paths
$identityf =~ s/^\/(\w)\//\/cygdrive\/$1\//; $identity_config =~ s/^\/(\w)\//\/cygdrive\/$1\//;
$knownhostsf =~ s/^\/(\w)\//\/cygdrive\/$1\//; $knownhosts_config =~ s/^\/(\w)\//\/cygdrive\/$1\//;
} }
@ -864,8 +865,8 @@ push @cfgarr, '#';
push @cfgarr, "BindAddress $listenaddr"; push @cfgarr, "BindAddress $listenaddr";
push @cfgarr, "DynamicForward $socksport"; push @cfgarr, "DynamicForward $socksport";
push @cfgarr, '#'; push @cfgarr, '#';
push @cfgarr, "IdentityFile $identityf"; push @cfgarr, "IdentityFile $identity_config";
push @cfgarr, "UserKnownHostsFile $knownhostsf"; push @cfgarr, "UserKnownHostsFile $knownhosts_config";
push @cfgarr, '#'; push @cfgarr, '#';
push @cfgarr, 'BatchMode yes'; push @cfgarr, 'BatchMode yes';
push @cfgarr, 'ChallengeResponseAuthentication no'; push @cfgarr, 'ChallengeResponseAuthentication no';