[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  3b5e3ef lib: tevent: Use struct sockaddr_storage to cope with IPv6.
       via  b5f1ce8 s3: lib: ldap: Use struct sockaddr_storage to cope with IPv6.
      from  227b35a s3: net: Return an error when no name servers were returned by the lookup so that we see an error in self test.

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


- Log -----------------------------------------------------------------
commit 3b5e3ef9f27487044e7e418a1a83978381b5bfb2
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 27 11:43:31 2016 -0700

    lib: tevent: Use struct sockaddr_storage to cope with IPv6.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sun May 29 09:13:30 CEST 2016 on sn-devel-144

commit b5f1ce892a4f8b589aea21b89c2bf93c028fbbe7
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 27 11:42:58 2016 -0700

    s3: lib: ldap: Use struct sockaddr_storage to cope with IPv6.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>

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

Summary of changes:
 lib/tevent/echo_server.c | 8 +++++---
 source3/lib/smbldap.c    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/echo_server.c b/lib/tevent/echo_server.c
index 102f7b4..6e7f181 100644
--- a/lib/tevent/echo_server.c
+++ b/lib/tevent/echo_server.c
@@ -66,7 +66,7 @@ struct accept_state {
 	struct tevent_fd *fde;
 	int listen_sock;
 	socklen_t addrlen;
-	struct sockaddr addr;
+	struct sockaddr_storage addr;
 	int sock;
 };
 
@@ -111,7 +111,9 @@ static void accept_handler(struct tevent_context *ev, struct tevent_fd *fde,
 	}
 	state->addrlen = sizeof(state->addr);
 
-	ret = accept(state->listen_sock, &state->addr, &state->addrlen);
+	ret = accept(state->listen_sock,
+			(struct sockaddr *)&state->addr,
+			&state->addrlen);
 	if (ret == -1) {
 		tevent_req_error(req, errno);
 		return;
@@ -133,7 +135,7 @@ static int accept_recv(struct tevent_req *req, struct sockaddr *paddr,
 		return -1;
 	}
 	if (paddr != NULL) {
-		*paddr = state->addr;
+		memcpy(paddr, &state->addr, state->addrlen);
 	}
 	if (paddrlen != NULL) {
 		*paddrlen = state->addrlen;
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 5a876e0..e9cc48b 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -1040,7 +1040,7 @@ static int smbldap_open(struct smbldap_state *ldap_state)
 #ifdef HAVE_UNIXSOCKET
 		struct sockaddr_un addr;
 #else
-		struct sockaddr addr;
+		struct sockaddr_storage addr;
 #endif
 		socklen_t len = sizeof(addr);
 		int sd;


-- 
Samba Shared Repository