commit: 7e90d6b00bb0b1031f06c9d4c86d9c4a0c8cf566 Author: Brian Evans <grknight <AT> tuffmail <DOT> com> AuthorDate: Sun Jan 31 01:46:43 2016 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Sun Jan 31 01:46:43 2016 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7e90d6b0
Add patch to mariadb for the new gssapi/kerberos auth plugin MDEV-9494 00000_index.txt | 5 +++++ 20021_all_mariadb-10.1.11-kerberos-MDEV-9494.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/00000_index.txt b/00000_index.txt index 6281247..106fc24 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -923,3 +923,8 @@ @@ Fix events_1 test for October 2015 @@ Patch backported from mariadb @@ Bug 564968 Upstream bug 78899 + +@patch 20021_all_mariadb-10.1.11-kerberos-MDEV-9494 +@ver 10.01.11.00 to 10.01.11.99 +@pn mariadb +@@ Fix server gssapi plugin compile with heimdal diff --git a/20021_all_mariadb-10.1.11-kerberos-MDEV-9494.patch b/20021_all_mariadb-10.1.11-kerberos-MDEV-9494.patch new file mode 100644 index 0000000..dad69e3 --- /dev/null +++ b/20021_all_mariadb-10.1.11-kerberos-MDEV-9494.patch @@ -0,0 +1,22 @@ +From 3d794d0ee8e0a5a7dfbd3b7de056c0a3ccb9aa81 Mon Sep 17 00:00:00 2001 +From: Vladislav Vaintroub <[email protected]> +Date: Wed, 6 Jan 2016 09:15:19 +0100 +Subject: [PATCH] MDEV9494 Fix build for Heimdal Kerberos + +--- + plugin/auth_gssapi/gssapi_server.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc +index d325b2a..ed042a0 100644 +--- a/plugin/auth_gssapi/gssapi_server.cc ++++ b/plugin/auth_gssapi/gssapi_server.cc +@@ -58,7 +58,7 @@ static char* get_default_principal_name() + } + + /* Check for entry in keytab */ +- if (krb5_kt_read_service_key(context, NULL, principal, 0, 0, &key)) ++ if (krb5_kt_read_service_key(context, NULL, principal, 0, (krb5_enctype)0, &key)) + { + sql_print_warning("GSSAPI plugin : default principal '%s' not found in keytab", unparsed_name); + goto cleanup;
