mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.1 into 10.2

Browse source
This commit is contained in:
Marko Mäkelä 2018-11-06 08:41:48 +02:00
commit 32062cc61c
277 changed files with 16904 additions and 4184 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test
View file

@ -1,3 +1,4 @@
--replace_regex /name '[^']+'/name 'localhost'/
INSTALL SONAME 'auth_gssapi';
#

11
plugin/auth_gssapi/sspi_server.cc
View file

@ -42,11 +42,11 @@ static void log_error(SECURITY_STATUS err, const char *msg)
{
char buf[1024];
sspi_errmsg(err, buf, sizeof(buf));
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", MYF(0), msg, buf);
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", 0, err, msg, buf);
}
else
{
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error %s", MYF(0), msg);
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error %s", 0, msg);
}
}
@ -103,7 +103,12 @@ static int get_client_name_from_context(CtxtHandle *ctxt,
*p = 0;
}
strncpy(name, native_names.sClientName, name_len);
FreeContextBuffer(&native_names);
if (native_names.sClientName)
FreeContextBuffer(native_names.sClientName);
if (native_names.sServerName)
FreeContextBuffer(native_names.sServerName);
return CR_OK;
}