database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Check for krb5_xfree instead of krb5_free_unparsed_name

Browse Source 
Use krb5_xfree if available, otherwise default to
krb5_free_unparsed_name.
This commit is contained in:
Vicențiu Ciorbaru
2020-06-15 16:01:41 +03:00
parent de20091f5c
commit 93cee30309
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/auth_gssapi/CMakeLists.txt
View File

@@ -21,9 +21,9 @@ ELSE()
SET(CMAKE_REQUIRED_INCLUDES ${GSSAPI_INCS}) SET(CMAKE_REQUIRED_INCLUDES ${GSSAPI_INCS})
SET(CMAKE_REQUIRED_LIBRARIES ${GSSAPI_LIBS}) SET(CMAKE_REQUIRED_LIBRARIES ${GSSAPI_LIBS})
INCLUDE(CheckCXXSymbolExists) INCLUDE(CheckCXXSymbolExists)
CHECK_CXX_SYMBOL_EXISTS(krb5_free_unparsed_name "krb5.h" HAVE_KRB5_FREE_UNPARSED_NAME) CHECK_CXX_SYMBOL_EXISTS(krb5_xfree "krb5.h" HAVE_KRB5_XFREE)
IF(HAVE_KRB5_FREE_UNPARSED_NAME) IF(HAVE_KRB5_XFREE)
ADD_DEFINITIONS(-DHAVE_KRB5_FREE_UNPARSED_NAME=1) ADD_DEFINITIONS(-DHAVE_KRB5_XFREE=1)
ENDIF() ENDIF()
ELSE() ELSE()

2
plugin/auth_gssapi/gssapi_server.cc
View File

@@ -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" Generate default principal service name formatted as principal name "mariadb/server.fqdn@REALM"
*/ */
#include <krb5.h> #include <krb5.h>
#ifndef HAVE_KRB5_FREE_UNPARSED_NAME #ifdef HAVE_KRB5_XFREE
#define krb5_free_unparsed_name(a,b) krb5_xfree(b) #define krb5_free_unparsed_name(a,b) krb5_xfree(b)
#endif #endif
static char* get_default_principal_name() static char* get_default_principal_name()