diff options
| author | Volker Lendecke <vl@samba.org> | 2008-01-09 11:44:40 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-01-09 12:10:55 +0100 |
| commit | b43719d0fb240d7eacc7d0e08ac220c982516867 (patch) | |
| tree | 2fd8978c60023f91abe3ebc5bfe53f8d7daf59b9 | |
| parent | 28ac552381e1e9e115fa08cd6743ec764ca84124 (diff) | |
| download | samba-b43719d0fb240d7eacc7d0e08ac220c982516867.tar.gz samba-b43719d0fb240d7eacc7d0e08ac220c982516867.tar.bz2 samba-b43719d0fb240d7eacc7d0e08ac220c982516867.zip | |
Attempt to fix the compile of source/utils/net_dns.c
Jeremy, please check!
(This used to be commit 66d3012bf422b2ffc47fa6a405269bad2a80bd6f)
| -rw-r--r-- | source3/utils/net_dns.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c index c661c77ce6..44a0b46e4e 100644 --- a/source3/utils/net_dns.c +++ b/source3/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; } |