session wrapper BUGFIX includes depend on SSH/TLS

Fixes #525

Author: Roytak

src/io.c

@@ -38,8 +38,13 @@
 #include "netconf.h"
 #include "session.h"
 #include "session_p.h"
+
+#ifdef NC_ENABLED_SSH_TLS
+
 #include "session_wrapper.h"
 
+#endif /* NC_ENABLED_SSH_TLS */
+
 const char *nc_msgtype2str[] = {
     "error",
     "would block",

src/server_config_util.c

@@ -29,8 +29,13 @@
 #include "log_p.h"
 #include "session.h"
 #include "session_p.h"
+
+#ifdef NC_ENABLED_SSH_TLS
+
 #include "session_wrapper.h"
 
+#endif /* NC_ENABLED_SSH_TLS */
+
 int
 nc_server_config_create(const struct ly_ctx *ctx, struct lyd_node **tree, const char *value, const char *path_fmt, ...)
 {

src/session.c

@@ -37,9 +37,10 @@
 
 #ifdef NC_ENABLED_SSH_TLS
 
+#include "session_wrapper.h"
+
 #include <curl/curl.h>
 #include <libssh/libssh.h>
-#include "session_wrapper.h"
 
 #endif /* NC_ENABLED_SSH_TLS */
 

src/session_p.h

@@ -30,8 +30,13 @@
 #include "session_client.h"
 #include "session_server.h"
 #include "session_server_ch.h"
+
+#ifdef NC_ENABLED_SSH_TLS
+
 #include "session_wrapper.h"
 
+#endif /* NC_ENABLED_SSH_TLS */
+
 extern struct nc_server_opts server_opts;
 
 /**

src/session_server.c

@@ -44,12 +44,15 @@
 #include "session_p.h"
 #include "session_server.h"
 #include "session_server_ch.h"
-#include "session_wrapper.h"
 
 #ifdef NC_ENABLED_SSH_TLS
+
+#include "session_wrapper.h"
+
 #include <curl/curl.h>
 #include <libssh/libssh.h>
-#endif
+
+#endif /* NC_ENABLED_SSH_TLS */
 
 struct nc_server_opts server_opts = {
     .hello_lock = PTHREAD_RWLOCK_INITIALIZER,

src/session_wrapper.h

@@ -267,8 +267,6 @@ void nc_tls_sans_destroy_wrap(void *sans);
  */
 int nc_tls_get_num_sans_wrap(void *sans);
 
-#ifdef NC_ENABLED_SSH_TLS
-
 /**
  * @brief Get the SAN value and type in the context of CTN.
  *
@@ -280,8 +278,6 @@ int nc_tls_get_num_sans_wrap(void *sans);
  */
 int nc_tls_get_san_value_type_wrap(void *sans, int idx, char **san_value, NC_TLS_CTN_MAPTYPE *san_type);
 
-#endif
-
 /**
  * @brief Get the number of certificates in a certificate chain.
  *