Merge branch 'master' of git://git.samba.org/samba

3 files changed, 4 insertions, 4 deletions

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index fbb3c24b03..a9b2bbe621 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -406,7 +406,7 @@ bool net_find_server(struct net_context *c,
 			return false;
 		}
 
-		if (is_zero_addr(&pdc_ss)) {
+		if (is_zero_addr((struct sockaddr *)&pdc_ss)) {
 			return false;
 		}
 
@@ -463,7 +463,7 @@ bool net_find_pdc(struct sockaddr_storage *server_ss,
 	if (!get_pdc_ip(domain_name, server_ss)) {
 		return false;
 	}
-	if (is_zero_addr(server_ss)) {
+	if (is_zero_addr((struct sockaddr *)server_ss)) {
 		return false;
 	}
 
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 45da3f1e88..63c9a34dd8 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -332,7 +332,7 @@ int main(int argc,char *argv[])
 
 		if(lookup_by_ip) {
 			struct sockaddr_storage ss;
-			(void)interpret_addr2(&ip, lookup);
+			ip = interpret_addr2(lookup);
 			in_addr_to_sockaddr_storage(&ss, ip);
 			fstrcpy(lookup,"*");
 			do_node_status(ServerFD, lookup, lookup_type, &ss);
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 750030d916..9d571f7ee3 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1129,7 +1129,7 @@ static bool do_nodestatus(struct messaging_context *msg_ctx,
 
 	ZERO_STRUCT(p);
 
-	(void)interpret_addr2(&p.ip, argv[1]);
+	p.ip = interpret_addr2(argv[1]);
 	p.port = 137;
 	p.packet_type = NMB_PACKET;