From 39bbc93bbcddea933229c98137fdf848385215af Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 16 Apr 2015 11:02:59 +0300
Subject: [PATCH] Changed user addition failure message to mention duplicate
 users if the user in question was already in the users hash.

---
 server/core/dbusers.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 2a9e982da..8e9d8a715 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -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,