[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1224-g66d3012

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  66d3012bf422b2ffc47fa6a405269bad2a80bd6f (commit)
      from  3d34c87612138e4457e824e1a6e3981d1c3fe238 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 66d3012bf422b2ffc47fa6a405269bad2a80bd6f
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jan 9 11:44:40 2008 +0100

    Attempt to fix the compile of source/utils/net_dns.c
    
    Jeremy, please check!

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

Summary of changes:
 source/utils/net_dns.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_dns.c b/source/utils/net_dns.c
index c661c77..44a0b46 100644
--- a/source/utils/net_dns.c
+++ b/source/utils/net_dns.c
@@ -47,7 +47,7 @@ DNS_ERROR DoDNSUpdate(char *pszServerName,
 	OM_uint32 minor;
 	struct dns_update_request *req, *resp;
 
-	if ( (num_addrs <= 0) || !iplist ) {
+	if ( (num_addrs <= 0) || !sslist ) {
 		return ERROR_DNS_INVALID_PARAMETER;
 	}
 
@@ -167,14 +167,16 @@ int get_my_ip_address( struct sockaddr_storage **pp_ss )
 		}
 #if defined(HAVE_IPV6)
 		if ((nics[i].ip.ss_family == AF_INET)) {
-			memcpy(&list[count++], &nics[i].ip);
+			memcpy(&list[count++], &nics[i].ip,
+			       sizeof(struct sockaddr_storage));
 		} else
 #endif
-		if ((nics[i].ip.ss_family == AF_INET)) {
-			memcpy(&list[count++], &nics[i].ip);
+		if (nics[i].ip.ss_family == AF_INET) {
+			memcpy(&list[count++], &nics[i].ip,
+			       sizeof(struct sockaddr_storage));
 		}
 	}
-	*ips = list;
+	*pp_ss = list;
 
 	return count;
 }


-- 
Samba Shared Repository