tests: use detected sshd path

The static sshd directory wasn't matching the detected sshd and prevented the testcases to be run against local OpenSSH builts

Signed-off-by: Aris Adamantiadis <aris@0xbadc0de.be>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 1089948346)

tests/CMakeLists.txt

@@ -105,23 +105,23 @@ if (SSH_EXECUTABLE)
 
 endif()
 
+find_program(SSHD_EXECUTABLE
+             NAME
+                sshd
+             PATHS
+                /sbin
+                /usr/sbin
+                /usr/local/sbin)
+
 if (CLIENT_TESTING OR SERVER_TESTING)
     find_package(socket_wrapper 1.1.5 REQUIRED)
     find_package(nss_wrapper 1.1.2 REQUIRED)
     find_package(uid_wrapper 1.2.0 REQUIRED)
     find_package(pam_wrapper 1.0.1 REQUIRED)
 
-    find_program(SSHD_EXECUTABLE
-                 NAME
-                    sshd
-                 PATHS
-                    /sbin
-                    /usr/sbin
-                    /usr/local/sbin)
     if (NOT SSHD_EXECUTABLE)
         message(SEND_ERROR "Could not find sshd which is required for client testing")
     endif()
-
     find_program(NC_EXECUTABLE
                  NAME
                     nc

tests/tests_config.h.cmake

@@ -65,3 +65,4 @@
 /* Available programs */
 
 #cmakedefine NC_EXECUTABLE "${NC_EXECUTABLE}"
+#cmakedefine SSHD_EXECUTABLE "${SSHD_EXECUTABLE}"

tests/torture.c

@@ -845,7 +845,7 @@ void torture_setup_sshd_server(void **state, bool pam)
     s = *state;
 
     snprintf(sshd_start_cmd, sizeof(sshd_start_cmd),
-             "/usr/sbin/sshd -r -f %s -E %s/sshd/daemon.log 2> %s/sshd/cwrap.log",
+             SSHD_EXECUTABLE " -r -f %s -E %s/sshd/daemon.log 2> %s/sshd/cwrap.log",
              s->srv_config, s->socket_dir, s->socket_dir);
 
     rc = system(sshd_start_cmd);