aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2016-05-02 13:33:28 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-10-05 12:09:45 +0200
commit8520adf6093a798204037e8573330290e9e54d72 (patch)
tree38033ad35c768214f1be62cfa79423062d6c0264
parentc0be59f876adb3e7fc2a7838ddc182dcc391a293 (diff)
downloadlibssh-8520adf6093a798204037e8573330290e9e54d72.tar.gz
libssh-8520adf6093a798204037e8573330290e9e54d72.tar.xz
libssh-8520adf6093a798204037e8573330290e9e54d72.zip
osx: fix compilation
(cherry-picked from commit 886fdc8b)
-rw-r--r--tests/torture.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/torture.c b/tests/torture.c
index c58e3055..6df20a9a 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -805,7 +805,11 @@ static void torture_setup_create_sshd_config(void **state)
}
assert_non_null(sftp_server);
- snprintf(sshd_config, sizeof(sshd_config),
+#ifndef OPENSSH_VERSION_MAJOR
+#define OPENSSH_VERSION_MAJOR 7U
+#define OPENSSH_VERSION_MINOR 0U
+#endif
+ const char config_string[]=
"Port 22\n"
"ListenAddress 127.0.0.10\n"
"HostKey %s\n"
@@ -845,7 +849,9 @@ static void torture_setup_create_sshd_config(void **state)
"AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n"
"AcceptEnv LC_IDENTIFICATION LC_ALL LC_LIBSSH\n"
"\n"
- "PidFile %s\n",
+ "PidFile %s\n";
+ snprintf(sshd_config, sizeof(sshd_config),
+ config_string,
dsa_hostkey,
rsa_hostkey,
ecdsa_hostkey,