aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2016-01-21 12:21:58 +0100
committerAndreas Schneider <asn@cryptomilk.org>2016-01-21 12:21:58 +0100
commit1bbfe058f935a8b15d88830b1043f2802dae6338 (patch)
tree77e1a0ee1929059d91b68315901159bd7bd58df5 /tests
parent02d9b05f543ba4d2278a8bd0df81c04f993ae1d1 (diff)
downloadlibssh-1bbfe058f935a8b15d88830b1043f2802dae6338.tar.gz
libssh-1bbfe058f935a8b15d88830b1043f2802dae6338.tar.xz
libssh-1bbfe058f935a8b15d88830b1043f2802dae6338.zip
torture: Add additional sftp-server path for BSD
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/torture.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/torture.c b/tests/torture.c
index f1daaf21..e89cdec2 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -891,10 +891,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);