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

Merge branch 'develop' into MAX-309

Browse Source 
Merge branch 'develop' into MAX-309
This commit is contained in:
MassimilianoPinto
2014-10-21 18:00:16 +02:00
parent a1f621da30 761de0ac8a
commit e910099586
4 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/dbusers.c
View File

@ -230,7 +230,6 @@ int add_mysql_users_with_host_ipv4(USERS *users, char *user, char *host, char *p
tmp = ret_ip+strlen(ret_ip)-1;
/* start from Class C */
while(tmp > ret_ip) {
if (*tmp == '%') {
/* set only the last IPv4 byte to 1

7
server/core/secrets.c
View File

@ -65,6 +65,7 @@ MAXKEYS *keys;
struct stat secret_stats;
int fd;
int len;
static int reported = 0;
home = getenv("MAXSCALE_HOME");
@ -80,12 +81,16 @@ int len;
errno = 0;
if (eno == ENOENT)
{
LOGIF(LM, (skygw_log_write(
if (!reported)
{
LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE,
"Encrypted password file %s can't be accessed "
"(%s). Password encryption is not used.",
secret_file,
strerror(eno))));
reported = 1;
}
}
else
{