torture: Add additional sftp-server path for BSD

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

(cherry-picked from commit 1bbfe058)
This commit is contained in:
Andreas Schneider
2016-01-21 12:21:58 +01:00
parent 5a1ebdec9d
commit 53ed121a9c

View File

@@ -787,6 +787,9 @@ static void torture_setup_create_sshd_config(void **state)
sftp_server = "/usr/lib/ssh/sftp-server"; sftp_server = "/usr/lib/ssh/sftp-server";
rc = lstat(sftp_server, &sb); rc = lstat(sftp_server, &sb);
if (rc < 0) {
sftp_server = "/usr/libexec/sftp-server";
rc = lstat(sftp_server, &sb);
if (rc < 0) { if (rc < 0) {
sftp_server = "/usr/libexec/openssh/sftp-server"; sftp_server = "/usr/libexec/openssh/sftp-server";
rc = lstat(sftp_server, &sb); rc = lstat(sftp_server, &sb);
@@ -794,6 +797,7 @@ static void torture_setup_create_sshd_config(void **state)
sftp_server = getenv("TORTURE_SFTP_SERVER"); sftp_server = getenv("TORTURE_SFTP_SERVER");
} }
} }
}
assert_non_null(sftp_server); assert_non_null(sftp_server);
snprintf(sshd_config, sizeof(sshd_config), snprintf(sshd_config, sizeof(sshd_config),