Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.

server/modules/protocol/httpd.c

@@ -50,11 +50,6 @@ MODULE_INFO info = {
 	"An experimental HTTPD implementation for use in admnistration"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 #define ISspace(x) isspace((int)(x))
 #define HTTP_SERVER_STRING "MaxScale(c) v.1.0.0"
 static char *version_str = "V1.0.1";

server/modules/protocol/maxscaled.c

@@ -45,11 +45,6 @@ MODULE_INFO info = {
 	"A maxscale protocol for the administration interface"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * @file maxscaled.c - MaxScale administration protocol
  *

server/modules/protocol/mysql_backend.c

@@ -57,11 +57,6 @@ MODULE_INFO info = {
 	"The MySQL to backend server protocol"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static char *version_str = "V2.0.0";
 static int gw_create_backend_connection(DCB *backend, SERVER *server, SESSION *in_session);
 static int gw_read_backend_event(DCB* dcb);

server/modules/protocol/mysql_client.c

@@ -58,11 +58,6 @@ MODULE_INFO info = {
 	"The client to MaxScale MySQL protocol implementation"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static char *version_str = "V1.0.0";
 
 static int gw_MySQLAccept(DCB *listener);
@@ -592,29 +587,29 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF **buf) {
 					sizeof(protocol->scramble), 
 					username, 
 					stage1_hash);
-		}
-		else
-		{
-			LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE,
-				"%s: login attempt for user %s, user not "
-				"found.",
-				dcb->service->name, username)));
-		}
-	}
 
-	/* Do again the database check */
-	auth_ret = check_db_name_after_auth(dcb, database, auth_ret);
+            /* Do again the database check */
+            auth_ret = check_db_name_after_auth(dcb, database, auth_ret);
+		}
+    }
 
 	/* on succesful auth set user into dcb field */
 	if (auth_ret == 0) {
 		dcb->user = strdup(client_data->user);
-	}
-	else
-	{
-	    skygw_log_write(LOGFILE_ERROR,
-		     "%s: login attempt for user '%s', authentication failed.",
-		     dcb->service->name, username);
-	}
+    }
+    else if (dcb->service->log_auth_warnings)
+    {
+        skygw_log_write(LM, "%s: login attempt for user '%s', authentication failed.",
+                        dcb->service->name, username);
+        if (dcb->ipv4.sin_addr.s_addr == 0x0100007F &&
+            !dcb->service->localhost_match_wildcard_host)
+        {
+            skygw_log_write_flush(LM, "If you have a wildcard grant that covers"
+                                  " this address, try adding "
+                                  "'localhost_match_wildcard_host=true' for "
+                                  "service '%s'. ", dcb->service->name);
+        }
+    }
 
 	/* let's free the auth_token now */
 	if (auth_token) {

server/modules/protocol/mysql_common.c

@@ -50,11 +50,6 @@
 /* The following can be compared using memcmp to detect a null password */
 uint8_t null_client_sha1[MYSQL_SCRAMBLE_LEN]="";
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 extern int gw_read_backend_event(DCB* dcb);
 extern int gw_write_backend_event(DCB *dcb);
 extern int gw_MySQLWrite_backend(DCB *dcb, GWBUF *queue);
@@ -1463,6 +1458,10 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
 	memcpy(&key.ipv4, client, sizeof(struct sockaddr_in));
 	key.netmask = 32;
 	key.resource = client_data->db;
+    if(strlen(dcb->remote) < MYSQL_HOST_MAXLEN)
+    {
+        strcpy(key.hostname, dcb->remote);
+    }
 
 	LOGIF(LD,
 		(skygw_log_write_flush(
@@ -1489,16 +1488,6 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
 				!dcb->service->localhost_match_wildcard_host) 
 			{
  			 	/* Skip the wildcard check and return 1 */
-				LOGIF(LE,
-					(skygw_log_write_flush(
-						LOGFILE_ERROR,
-						"Error : user %s@%s not found, try set "
-						"'localhost_match_wildcard_host=1' in "
-						"service definition of the configuration "
-						"file.",
-						key.user,
-						dcb->remote)));
-
 				break;
 			}
 

server/modules/protocol/telnetd.c

@@ -45,11 +45,6 @@ MODULE_INFO info = {
 	"A telnet deamon protocol for simple administration interface"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * @file telnetd.c - telnet daemon protocol module
  *