Merge branch 'MXS-544' into develop-MXS-544-merge

2016-03-03 21:39:39 +02:00
parent 1a2bd8b234 1ebb998056
commit d3da98b58f
42 changed files with 3075 additions and 2294 deletions
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@ -23,6 +23,7 @@
 #include <buffer.h>
 #include <service.h>
 #include <session.h>
+#include <gw_protocol.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <sys/socket.h>
@ -296,6 +297,7 @@ static int telnetd_accept(DCB *dcb)
                close(so);
                return n_connect;
            }
+            client_dcb->listen_ssl = dcb->listen_ssl;
            client_dcb->fd = so;
            client_dcb->remote = strdup(inet_ntoa(addr.sin_addr));
            memcpy(&client_dcb->func, &MyObject, sizeof(GWPROTOCOL));