s4-ipv6: fill in family when initialising from sockaddr

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Jun  6 05:35:36 CEST 2011 on sn-devel-104

diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 369cf5ff3666986c4522054b18d811d036225f13..b16e38c372d4788e2950154de76f6a062f76fd89 100644 (file)
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -503,7 +503,19 @@ _PUBLIC_ struct socket_address *socket_address_from_sockaddr(TALLOC_CTX *mem_ctx
        if (!addr) {
                return NULL;
        }
-       addr->family = NULL; 
+       switch (sockaddr->sa_family) {
+       case AF_INET:
+               addr->family = "ipv4";
+               break;
+#ifdef HAVE_IPV6
+       case AF_INET6:
+               addr->family = "ipv6";
+               break;
+#endif
+       case AF_UNIX:
+               addr->family = "unix";
+               break;
+       }
        addr->addr = NULL;
        addr->port = 0;
        addr->sockaddr = (struct sockaddr *)talloc_memdup(addr, sockaddr, sockaddrlen);