Merge branch '2.1' into develop

2017-03-09 10:02:36 +02:00
parent e1a1959bc2 41ff01d16d
commit 415001a4cd
19 changed files with 210 additions and 42 deletions
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@ -2708,7 +2708,7 @@ dcb_accept(DCB *listener)
            client_dcb->fd = c_sock;

            // get client address
-            if (((struct sockaddr *)&client_conn)->sa_family == AF_UNIX)
+            if (client_conn.ss_family == AF_UNIX)
            {
                // client address
                client_dcb->remote = MXS_STRDUP_A("localhost_from_socket");