summaryrefslogtreecommitdiff
path: root/vio/viosslfactories.c
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-10-24 12:53:47 +0200
committermsvensson@neptunus.(none) <>2006-10-24 12:53:47 +0200
commit33a200d73dde609418d8096a4795694f5be885f5 (patch)
treef49940b1731e72b01cbe18792f3d50b5e749da6b /vio/viosslfactories.c
parent10f8cdef74e64759dad92dbd4327f8b9169e234e (diff)
parent6b920ebd84b167984cb765e1953a73fc9dd305ee (diff)
downloadmariadb-git-33a200d73dde609418d8096a4795694f5be885f5.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'vio/viosslfactories.c')
-rw-r--r--vio/viosslfactories.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index ca7a96d5801..bce70078b3e 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
}