From 64b48aebe411655d2524c30f0c509612b27eea71 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Mon, 15 Oct 2018 22:57:15 +0100
Subject: [PATCH] make auth_gssapi_basic work, also in domain environment.
---
plugin/auth_gssapi/mysql-test/auth_gssapi/basic.result | 2 ++
plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test | 1 +
plugin/auth_gssapi/sspi_server.cc | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.result b/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.result
index dc5155fac8c..3044f984ffa 100644
--- a/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.result
+++ b/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.result
@@ -1,4 +1,6 @@
INSTALL SONAME 'auth_gssapi';
+Warnings:
+Note 1105 SSPI: using principal name 'localhost', mech 'Negotiate'
CREATE USER 'GSSAPI_SHORTNAME' IDENTIFIED WITH gssapi;
SELECT USER(),CURRENT_USER();
USER() CURRENT_USER()
diff --git a/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test b/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test
index f47ad8c20e2..e6e8cde68ca 100644
--- a/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test
+++ b/plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test
@@ -1,3 +1,4 @@
+--replace_regex /name '[a-zA-Z@.]+'/name 'localhost'/
INSTALL SONAME 'auth_gssapi';
#
diff --git a/plugin/auth_gssapi/sspi_server.cc b/plugin/auth_gssapi/sspi_server.cc
index c3ec8161567..a4223e3cf7f 100644
--- a/plugin/auth_gssapi/sspi_server.cc
+++ b/plugin/auth_gssapi/sspi_server.cc
@@ -289,7 +289,7 @@ int plugin_init()
{
srv_principal_name= get_default_principal_name();
}
- my_printf_error(0, "SSPI: using principal name '%s', mech '%s'",
+ my_printf_error(ER_UNKNOWN_ERROR, "SSPI: using principal name '%s', mech '%s'",
ME_ERROR_LOG | ME_NOTE, srv_principal_name, srv_mech_name);
ret = AcquireCredentialsHandle(
--
2.30.9