Merge branch 'master' of ssh://git.samba.org/data/git/abartlet/samba into extended...

[abartlet/samba.git/.git] / source3 / libsmb / namequery.c

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index e6eed8289e097593761959043561b80ec0fdd34d..bcf849b795cc0aa44bfb45d3bc957ce5a034d8f6 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -331,7 +331,7 @@ bool name_status_find(const char *q_name,
 
        if (!interpret_string_addr(&ss, lp_socket_address(),
                                AI_NUMERICHOST|AI_PASSIVE)) {
-               zero_addr(&ss);
+               zero_sockaddr(&ss);
        }
 
        sock = open_socket_in(SOCK_DGRAM, 0, 3, &ss, True);
@@ -526,9 +526,9 @@ static int remove_duplicate_addrs2(struct ip_service *iplist, int count )
                }
 
                for ( j=i+1; j<count; j++ ) {
-                       if (addr_equal((struct sockaddr *)&iplist[i].ss, (struct sockaddr *)&iplist[j].ss) &&
+                       if (sockaddr_equal((struct sockaddr *)&iplist[i].ss, (struct sockaddr *)&iplist[j].ss) &&
                                        iplist[i].port == iplist[j].port) {
-                               zero_addr(&iplist[j].ss);
+                               zero_sockaddr(&iplist[j].ss);
                        }
                }
        }
@@ -954,7 +954,7 @@ NTSTATUS name_resolve_bcast(const char *name,
 
        if (!interpret_string_addr(&ss, lp_socket_address(),
                                AI_NUMERICHOST|AI_PASSIVE)) {
-               zero_addr(&ss);
+               zero_sockaddr(&ss);
        }
 
        sock = open_socket_in( SOCK_DGRAM, 0, 3, &ss, true );
@@ -1042,7 +1042,7 @@ NTSTATUS resolve_wins(const char *name,
        /* the address we will be sending from */
        if (!interpret_string_addr(&src_ss, lp_socket_address(),
                                AI_NUMERICHOST|AI_PASSIVE)) {
-               zero_addr(&src_ss);
+               zero_sockaddr(&src_ss);
        }
 
        if (src_ss.ss_family != AF_INET) {