Check for krb5_xfree instead of krb5_free_unparsed_name

Use krb5_xfree if available, otherwise default to krb5_free_unparsed_name.
MariaDB · Jun 15, 2020 · 93cee30 · 93cee30
1 parent de20091
commit 93cee30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt
@@ -21,9 +21,9 @@ ELSE()
    SET(CMAKE_REQUIRED_INCLUDES ${GSSAPI_INCS})
    SET(CMAKE_REQUIRED_LIBRARIES ${GSSAPI_LIBS})
    INCLUDE(CheckCXXSymbolExists)
-   CHECK_CXX_SYMBOL_EXISTS(krb5_free_unparsed_name "krb5.h" HAVE_KRB5_FREE_UNPARSED_NAME)
-   IF(HAVE_KRB5_FREE_UNPARSED_NAME)
-     ADD_DEFINITIONS(-DHAVE_KRB5_FREE_UNPARSED_NAME=1)
+   CHECK_CXX_SYMBOL_EXISTS(krb5_xfree "krb5.h" HAVE_KRB5_XFREE)
+   IF(HAVE_KRB5_XFREE)
+     ADD_DEFINITIONS(-DHAVE_KRB5_XFREE=1)
    ENDIF()
 
  ELSE()

diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc
@@ -31,7 +31,7 @@ static void log_error( OM_uint32 major, OM_uint32 minor, const char *msg)
   Generate default principal service name formatted as principal name "mariadb/server.fqdn@REALM"
 */
 #include <krb5.h>
-#ifndef HAVE_KRB5_FREE_UNPARSED_NAME
+#ifdef HAVE_KRB5_XFREE
 #define krb5_free_unparsed_name(a,b) krb5_xfree(b)
 #endif
 static char* get_default_principal_name()