[PATCH v64 5/6] server: Fix getsockname() and accept() on AF_UNIX sockets.

[Ally Sommers]

From: Ally Sommers

---
 server/sock.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/server/sock.c b/server/sock.c
index cf842dfe914..016122ed8ef 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2049,7 +2049,19 @@ static struct sock *accept_socket( struct sock *sock )
         }
         unix_len = sizeof(unix_addr);
         if (!getsockname( acceptfd, &unix_addr.addr, &unix_len ))
-            acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) );
+        {
+            if (sock->family == WS_AF_UNIX)
+            {
+                acceptsock->addr_len = sock->addr_len;
+                acceptsock->addr.un = sock->addr.un;
+            }
+            else
+            {
+                acceptsock->addr_len = sockaddr_from_unix( &unix_addr,
+                                                           &acceptsock->addr.addr,
+                                                           sizeof(acceptsock->addr) );
+            }
+        }
     }
     clear_error();
     sock->pending_events &= ~AFD_POLL_ACCEPT;
@@ -2105,7 +2117,19 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock )

unix_len = sizeof(unix_addr);
     if (!getsockname( get_unix_fd( newfd ), &unix_addr.addr, &unix_len ))
-        acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) );
+    {
+        if (sock->family == WS_AF_UNIX)
+        {
+            acceptsock->addr_len = sock->addr_len;
+            acceptsock->addr.un = sock->addr.un;
+        }
+        else
+        {
+            acceptsock->addr_len = sockaddr_from_unix( &unix_addr,
+                                                       &acceptsock->addr.addr,
+                                                       sizeof(acceptsock->addr) );
+        }
+    }

clear_error();
     sock->pending_events &= ~AFD_POLL_ACCEPT;
@@ -2720,7 +2744,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )
         allow_fd_caching( sock->fd );

unix_len = sizeof(unix_addr);
-        if (!getsockname( unix_fd, &unix_addr.addr, &unix_len ))
+        if (sock->family != WS_AF_UNIX && !getsockname( unix_fd, &unix_addr.addr, &unix_len ))
             sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) );
         sock->bound = 1;