diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2016-01-21 12:21:58 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2018-10-05 12:09:45 +0200 |
commit | 53ed121a9c424e013f67ba090dfa5a3c6c1f19c3 (patch) | |
tree | e102fb53a24f3d530d53dd848a517d4bc9b33751 | |
parent | 5a1ebdec9dc74b0a4d21396c5348206c679da7a0 (diff) | |
download | libssh-53ed121a9c424e013f67ba090dfa5a3c6c1f19c3.tar.gz libssh-53ed121a9c424e013f67ba090dfa5a3c6c1f19c3.tar.xz libssh-53ed121a9c424e013f67ba090dfa5a3c6c1f19c3.zip |
torture: Add additional sftp-server path for BSD
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry-picked from commit 1bbfe058)
-rw-r--r-- | tests/torture.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/torture.c b/tests/torture.c index 3102d888..42b64495 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -788,10 +788,14 @@ static void torture_setup_create_sshd_config(void **state) sftp_server = "/usr/lib/ssh/sftp-server"; rc = lstat(sftp_server, &sb); if (rc < 0) { - sftp_server = "/usr/libexec/openssh/sftp-server"; + sftp_server = "/usr/libexec/sftp-server"; rc = lstat(sftp_server, &sb); if (rc < 0) { - sftp_server = getenv("TORTURE_SFTP_SERVER"); + sftp_server = "/usr/libexec/openssh/sftp-server"; + rc = lstat(sftp_server, &sb); + if (rc < 0) { + sftp_server = getenv("TORTURE_SFTP_SERVER"); + } } } assert_non_null(sftp_server); |