From 003dd2e7de18a945dc4b91fd28d19e595ee31cd0 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Mon, 22 Dec 2014 00:30:02 +0100
Subject: sshserver.pl: clarify and streamline variable names

---
 tests/sshserver.pl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tests')

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