database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +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

5
plugin/auth_gssapi/client_plugin.cc
View File

@@ -31,12 +31,13 @@ POSSIBILITY OF SUCH DAMAGE.
GSSAPI authentication plugin, client side
*/
#include <my_global.h>
#include <string.h>
#include <stdarg.h>
#include <mysqld_error.h>
#include <mysql/client_plugin.h>
#include <mysql.h>
#include <stdio.h>
#include "common.h"
#include <string.h>
extern int auth_client(char *principal_name,
char *mech,

3
plugin/auth_gssapi/gssapi_client.cc
View File

@@ -26,8 +26,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#include <my_global.h>
#include <gssapi/gssapi.h>
#include <string.h>
#include <stdio.h>
#include <mysql/plugin_auth.h>
#include <mysqld_error.h>
#include <mysql.h>

1
plugin/auth_gssapi/gssapi_errmsg.cc
View File

@@ -26,7 +26,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#include <my_global.h>
#include <gssapi.h>
#include <string.h>

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);

14
plugin/auth_gssapi/server_plugin.cc
View File

@@ -31,10 +31,18 @@
GSSAPI authentication plugin, server side
*/
#include <my_global.h>
#include <my_sys.h>
#ifdef _WIN32
typedef unsigned __int64 my_ulonglong;
#else
typedef unsigned long long my_ulonglong;
#endif
#include <stdlib.h>
#include <mysqld_error.h>
#include <typelib.h>
#include <mysql/plugin_auth.h>
#include "string.h"
#include "server_plugin.h"
#include "common.h"
@@ -133,7 +141,7 @@ static const char* mech_names[] = {
NULL
};
static TYPELIB mech_name_typelib = {
array_elements(mech_names) - 1,
3,
"mech_name_typelib",
mech_names,
NULL

3
plugin/auth_gssapi/sspi_client.cc
View File

@@ -27,10 +27,11 @@ POSSIBILITY OF SUCH DAMAGE.
*/
#define SECURITY_WIN32
#include <my_global.h>
#include <windows.h>
#include <sspi.h>
#include <SecExt.h>
#include <stdarg.h>
#include <stdio.h>
#include <mysql/plugin_auth.h>
#include <mysql.h>

3
plugin/auth_gssapi/sspi_errmsg.cc
View File

@@ -26,9 +26,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#include <my_global.h>
#include <windows.h>
#include <string.h>
#include <stdio.h>
#define ERRSYM(x) {x, #x}
static struct {

9
plugin/auth_gssapi/sspi_server.cc
View File

@@ -26,14 +26,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#include <my_global.h>
#include "sspi.h"
#include "common.h"
#include "server_plugin.h"
#include <mysql/plugin_auth.h>
#include <my_sys.h>
#include <mysqld_error.h>
#include <log.h>
/* This sends the error to the client */
@@ -43,11 +40,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, 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);
}
}
@@ -250,7 +247,7 @@ int auth_server(MYSQL_PLUGIN_VIO *vio, const char *user, size_t user_len, int co
{
my_printf_error(ER_ACCESS_DENIED_ERROR,
"GSSAPI name mismatch, requested '%s', actual name '%s'",
MYF(0), user, client_name);
0, user, client_name);
}
cleanup: