diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-11 22:38:42 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-11 22:38:42 -0800 |
| commit | 05fb367a014305f385a6db6653bd327861291563 (patch) | |
| tree | 0c0613cccf22ed0cc92498ee0371b95db01f5c8c /source3/utils/net_dns.c | |
| parent | 1d1b996f3879b87418bdde2fd1691ae2cca42cd4 (diff) | |
| parent | 45db92cc72eb2472425c17e72ff9254d35d8047c (diff) | |
| download | samba-05fb367a014305f385a6db6653bd327861291563.tar.gz samba-05fb367a014305f385a6db6653bd327861291563.tar.bz2 samba-05fb367a014305f385a6db6653bd327861291563.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 08645826817d42c9d4b42ea0fd5e633d7fd08d35)
Diffstat (limited to 'source3/utils/net_dns.c')
| -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; } |