hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename and cleanup authenticator.h

Browse Source
This commit is contained in:
Esa Korhonen
2019-01-11 15:24:55 +02:00
parent b4d91d4b9a
commit 684ec3288b
19 changed files with 133 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
View File

@ -27,7 +27,7 @@
#define MXS_MODULE_NAME "CDCPlainAuth"
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <fcntl.h>
#include <sys/stat.h>
#include <cdc.hh>

2
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
View File

@ -16,7 +16,7 @@
#include <maxscale/ccdefs.hh>
#include <maxscale/alloc.h>
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/dcb.hh>
#include <maxscale/mysql_utils.hh>
#include <maxscale/protocol/mysql.hh>

2
server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
View File

@ -15,7 +15,7 @@
#include <maxscale/ccdefs.hh>
#include <maxscale/alloc.h>
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/dcb.hh>
#include <maxscale/protocol/mysql.hh>
#include <maxscale/server.hh>

2
server/modules/authenticator/HTTPAuth/http_auth.cc
View File

@ -26,7 +26,7 @@
#define MXS_MODULE_NAME "HTTPAuth"
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/alloc.h>
#include <maxscale/modinfo.h>
#include <maxscale/dcb.hh>

2
server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc
View File

@ -28,7 +28,7 @@
#define MXS_MODULE_NAME "MaxAdminAuth"
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/alloc.h>
#include <maxscale/modinfo.h>
#include <maxscale/dcb.hh>

2
server/modules/authenticator/MySQLAuth/mysql_auth.cc
View File

@ -28,7 +28,7 @@
#include "mysql_auth.hh"
#include <maxscale/protocol/mysql.hh>
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/alloc.h>
#include <maxscale/event.hh>
#include <maxscale/poll.hh>

2
server/modules/authenticator/MySQLAuth/mysql_auth.hh
View File

@ -19,7 +19,7 @@
#include <stdint.h>
#include <arpa/inet.h>
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/dcb.hh>
#include <maxscale/buffer.hh>
#include <maxscale/service.hh>

2
server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc
View File

@ -25,7 +25,7 @@
#define MXS_MODULE_NAME "MySQLBackendAuth"
#include <maxscale/alloc.h>
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/protocol/mysql.hh>
#include <maxscale/server.hh>
#include <maxscale/utils.h>

2
server/modules/authenticator/NullAuthAllow/null_auth_allow.cc
View File

@ -29,7 +29,7 @@
#define MXS_MODULE_NAME "NullAuthAllow"
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/modinfo.h>
#include <maxscale/dcb.hh>
#include <maxscale/buffer.h>

2
server/modules/authenticator/NullAuthDeny/null_auth_deny.cc
View File

@ -29,7 +29,7 @@
#define MXS_MODULE_NAME "NullAuthDeny"
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/modinfo.h>
#include <maxscale/dcb.hh>
#include <maxscale/buffer.h>

2
server/modules/authenticator/PAM/PAMAuth/pam_auth.cc
View File

@ -13,7 +13,7 @@
#include "pam_auth.hh"
#include <string>
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/users.h>
#include "pam_instance.hh"

2
server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
View File

@ -13,7 +13,7 @@
#include "pam_backend_auth.hh"
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/server.hh>
#include "pam_backend_session.hh"
#include "../pam_auth_common.hh"

8
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -487,7 +487,7 @@ static int gw_read_backend_event(DCB* dcb)
dcb,
dcb->fd,
proto->protocol_auth_state,
STRPROTOCOLSTATE(proto->protocol_auth_state));
mxs::to_string(proto->protocol_auth_state));
int rc = 0;
if (proto->protocol_auth_state == MXS_AUTH_STATE_COMPLETE)
@ -1125,7 +1125,7 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue)
{
MXS_INFO("DCB and protocol state do not qualify for pooling: %s, %s",
STRDCBSTATE(dcb->state),
STRPROTOCOLSTATE(backend_protocol->protocol_auth_state));
mxs::to_string(backend_protocol->protocol_auth_state));
gwbuf_free(queue);
return 0;
}
@ -1230,7 +1230,7 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue)
MXS_DEBUG("write to dcb %p fd %d protocol state %s.",
dcb,
dcb->fd,
STRPROTOCOLSTATE(backend_protocol->protocol_auth_state));
mxs::to_string(backend_protocol->protocol_auth_state));
prepare_for_write(dcb, queue);
@ -1260,7 +1260,7 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue)
MXS_DEBUG("delayed write to dcb %p fd %d protocol state %s.",
dcb,
dcb->fd,
STRPROTOCOLSTATE(backend_protocol->protocol_auth_state));
mxs::to_string(backend_protocol->protocol_auth_state));
/** Store data until authentication is complete */
prepare_for_write(dcb, queue);

2
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -25,7 +25,7 @@
#include <vector>
#include <maxscale/alloc.h>
#include <maxscale/authenticator.h>
#include <maxscale/authenticator.hh>
#include <maxscale/modinfo.h>
#include <maxscale/modutil.hh>
#include <maxscale/poll.hh>