X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Futil_attr.cpp;h=d3c99d311963d3d167974ab3e83410861beeea58;hb=9aab3038cc41b5f621d545df8302fdd7f957aa49;hp=acd7a8f745da7b52c71c7b20deedc271942ef703;hpb=4d93aaedd99c1dc4f6ecbc0588da12aa16904593;p=mech_eap.orig

diff --git a/mech_eap/util_attr.cpp b/mech_eap/util_attr.cpp
index acd7a8f..d3c99d3 100644
--- a/mech_eap/util_attr.cpp
+++ b/mech_eap/util_attr.cpp
@@ -43,8 +43,12 @@
 #include <new>
 
 /* lazy initialisation */
+#ifdef WIN32
+static volatile OM_uint32 gssEapAttrProvidersInitStatus = GSS_S_UNAVAILABLE;
+#else
 static GSSEAP_THREAD_ONCE gssEapAttrProvidersInitOnce = GSSEAP_ONCE_INITIALIZER;
 static OM_uint32 gssEapAttrProvidersInitStatus = GSS_S_UNAVAILABLE;
+#endif
 
 GSSEAP_ONCE_CALLBACK(gssEapAttrProvidersInitInternal)
 {
@@ -52,6 +56,8 @@ GSSEAP_ONCE_CALLBACK(gssEapAttrProvidersInitInternal)
 
     GSSEAP_ASSERT(gssEapAttrProvidersInitStatus == GSS_S_UNAVAILABLE);
 
+    json_set_alloc_funcs(GSSEAP_MALLOC, GSSEAP_FREE);
+
     major = gssEapRadiusAttrProviderInit(&minor);
     if (GSS_ERROR(major))
         goto cleanup;
@@ -72,7 +78,12 @@ cleanup:
     GSSEAP_ASSERT(major == GSS_S_COMPLETE);
 #endif
 
+#ifdef WIN32
+    InterlockedCompareExchangeRelease(&gssEapAttrProvidersInitStatus,
+                                      major, GSS_S_UNAVAILABLE);
+#else
     gssEapAttrProvidersInitStatus = major;
+#endif
 
     GSSEAP_ONCE_LEAVE;
 }
@@ -80,7 +91,12 @@ cleanup:
 static OM_uint32
 gssEapAttrProvidersInit(OM_uint32 *minor)
 {
+#ifdef WIN32
+    if (gssEapAttrProvidersInitStatus == GSS_S_UNAVAILABLE)
+        gssEapAttrProvidersInitInternal();
+#else
     GSSEAP_ONCE(&gssEapAttrProvidersInitOnce, gssEapAttrProvidersInitInternal);
+#endif
 
     if (GSS_ERROR(gssEapAttrProvidersInitStatus))
         *minor = GSSEAP_NO_ATTR_PROVIDERS;