diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 07:39:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 07:39:33 +0300 |
| commit | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (patch) | |
| tree | c671aced17dc9f6d0cc6c5a660b73b2e2dcfe841 /plugin/auth_gssapi | |
| parent | b0f836053b094b09999c102d10bf0ad6ed761ac6 (diff) | |
| parent | 1df1a6392477ad211b2a66c6eccbe9d5c6316c7e (diff) | |
| download | mariadb-git-f347b3e0e6592329b1447fa460aca0a4b1f680b1.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'plugin/auth_gssapi')
| -rw-r--r-- | plugin/auth_gssapi/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugin/auth_gssapi/gssapi_server.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt index d2f854c2918..bca4f5af3a1 100644 --- 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 index 8aa13aac6c9..1d3cbb7a130 100644 --- a/plugin/auth_gssapi/gssapi_server.cc +++ b/plugin/auth_gssapi/gssapi_server.cc @@ -30,7 +30,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() |