MXS-1398: Clean up mysql.h header
Cleaned up the MaxScale version of the mysql.h header by removing all unused includes. This revealed a large amount of dependencies on these removed includes in other files which needed to be fixed. Also sorted all includes in changed files by type and alphabetical order. Removed explicit revision history from modified files.
This commit is contained in:
@ -13,14 +13,19 @@
|
||||
|
||||
#define MXS_MODULE_NAME "GSSAPIAuth"
|
||||
|
||||
#include <maxscale/authenticator.h>
|
||||
#include <maxscale/cdefs.h>
|
||||
|
||||
#include <maxscale/alloc.h>
|
||||
#include <maxscale/authenticator.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/mysql_utils.h>
|
||||
#include <maxscale/protocol/mysql.h>
|
||||
#include <maxscale/secrets.h>
|
||||
#include <maxscale/mysql_utils.h>
|
||||
#include <maxscale/service.h>
|
||||
#include <maxscale/sqlite3.h>
|
||||
#include <maxscale/users.h>
|
||||
|
||||
#include "../gssapi_auth.h"
|
||||
|
||||
/**
|
||||
|
@ -13,11 +13,13 @@
|
||||
|
||||
#define MXS_MODULE_NAME "GSSAPIBackendAuth"
|
||||
|
||||
#include <maxscale/authenticator.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <maxscale/authenticator.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/protocol/mysql.h>
|
||||
#include <maxscale/server.h>
|
||||
|
||||
#include "../gssapi_auth.h"
|
||||
|
||||
/**
|
||||
|
@ -17,21 +17,21 @@
|
||||
|
||||
#include "mysql_auth.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <mysql.h>
|
||||
#include <netdb.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <maxscale/alloc.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/mysql_utils.h>
|
||||
#include <maxscale/paths.h>
|
||||
#include <maxscale/protocol/mysql.h>
|
||||
#include <maxscale/router.h>
|
||||
#include <maxscale/secrets.h>
|
||||
#include <maxscale/service.h>
|
||||
#include <maxscale/users.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/secrets.h>
|
||||
#include <maxscale/protocol/mysql.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <maxscale/mysql_utils.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <maxscale/paths.h>
|
||||
#include <maxscale/utils.h>
|
||||
|
||||
/** Don't include the root user */
|
||||
#define USERS_QUERY_NO_ROOT " AND user.user NOT IN ('root')"
|
||||
|
@ -20,20 +20,14 @@
|
||||
* The "heavy lifting" of the authentication is done by the protocol module so
|
||||
* the only thing left for this module is to read the final OK packet from the
|
||||
* server.
|
||||
*
|
||||
* @verbatim
|
||||
* Revision History
|
||||
* Date Who Description
|
||||
* 27/09/2016 Markus Makela Initial version
|
||||
*
|
||||
* @endverbatim
|
||||
*/
|
||||
|
||||
#define MXS_MODULE_NAME "MySQLBackendAuth"
|
||||
|
||||
#include <maxscale/alloc.h>
|
||||
#include <maxscale/authenticator.h>
|
||||
#include <maxscale/protocol/mysql.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <maxscale/server.h>
|
||||
#include <maxscale/utils.h>
|
||||
|
||||
/** Authentication states */
|
||||
|
Reference in New Issue
Block a user