summaryrefslogtreecommitdiff
path: root/vio/viossl.c
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-10-24 10:43:15 +0200
committerunknown <msvensson@neptunus.(none)>2006-10-24 10:43:15 +0200
commit0b381c94cb262958fa672f00c308099b227c1fbe (patch)
treef7a9ec9c2a287fb94393b645600fdabe98f67519 /vio/viossl.c
parent394b27b6b415f0042829d99ba6557e3c5db6e601 (diff)
downloadmariadb-git-0b381c94cb262958fa672f00c308099b227c1fbe.tar.gz
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
Diffstat (limited to 'vio/viossl.c')
-rw-r--r--vio/viossl.c5
1 files changed, 5 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__ */