Fix the client-only and server-only builds

configure.ac

@@ -406,6 +406,8 @@ AC_CONFIG_LINKS([keys/gretel-key-rsa.pub:keys/gretel-key-rsa.pub
                  keys/fred-key.der:keys/fred-key.der])
 
 # Set the automake conditionals.
+AM_CONDITIONAL([BUILD_SERVER],[test "x$ENABLED_SERVER" = "xyes"])
+AM_CONDITIONAL([BUILD_CLIENT],[test "x$ENABLED_CLIENT" = "xyes"])
 AM_CONDITIONAL([BUILD_EXAMPLE_SERVERS],[test "x$ENABLED_EXAMPLES" = "xyes"])
 AM_CONDITIONAL([BUILD_EXAMPLE_CLIENTS],[test "x$ENABLED_EXAMPLES" = "xyes"])
 AM_CONDITIONAL([BUILD_INLINE],[test "x$ENABLED_INLINE" = "xyes"])

scripts/include.am

@@ -2,6 +2,11 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+# Every script here starts examples/echoserver and drives a client example
+# against it, so all of them need both halves of the library.
+if BUILD_SERVER
+if BUILD_CLIENT
+
 if BUILD_SFTP
 dist_noinst_SCRIPTS+= scripts/sftp.test
 dist_noinst_SCRIPTS+= scripts/get-put.test
@@ -16,5 +21,10 @@ endif
 dist_noinst_SCRIPTS+= scripts/sshclient.test
 
 dist_noinst_SCRIPTS+= scripts/fwd.test
-EXTRA_DIST += scripts/fwd.test.expect
 dist_noinst_SCRIPTS+= scripts/fwd-bulk.test
+endif
+endif
+
+# Distributed whatever the build enables, so the tarball carries it for the
+# builds that do run scripts/fwd.test.
+EXTRA_DIST += scripts/fwd.test.expect

src/ssh.c

@@ -6017,8 +6017,9 @@ void* wolfSSH_GetChannelCloseCtx(WOLFSSH* ssh)
 }
 
 
-#if (defined(WOLFSSH_SFTP) || defined(WOLFSSH_SCP)) && \
-    !defined(NO_WOLFSSH_SERVER)
+/* Not server-only: wolfSSH_SFTP_SetDefaultPath() reaches this through
+ * CanonicalizePath(), and the SFTP client calls that setter. */
+#if defined(WOLFSSH_SFTP) || defined(WOLFSSH_SCP)
 
 /*
  * Paths starting with a slash are absolute, rooted at "/". Any path that

tests/include.am

@@ -2,9 +2,17 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-check_PROGRAMS  += tests/unit.test tests/api.test \
-                   tests/testsuite.test tests/kex.test \
-                   tests/regress.test
+# unit.test and regress.test drive the library alone and gate their per-side
+# cases internally. The rest link examples/echoserver, examples/client, or
+# both, so they only exist when the matching half of the library was built.
+check_PROGRAMS  += tests/unit.test tests/regress.test
+
+if BUILD_SERVER
+check_PROGRAMS  += tests/api.test
+if BUILD_CLIENT
+check_PROGRAMS  += tests/testsuite.test tests/kex.test
+endif
+endif
 
 tests_unit_test_SOURCES      = tests/unit.c tests/unit.h
 tests_unit_test_CPPFLAGS     = -DNO_MAIN_DRIVER -DWOLFSSH_TEST_INTERNAL $(AM_CPPFLAGS)
@@ -29,7 +37,10 @@ tests_testsuite_test_CPPFLAGS = -DNO_MAIN_DRIVER $(AM_CPPFLAGS)
 tests_testsuite_test_LDADD   = src/libwolfssh.la
 tests_testsuite_test_DEPENDENCIES = src/libwolfssh.la
 
+# auth.c drives both wolfSSH_accept() and wolfSSH_connect().
 if BUILD_KEYBOARD_INTERACTIVE
+if BUILD_SERVER
+if BUILD_CLIENT
 check_PROGRAMS              += tests/auth.test
 tests_auth_test_SOURCES      = tests/auth.c tests/auth.h \
                                examples/client/common.c \
@@ -38,6 +49,8 @@ tests_auth_test_CPPFLAGS     = -DNO_MAIN_DRIVER $(AM_CPPFLAGS)
 tests_auth_test_LDADD        = src/libwolfssh.la
 tests_auth_test_DEPENDENCIES = src/libwolfssh.la
 endif
+endif
+endif
 
 tests_kex_test_SOURCES = tests/kex.c tests/kex.h \
                                examples/echoserver/echoserver.c \