From: Volker Lendecke <vl@samba.org>
Date: Mon, 6 Feb 2012 15:53:22 +0000 (+0100)
Subject: s3: FreeBSD does not define sin6_addr.s_addr32
X-Git-Tag: tevent-0.9.15~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fb578ee09b74c6ffa7a7ab660cc6e36fd13daef;p=thirdparty%2Fsamba.git

s3: FreeBSD does not define sin6_addr.s_addr32

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Mon Feb  6 20:03:58 CET 2012 on sn-devel-104
---

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 9d2b544928e..95dda5258b1 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1641,7 +1641,7 @@ static void smbd_ctdb_canonicalize_ip(const struct sockaddr_storage *in,
 #endif
 			out4->sin_family = AF_INET;
 			out4->sin_port   = in6->sin6_port;
-			memcpy(&out4->sin_addr, &in6->sin6_addr.s6_addr32[3], 4);
+			memcpy(&out4->sin_addr, &in6->sin6_addr.s6_addr[12], 4);
 		}
 	}
 #endif