From 17c804a67593cdb4d8646b5be6b50fddf56b3e27 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 23 Dec 2009 19:34:32 +0100
Subject: tsocket: only copy the specific part of sockaddr*

This makes sure we fill the unspefic bytes with 0
and have zero termination for sockaddr_un.

metze
---
 lib/tsocket/tsocket_bsd.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/tsocket')

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 22393bf02f..7c0255742c 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -217,12 +217,16 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
 
 	switch (sa->sa_family) {
 	case AF_UNIX:
+		if (sa_socklen > sizeof(struct sockaddr_un)) {
+			sa_socklen = sizeof(struct sockaddr_un);
+		}
 		break;
 	case AF_INET:
 		if (sa_socklen < sizeof(struct sockaddr_in)) {
 			errno = EINVAL;
 			return -1;
 		}
+		sa_socklen = sizeof(struct sockaddr_in);
 		break;
 #ifdef HAVE_IPV6
 	case AF_INET6:
@@ -230,6 +234,7 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
 			errno = EINVAL;
 			return -1;
 		}
+		sa_socklen = sizeof(struct sockaddr_in6);
 		break;
 #endif
 	default:
-- 
cgit