diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-12-02 23:29:57 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2008-12-03 10:40:20 -0800 |
| commit | 1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e (patch) | |
| tree | a43eb854b68ef6d65d6120d5ec0441bc26ea9612 /source3/libsmb/namequery.c | |
| parent | fcbf88115c217cfe5090f8d60ab7627681c648c8 (diff) | |
| download | samba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.tar.gz samba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.tar.bz2 samba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.zip | |
s3: Change sockaddr util function names for consistency
Also eliminates name conflicts with OneFS system libraries
Diffstat (limited to 'source3/libsmb/namequery.c')
| -rw-r--r-- | source3/libsmb/namequery.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index e6eed8289e..bcf849b795 100644 --- 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) { |