merge from branch 'cenh'

merge from branch ‘cenh’
2014-05-26 12:15:34 +02:00
parent 3c66c9c764 7b24841af6
commit 378d00983d
21 changed files with 778 additions and 124 deletions
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@ -183,6 +183,8 @@ getUsers(SERVICE *service, struct users *users)
 	}

 	serviceGetUser(service, &service_user, &service_passwd);
+	if (service_user == NULL || service_passwd == NULL)
+		return -1;

 	/** multi-thread environment requires that thread init succeeds. */
 	if (mysql_thread_init()) {