Merge branch '2.0' into develop

2016-09-09 15:12:58 +03:00
parent 07588a515d abd1ea53a6
commit d7f79942be
48 changed files with 1658 additions and 547 deletions
--- a/server/modules/authenticator/max_admin_auth.c
+++ b/server/modules/authenticator/max_admin_auth.c
@ -145,7 +145,7 @@ max_admin_auth_set_protocol_data(DCB *dcb, GWBUF *buf)
        dcb->data = (void *)session_data;

        /* Check for existance of the user */
-        if (admin_search_user(session_data->user))
+        if (admin_linux_account_enabled(session_data->user))
        {
            session_data->validated = true;
            return 0;