osx: fix compilation

This commit is contained in:
Aris Adamantiadis
2016-05-02 13:33:28 +02:00
parent 33ecaaac01
commit 886fdc8bc2

View File

@@ -924,7 +924,11 @@ static void torture_setup_create_sshd_config(void **state)
} }
assert_non_null(sftp_server); 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" "Port 22\n"
"ListenAddress 127.0.0.10\n" "ListenAddress 127.0.0.10\n"
"HostKey %s\n" "HostKey %s\n"
@@ -966,7 +970,9 @@ static void torture_setup_create_sshd_config(void **state)
"AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n" "AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT\n"
"AcceptEnv LC_IDENTIFICATION LC_ALL LC_LIBSSH\n" "AcceptEnv LC_IDENTIFICATION LC_ALL LC_LIBSSH\n"
"\n" "\n"
"PidFile %s\n", "PidFile %s\n";
snprintf(sshd_config, sizeof(sshd_config),
config_string,
dsa_hostkey, dsa_hostkey,
rsa_hostkey, rsa_hostkey,
ecdsa_hostkey, ecdsa_hostkey,