When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped

vio/viossl.c:
  No need for special code to switch from WinSock to BSD sockets when using yaSSL
vio/viosslfactories.c:
  The OpenSSL port to NetWare has added some extra functions to free up memory, no need
  to call them when using yaSSL

2 files changed, 9 insertions, 0 deletions

diff --git a/vio/viossl.c b/vio/viossl.c
index 9cc4523d32e..b5fd0e11c02 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -26,6 +26,10 @@
 #ifdef HAVE_OPENSSL
 
 #ifdef __NETWARE__
+
+/* yaSSL already uses BSD sockets */
+#ifndef HAVE_YASSL
+
 /*
   The default OpenSSL implementation on NetWare uses WinSock.
   This code allows us to use the BSD sockets.
@@ -47,6 +51,7 @@ static int SSL_set_fd_bsd(SSL *s, int fd)
 
 #define SSL_set_fd(A, B)  SSL_set_fd_bsd((A), (B))
 
+#endif /* HAVE_YASSL */
 #endif /* __NETWARE__ */
 
 
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 2c528e9a2fc..9fd18579351 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -180,11 +180,15 @@ void netware_ssl_cleanup()
   /* free memory from SSL_library_init() */
   EVP_cleanup();
 
+/* OpenSSL NetWare port specific functions */
+#ifndef HAVE_YASSL
+
   /* free global X509 method */
   X509_STORE_method_cleanup();
 
   /* free the thread_hash error table */
   ERR_free_state_table();
+#endif
 }