Merge branch '2.0' into develop

server/modules/authenticator/NullAuthAllow/null_auth_allow.c

@@ -33,6 +33,9 @@
 #include <maxscale/buffer.h>
 #include <maxscale/users.h>
 
+/** MXS-1026: Without MySQL protocol data structures, the NullAuth authenticator will crash. */
+#include <maxscale/protocol/mysql.h>
+
 /* @see function load_module in load_utils.c for explanation of the following
  * lint directives.
  */
@@ -130,6 +133,11 @@ null_auth_authenticate(DCB *dcb)
 static int
 null_auth_set_protocol_data(DCB *dcb, GWBUF *buf)
 {
+    /** MXS-1026: This will just prevent a crash when the NullAuth authenticator
+     * is used. This does not provide a way to use MaxScale with no authentication. */
+    dcb->data = calloc(1, sizeof(MYSQL_session));
+    dcb->protocol = mysql_protocol_init(dcb, dcb->fd);
+
     return 0;
 }