database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Don't include my_global.h in "pure" plugins

Browse Source 
this partially reverts 6e56ebbb498
This commit is contained in:
Sergei Golubchik
2017-08-11 13:58:32 +02:00
parent a6e215f221
commit 828602356c
10 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/auth_gssapi/gssapi_server.cc
View File

@ -1,9 +1,9 @@
#include <my_global.h>
#include <my_config.h>
#include <gssapi/gssapi.h>
#include <stdio.h>
#include <mysql/plugin_auth.h>
#include <my_sys.h>
#include <mysqld_error.h>
#include <log.h>
#include <string.h>
#include "server_plugin.h"
#include "gssapi_errmsg.h"
@ -17,11 +17,11 @@ static void log_error( OM_uint32 major, OM_uint32 minor, const char *msg)
char sysmsg[1024];
gssapi_errmsg(major, minor, sysmsg, sizeof(sysmsg));
my_printf_error(ER_UNKNOWN_ERROR,"Server GSSAPI error (major %u, minor %u) : %s -%s",
MYF(0), major, minor, msg, sysmsg);
0, major, minor, msg, sysmsg);
}
else
{
my_printf_error(ER_UNKNOWN_ERROR, "Server GSSAPI error : %s", MYF(0), msg);
my_printf_error(ER_UNKNOWN_ERROR, "Server GSSAPI error : %s", 0, msg);
}
}
@ -196,7 +196,7 @@ int auth_server(MYSQL_PLUGIN_VIO *vio,const char *user, size_t userlen, int use_
/* send token to peer */
if (output.length)
{
if (vio->write_packet(vio, (const uchar *) output.value, output.length))
if (vio->write_packet(vio, (const unsigned char *) output.value, output.length))
{
gss_release_buffer(&minor, &output);
log_error(major, minor, "communication error(write)");
@ -236,7 +236,7 @@ int auth_server(MYSQL_PLUGIN_VIO *vio,const char *user, size_t userlen, int use_
{
my_printf_error(ER_ACCESS_DENIED_ERROR,
"GSSAPI name mismatch, requested '%s', actual name '%.*s'",
MYF(0), user, (int)client_name_buf.length, client_name_str);
0, user, (int)client_name_buf.length, client_name_str);
}
gss_release_buffer(&minor, &client_name_buf);