[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5fb578e s3: FreeBSD does not define sin6_addr.s_addr32
      from  98210e2 s3-nsswitch: Fix warnings on Solaris.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5fb578ee09b74c6ffa7a7ab660cc6e36fd13daef
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Feb 6 16:53:22 2012 +0100

    s3: FreeBSD does not define sin6_addr.s_addr32
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Mon Feb  6 20:03:58 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/ctdbd_conn.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 9d2b544..95dda52 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


-- 
Samba Shared Repository