Bug #33144829: ASAN FAILURE IN AUTH_LDAP_KERBEROS_GLOBAL

Post-push fix: Fix for EL6 build

Change-Id: I9700aca9601a1486efd75daf73a6ccfe1bd2b818

Author: harinvadodaria

cmake/sasl.cmake

@@ -91,6 +91,15 @@ MACRO(FIND_SASL_VERSION)
       "${SASL_VERSION_MAJOR}.${SASL_VERSION_MINOR}.${SASL_VERSION_STEP}")
     SET(SASL_VERSION "${SASL_VERSION}" CACHE INTERNAL "SASL major.minor.step")
     MESSAGE(STATUS "SASL_VERSION (${WITH_SASL}) is ${SASL_VERSION}")
+
+    FILE(READ "${SASL_INCLUDE_DIR}/sasl/sasl.h" SASL_HEADER_TEXT)
+    STRING(FIND "${SASL_HEADER_TEXT}" "LIBSASL_API int sasl_client_done"
+           HAVE_SASL_CLIENT_DONE)
+    IF(${HAVE_SASL_CLIENT_DONE} EQUAL -1)
+      SET(SASL_CLIENT_DONE_SUPPORTED 0)
+    ELSE()
+      SET(SASL_CLIENT_DONE_SUPPORTED 1)
+    ENDIF()
   ENDIF()
 ENDMACRO()
 

config.h.cmake

@@ -360,4 +360,7 @@
 /* ARM crc32 support */
 #cmakedefine HAVE_ARMV8_CRC32_INTRINSIC @HAVE_ARMV8_CRC32_INTRINSIC@
 
+/* sasl_client_done support */
+#cmakedefine SASL_CLIENT_DONE_SUPPORTED @SASL_CLIENT_DONE_SUPPORTED@
+
 #endif

libmysql/authentication_ldap/auth_ldap_sasl_client.cc

@@ -624,7 +624,11 @@ static int initialize_plugin(char *, size_t, int, va_list) {
 static int deinitialize_plugin() {
   delete g_logger_client;
   g_logger_client = nullptr;
+#if defined(SASL_CLIENT_DONE_SUPPORTED)
   sasl_client_done();
+#else
+  sasl_done();
+#endif
   return 0;
 }