Merge branch 'wildcard_auth' into develop

2015-04-15 21:41:07 +03:00
parent 04a4adeb8a d16e4fe134
commit bf83ce9db3
5 changed files with 62 additions and 7 deletions
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@ -1524,7 +1524,19 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
 					dcb->remote)));

 			user_password = mysql_users_fetch(service->users, &key);
-     
+
+			if (user_password)
+			{
+			    break;
+			}
+
+			/** See if ANYDB == Y */
+			if(key.resource)
+			{
+			    key.resource = NULL;
+			    continue;
+			}
+
 			if (!user_password) {
 				/*
 				 * user@% not found.