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/protocol/telnetd/telnetd.c
+++ b/server/modules/protocol/telnetd/telnetd.c
@ -203,7 +203,7 @@ static int telnetd_read_event(DCB* dcb)
                    {
                        *t = 0;
                    }
-                    if (admin_verify(telnetd->username, password))
+                    if (admin_verify_inet_user(telnetd->username, password))
                    {
                        telnetd_echo(dcb, 1);
                        telnetd->state = TELNETD_STATE_DATA;