CDRIVER-547 fix sasl concurrency

(cherry picked from commit cd5c234)

Conflicts:
	build/cmake/FindSASL2.cmake

Author: ajdavis

build/autotools/CheckSasl.m4

@@ -42,6 +42,18 @@ AC_SUBST(SASL_LIBS)
 dnl Let mongoc-config.h.in know about SASL status.
 if test "$sasl_mode" != "no" ; then
   AC_SUBST(MONGOC_ENABLE_SASL, 1)
+  
+  AC_MSG_CHECKING([for sasl_client_done])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sasl/sasl.h>]],
+                                  [[sasl_client_done ();]])],
+                 [AC_MSG_RESULT(yes)
+                  have_sasl_client_done=yes],
+                 [AC_MSG_RESULT(no)
+                  have_sasl_client_done=no])
+  AS_IF([test "$have_sasl_client_done" = "yes"],
+        [AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)],
+        [AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)])
+
 else
   AC_SUBST(MONGOC_ENABLE_SASL, 0)
 fi

src/mongoc/mongoc-init.c

@@ -26,6 +26,61 @@
 # include "mongoc-ssl-private.h"
 #endif
 #include "mongoc-thread-private.h"
+#include "mongoc-trace.h"
+
+
+#ifdef MONGOC_ENABLE_SASL
+#include <sasl/sasl.h>
+
+static void *
+mongoc_sasl_mutex_alloc (void)
+{
+   mongoc_mutex_t *mutex;
+
+   ENTRY;
+
+   mutex = bson_malloc0 (sizeof (mongoc_mutex_t));
+   mongoc_mutex_init (mutex);
+
+   RETURN((void *) mutex);
+}
+
+
+static int
+mongoc_sasl_mutex_lock (void *mutex)
+{
+   ENTRY;
+
+   mongoc_mutex_lock ((mongoc_mutex_t *) mutex);
+
+   RETURN(SASL_OK);
+}
+
+
+static int
+mongoc_sasl_mutex_unlock (void *mutex)
+{
+   ENTRY;
+
+   mongoc_mutex_unlock ((mongoc_mutex_t *) mutex);
+
+   RETURN(SASL_OK);
+}
+
+
+static void
+mongoc_sasl_mutex_free (void *mutex)
+{
+   ENTRY;
+
+   mongoc_mutex_destroy ((mongoc_mutex_t *) mutex);
+   bson_free (mutex);
+
+   EXIT;
+}
+
+#endif//MONGOC_ENABLE_SASL
+
 
 static MONGOC_ONCE_FUN( _mongoc_do_init)
 {
@@ -34,6 +89,16 @@ static MONGOC_ONCE_FUN( _mongoc_do_init)
    _mongoc_scram_startup();
 #endif
 
+#ifdef MONGOC_ENABLE_SASL
+   sasl_set_mutex (mongoc_sasl_mutex_alloc,
+                   mongoc_sasl_mutex_lock,
+                   mongoc_sasl_mutex_unlock,
+                   mongoc_sasl_mutex_free);
+
+   /* TODO: logging callback? */
+   sasl_client_init (NULL);
+#endif
+
    _mongoc_counters_init();
 
 #ifdef _WIN32
@@ -70,6 +135,11 @@ static MONGOC_ONCE_FUN( _mongoc_do_cleanup)
    _mongoc_ssl_cleanup();
 #endif
 
+   /* apple's libsasl package somehow lacks sasl_client_done before 2.1.24 */
+#if MONGOC_HAVE_SASL_CLIENT_DONE
+      sasl_client_done ();
+#endif
+
 #ifdef _WIN32
    WSACleanup ();
 #endif

src/mongoc/mongoc-sasl.c

@@ -151,8 +151,6 @@ _mongoc_sasl_init (mongoc_sasl_t *sasl)
    sasl->service_name = NULL;
    sasl->service_host = NULL;
    sasl->interact = NULL;
-
-   sasl_client_init (sasl->callbacks);
 }
 
 
@@ -170,13 +168,6 @@ _mongoc_sasl_destroy (mongoc_sasl_t *sasl)
    free (sasl->mechanism);
    free (sasl->service_name);
    free (sasl->service_host);
-
-#if (SASL_VERSION_MAJOR >= 2) && \
-    (SASL_VERSION_MINOR >= 1) && \
-    (SASL_VERSION_STEP >= 24) && \
-    (!defined(__APPLE__))
-   sasl_client_done ();
-#endif
 }