diff options
| author | Gerald (Jerry) Carter <jerry@samba.org> | 2008-01-15 07:59:23 -0600 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2008-01-15 07:59:23 -0600 |
| commit | 7ff128ef03ed03e6b9ce17642cda793255f17c0e (patch) | |
| tree | a6b2202fffd22ebb24546998f4c3c0efd7fecac1 /source3/utils | |
| parent | f0edf72d87ca300058c3ae7f464f26b9a2cce651 (diff) | |
| parent | ab10557a68aae9d8065966129dee751e69880ad1 (diff) | |
| download | samba-7ff128ef03ed03e6b9ce17642cda793255f17c0e.tar.gz samba-7ff128ef03ed03e6b9ce17642cda793255f17c0e.tar.bz2 samba-7ff128ef03ed03e6b9ce17642cda793255f17c0e.zip | |
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit 061c90fefef0e6093dfc3912d381cc306549ed4b)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_ads.c | 11 | ||||
| -rw-r--r-- | source3/utils/net_dns.c | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 80f6ba9001..0a9020bcfd 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1294,14 +1294,13 @@ static bool net_derive_salting_principal( TALLOC_CTX *ctx, ADS_STRUCT *ads ) #if defined(WITH_DNS_UPDATES) #include "dns.h" DNS_ERROR DoDNSUpdate(char *pszServerName, - const char *pszDomainName, - const char *pszHostName, - const struct in_addr *iplist, int num_addrs ); - + const char *pszDomainName, const char *pszHostName, + const struct sockaddr_storage *sslist, + size_t num_addrs ); static NTSTATUS net_update_dns_internal(TALLOC_CTX *ctx, ADS_STRUCT *ads, const char *machine_name, - const struct in_addr *addrs, + const struct sockaddr_storage *addrs, int num_addrs) { struct dns_rr_ns *nameservers = NULL; @@ -1390,7 +1389,7 @@ done: static NTSTATUS net_update_dns(TALLOC_CTX *mem_ctx, ADS_STRUCT *ads) { int num_addrs; - struct in_addr *iplist = NULL; + struct sockaddr_storage *iplist = NULL; fstring machine_name; NTSTATUS status; diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c index 44a0b46e4e..fb6644d6b2 100644 --- a/source3/utils/net_dns.c +++ b/source3/utils/net_dns.c @@ -32,7 +32,8 @@ DNS_ERROR DoDNSUpdate(char *pszServerName, const char *pszDomainName, const char *pszHostName, - const struct sockaddr_storage *sslist, size_t num_addrs ); + const struct sockaddr_storage *sslist, + size_t num_addrs ); /********************************************************************* *********************************************************************/ |