From fec0baacb658eb1bfc15c8ca4dfeecc1cf84eb79 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sun, 27 Feb 2011 09:57:18 +0100
Subject: 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
---
 source3/libsmb/cliconnect.c   |  2 +-
 source3/libsmb/dsgetdcname.c  |  2 +-
 source3/libsmb/namequery.c    | 14 +++++++-------
 source3/libsmb/namequery_dc.c |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source3/libsmb')

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 25df2b2b4e..564cf8b3c7 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2433,7 +2433,7 @@ NTSTATUS cli_connect(struct cli_state *cli,
 		*p = 0;
 	}
 
-	if (!dest_ss || is_zero_addr((struct sockaddr *)dest_ss)) {
+	if (!dest_ss || is_zero_addr(dest_ss)) {
 		NTSTATUS status =resolve_name_list(frame,
 					cli->desthost,
 					name_type,
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index cc486c122e..e062818dda 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -629,7 +629,7 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
 		 * back to netbios lookups is that our DNS server doesn't know
 		 * anything about the DC's   -- jerry */
 
-		if (!is_zero_addr((struct sockaddr *)(void *)&r->ss)) {
+		if (!is_zero_addr(&r->ss)) {
 			count++;
 			continue;
 		}
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;
 		}
diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c
index 23850e3e9f..39b780c611 100644
--- a/source3/libsmb/namequery_dc.c
+++ b/source3/libsmb/namequery_dc.c
@@ -176,7 +176,7 @@ static bool rpc_dc_name(const char *domain,
 	/* Remove the entry we've already failed with (should be the PDC). */
 
 	for (i = 0; i < count; i++) {
-		if (is_zero_addr((struct sockaddr *)&ip_list[i].ss))
+		if (is_zero_addr(&ip_list[i].ss))
 			continue;
 
 		if (name_status_find(domain, 0x1c, 0x20, &ip_list[i].ss, srv_name)) {
-- 
cgit