don't release TLS data in DLL_PROCESS_DETACH

[moonshot.git] / moonshot / mech_eap / util_tld.c

diff --git a/moonshot/mech_eap/util_tld.c b/moonshot/mech_eap/util_tld.c
index 38e6a10..a30f5f3 100644 (file)
--- a/moonshot/mech_eap/util_tld.c
+++ b/moonshot/mech_eap/util_tld.c
@@ -31,7 +31,8 @@
  */
 
 /*
- * Thread local data abstraction.
+ * Thread local data abstraction, using pthreads on Unix and the TlsXXX
+ * APIs on Windows.
  */
 
 #include "gssapiP_eap.h"
@@ -50,7 +51,7 @@ destroyThreadLocalData(struct gss_eap_thread_local_data *tld)
 #ifdef WIN32
 
 /*
- * This is the tls index returned by TlsAlloc() on process init.
+ * This is the TLS index returned by TlsAlloc() on process init.
  * Each thread, on thread attach in DllMain(), allocates its thread-local
  * data and uses this index with TlsSetValue() to store it.
  * It can then subsequently be retrieved with TlsGetValue().
@@ -70,10 +71,15 @@ DllMain(HINSTANCE hDLL,     /* DLL module handle */
         LPVOID reserved)    /* reserved */
 {
     struct gss_eap_thread_local_data *tlsData;
+    OM_uint32 major, minor;
 
     switch (reason) {
         case DLL_PROCESS_ATTACH:
             /* Allocate a TLS index. */
+            major = gssEapInitiatorInit(&minor);
+            if (GSS_ERROR(major))
+                return FALSE;
+
             tlsIndex = TlsAlloc();
             if (tlsIndex == TLS_OUT_OF_INDEXES)
                 return FALSE;
@@ -93,12 +99,9 @@ DllMain(HINSTANCE hDLL,     /* DLL module handle */
             }
             break;
         case DLL_PROCESS_DETACH:
-            /* Release the allocated memory for this thread. */
-            tlsData = TlsGetValue(tlsIndex);
-            if (tlsData != NULL)
-                destroyThreadLocalData(tlsData);
             /* Release the TLS index. */
             TlsFree(tlsIndex);
+            gssEapFinalize();
             break;
         default:
             break;
@@ -149,4 +152,5 @@ gssEapGetThreadLocalData()
 
     return tld;
 }
+
 #endif /* WIN32 */