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

code cleanup localhost_match_wildcard_host

Browse Source 
code cleanup for localhost_match_wildcard_host
This commit is contained in:
MassimilianoPinto
2014-09-12 17:21:34 +02:00
parent 8818f23176
commit 7108add6f5
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/config.c
View File

@ -1206,7 +1206,7 @@ SERVER *server;
version_string = config_get_value(obj->parameters, "version_string"); version_string = config_get_value(obj->parameters, "version_string");
allow_localhost_match_wildcardi_host = config_get_value(obj->parameters, "localhost_match_wildcard_host"); allow_localhost_match_wildcard_host = config_get_value(obj->parameters, "localhost_match_wildcard_host");
if (version_string) { if (version_string) {
if (service->version_string) { if (service->version_string) {
@ -1320,6 +1320,7 @@ SERVER *server;
char *user; char *user;
char *auth; char *auth;
char *enable_root_user; char *enable_root_user;
char *allow_localhost_match_wildcard_host;
enable_root_user = enable_root_user =
config_get_value(obj->parameters, config_get_value(obj->parameters,
@ -1343,7 +1344,7 @@ SERVER *server;
serviceEnableRootUser(service, atoi(enable_root_user)); serviceEnableRootUser(service, atoi(enable_root_user));
if (allow_localhost_match_wildcard_host) if (allow_localhost_match_wildcard_host)
serviceEnableLocalhostMatchAny( serviceEnableLocalhostMatchWildcardHost(
service, service,
atoi(allow_localhost_match_wildcard_host)); atoi(allow_localhost_match_wildcard_host));
} }

2
server/core/service.c
View File

@ -129,7 +129,7 @@ SERVICE *service;
service->credentials.name = NULL; service->credentials.name = NULL;
service->credentials.authdata = NULL; service->credentials.authdata = NULL;
service->enable_root = 0; service->enable_root = 0;
service->localhost_match_any = 0; service->localhost_match_wildcard_host = 0;
service->routerOptions = NULL; service->routerOptions = NULL;
service->databases = NULL; service->databases = NULL;
service->svc_config_param = NULL; service->svc_config_param = NULL;

1
server/modules/protocol/mysql_client.c
View File

@ -42,6 +42,7 @@
#include <mysql_client_server_protocol.h> #include <mysql_client_server_protocol.h>
#include <gw.h> #include <gw.h>
#include <modinfo.h> #include <modinfo.h>
#include <sys/stat.h>
MODULE_INFO info = { MODULE_INFO info = {
MODULE_API_PROTOCOL, MODULE_API_PROTOCOL,

8
server/modules/protocol/mysql_common.c
View File

@ -1352,10 +1352,10 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
if ((key.ipv4.sin_addr.s_addr == 0x0100007F) && !dcb->service->localhost_match_wildcard_host) { if ((key.ipv4.sin_addr.s_addr == 0x0100007F) && !dcb->service->localhost_match_wildcard_host) {
/* Skip the wildcard check and return 1 */ /* Skip the wildcard check and return 1 */
LOGIF(LD, LOGIF(LE,
(skygw_log_write_flush( (skygw_log_write_flush(
LOGFILE_DEBUG, LOGFILE_ERROR,
"%lu [MySQL Client Auth], user [%s@%s] not existent", "%lu [MySQL Client Auth], user [%s@%s] not found, try with 'localhost_match_wildcard_host=1' in service definition",
pthread_self(), pthread_self(),
key.user, key.user,
dcb->remote))); dcb->remote)));
@ -1699,8 +1699,6 @@ void protocol_add_srv_command(
MySQLProtocol* p, MySQLProtocol* p,
mysql_server_cmd_t cmd) mysql_server_cmd_t cmd)
{ {
server_command_t* c;
spinlock_acquire(&p->protocol_lock); spinlock_acquire(&p->protocol_lock);
if (p->protocol_state != MYSQL_PROTOCOL_ACTIVE) if (p->protocol_state != MYSQL_PROTOCOL_ACTIVE)