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

Changed user addition failure message to mention duplicate users if the user in question was already in the users hash.

Browse Source
This commit is contained in:
Markus Makela
2015-04-16 11:02:59 +03:00
parent f28f03ef0a
commit 39bbc93bbc
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/core/dbusers.c
View File

@ -254,7 +254,7 @@ HASHTABLE *oldresources;
* @param user The user name
* @param host The host to add, with possible wildcards
* @param passwd The sha1(sha1(passoword)) to add
* @return 1 on success, 0 on failure
* @return 1 on success, 0 on failure and -1 on duplicate user
*/
int add_mysql_users_with_host_ipv4(USERS *users, char *user, char *host, char *passwd, char *anydb, char *db) {
@ -327,6 +327,10 @@ int add_mysql_users_with_host_ipv4(USERS *users, char *user, char *host, char *p
if (mysql_users_add(users, &key, passwd)) {
ret = 1;
}
else if(key.user)
{
ret = -1;
}
}
free(key.user);
@ -950,9 +954,9 @@ getAllUsers(SERVICE *service, USERS *users)
/*
* add user@host and DB global priv and specificsa grant (if possible)
*/
bool havedb = false;
if (db_grants) {
bool havedb = false;
/* we have dbgrants, store them */
if(row[5]){
unsigned long *rowlen = mysql_fetch_lengths(result);
@ -1026,6 +1030,14 @@ getAllUsers(SERVICE *service, USERS *users)
strncat(users_data, row[3], users_data_row_len);
total_users++;
} else if(rc == -1) {
/** Duplicate user*/
LOGIF(LE,(skygw_log_write(LT|LE,
"Warning: Duplicate MySQL user found for service [%s]: %s@%s%s%s",
service->name,
row[0],row[1],havedb?" for database: ":"",
havedb ?dbnm:"")));
} else {
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR|LOGFILE_TRACE,
@ -1507,6 +1519,14 @@ getUsers(SERVICE *service, USERS *users)
strncat(users_data, row[3], users_data_row_len);
total_users++;
} else if(rc == -1) {
/** Duplicate user*/
LOGIF(LE,(skygw_log_write(LT|LE,
"Warning: Duplicate MySQL user found for service [%s]: %s@%s%s%s",
service->name,
row[0],row[1],db_grants?" for database: ":"",
db_grants ?row[5]:"")));
} else {
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR|LOGFILE_TRACE,