Add code to interface OpenSSL to new Win32 pthreads code which

     used a structure for thread_t.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7356 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/openssl.c b/bacula/src/lib/openssl.c
index af4a46fb5821113791fc96738cfcc357ea736e3c..7276e9d8d6110e6424842f71b28c9f0179552d85 100644 (file)
--- a/bacula/src/lib/openssl.c
+++ b/bacula/src/lib/openssl.c
@@ -94,13 +94,17 @@ void openssl_post_errors(JCR *jcr, int code, const char *errstring)
  */
 static unsigned long get_openssl_thread_id(void)
 {
-   /* Comparison without use of pthread_equal() is mandated by the OpenSSL API */
+#ifdef HAVE_WIN32
+   return (unsigned long)getpid();
+#else
    /*
-    * Note that this creates problems with the new Win32 pthreads
-    *   emulation code, which defines pthread_t as a structure. For
-    *   this reason, we continue to use a very old implementation.
+    * Comparison without use of pthread_equal() is mandated by the OpenSSL API */
+    *
+    * Note: this creates problems with the new Win32 pthreads
+    *   emulation code, which defines pthread_t as a structure.
     */
    return ((unsigned long)pthread_self());
+#endif
 }
 
 /*

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 1436c9ece5f14adfef0b9be844c3e4b3657809a6..302f6ded48088047ca493ffab1f91e4796392d3c 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -30,6 +30,9 @@ vtape driver
 
 
 General:
+12Jul08
+kes  Add code to interface OpenSSL to new Win32 pthreads code which
+     used a structure for thread_t.
 09Jul08
 ebl  tweak bat for win32 compilation
 08Jul08