diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 11:32:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 12:03:55 +0300 |
| commit | ea2bc974dce2ac509011807c80b36192cd18f686 (patch) | |
| tree | afbed3c29a2af90c44af2f086c6eb0d83c909840 /plugin/auth_gssapi/gssapi_server.cc | |
| parent | fbfb5b5f68a428ec819bc09d14b30cebf660b37b (diff) | |
| parent | 1ea266f3ef36e779d23697b18cb94e1b0f8e65ef (diff) | |
| download | mariadb-git-bb-10.2-merge.tar.gz | |
Merge 10.1 into 10.2bb-10.2-merge
Diffstat (limited to 'plugin/auth_gssapi/gssapi_server.cc')
| -rw-r--r-- | plugin/auth_gssapi/gssapi_server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc index 9197b3e06fc..2af87e820cf 100644 --- 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() |