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