diff options
| author | Volker Lendecke <vl@samba.org> | 2011-02-27 09:57:18 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-02-27 11:02:53 +0100 |
| commit | fec0baacb658eb1bfc15c8ca4dfeecc1cf84eb79 (patch) | |
| tree | 93055e96b9d02adf9804c69a25f35c0dcf4067b4 /source3/libsmb/namequery.c | |
| parent | 561205b0166cb4a9c2efbb32b8429f6a83827eee (diff) | |
| download | samba-fec0baacb658eb1bfc15c8ca4dfeecc1cf84eb79.tar.gz samba-fec0baacb658eb1bfc15c8ca4dfeecc1cf84eb79.tar.bz2 samba-fec0baacb658eb1bfc15c8ca4dfeecc1cf84eb79.zip | |
s3: Make is_zero_addr take a sockaddr_storage
All callers had to cast this anyway
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sun Feb 27 11:02:53 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/libsmb/namequery.c')
| -rw-r--r-- | source3/libsmb/namequery.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 0da495dbb9..9bc6911942 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -1079,7 +1079,7 @@ static int remove_duplicate_addrs2(struct ip_service *iplist, int count ) /* one loop to remove duplicates */ for ( i=0; i<count; i++ ) { - if ( is_zero_addr((struct sockaddr *)&iplist[i].ss)) { + if ( is_zero_addr(&iplist[i].ss)) { continue; } @@ -1094,7 +1094,7 @@ static int remove_duplicate_addrs2(struct ip_service *iplist, int count ) /* one loop to clean up any holes we left */ /* first ip should never be a zero_ip() */ for (i = 0; i<count; ) { - if (is_zero_addr((struct sockaddr *)&iplist[i].ss) ) { + if (is_zero_addr(&iplist[i].ss) ) { if (i != count-1) { memmove(&iplist[i], &iplist[i+1], (count - i - 1)*sizeof(iplist[i])); @@ -1921,7 +1921,7 @@ static NTSTATUS resolve_ads(const char *name, * for falling back to netbios lookups is that our DNS server * doesn't know anything about the DC's -- jerry */ - if (!is_zero_addr((struct sockaddr *)&r->ss)) { + if (!is_zero_addr(&r->ss)) { (*return_count)++; } } @@ -2151,7 +2151,7 @@ bool resolve_name(const char *name, if (prefer_ipv4) { for (i=0; i<count; i++) { - if (!is_zero_addr((struct sockaddr *)&ss_list[i].ss) && + if (!is_zero_addr(&ss_list[i].ss) && !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss) && (ss_list[i].ss.ss_family == AF_INET)) { *return_ss = ss_list[i].ss; @@ -2164,7 +2164,7 @@ bool resolve_name(const char *name, /* only return valid addresses for TCP connections */ for (i=0; i<count; i++) { - if (!is_zero_addr((struct sockaddr *)&ss_list[i].ss) && + if (!is_zero_addr(&ss_list[i].ss) && !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss)) { *return_ss = ss_list[i].ss; SAFE_FREE(ss_list); @@ -2228,7 +2228,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx, /* only return valid addresses for TCP connections */ for (i=0, num_entries = 0; i<count; i++) { - if (!is_zero_addr((struct sockaddr *)&ss_list[i].ss) && + if (!is_zero_addr(&ss_list[i].ss) && !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss)) { num_entries++; } @@ -2247,7 +2247,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx, } for (i=0, num_entries = 0; i<count; i++) { - if (!is_zero_addr((struct sockaddr *)&ss_list[i].ss) && + if (!is_zero_addr(&ss_list[i].ss) && !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss)) { (*return_ss_arr)[num_entries++] = ss_list[i].ss; } |