From 1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e Mon Sep 17 00:00:00 2001
From: Tim Prouty <tprouty@samba.org>
Date: Tue, 2 Dec 2008 23:29:57 -0800
Subject: s3: Change sockaddr util function names for consistency

Also eliminates name conflicts with OneFS system libraries
---
 source3/libsmb/cliconnect.c    |  2 +-
 source3/libsmb/clidfs.c        |  4 ++--
 source3/libsmb/libsmb_server.c |  6 +++---
 source3/libsmb/namequery.c     | 10 +++++-----
 source3/libsmb/namequery_dc.c  |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'source3/libsmb')

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 8b7ac7d718..b063475f4e 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1623,7 +1623,7 @@ NTSTATUS cli_start_connection(struct cli_state **output_cli,
 	if (dest_ss) {
 		ss = *dest_ss;
 	} else {
-		zero_addr(&ss);
+		zero_sockaddr(&ss);
 	}
 
 again:
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 7b63f9535e..35922b13e9 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -144,13 +144,13 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
 
 	server_n = server;
 
-	zero_addr(&ss);
+	zero_sockaddr(&ss);
 
 	make_nmb_name(&calling, global_myname(), 0x0);
 	make_nmb_name(&called , server, name_type);
 
  again:
-	zero_addr(&ss);
+	zero_sockaddr(&ss);
 	if (have_ip)
 		ss = dest_ss;
 
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index aeec255350..5e37871deb 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -248,7 +248,7 @@ SMBC_server(TALLOC_CTX *ctx,
         const char *username_used;
  	NTSTATUS status;
 
-	zero_addr(&ss);
+	zero_sockaddr(&ss);
 	ZERO_STRUCT(c);
 
 	if (server[0] == 0) {
@@ -348,7 +348,7 @@ SMBC_server(TALLOC_CTX *ctx,
 
 again:
 
-	zero_addr(&ss);
+	zero_sockaddr(&ss);
 
 	/* have to open a new connection */
 	if ((c = cli_initialise()) == NULL) {
@@ -595,7 +595,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
                         flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
                 }
 
-                zero_addr(&ss);
+                zero_sockaddr(&ss);
                 nt_status = cli_full_connection(&ipc_cli,
 						global_myname(), server,
 						&ss, 0, "IPC$", "?????",
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) {
diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c
index 306f720a02..7b0748f86b 100644
--- a/source3/libsmb/namequery_dc.c
+++ b/source3/libsmb/namequery_dc.c
@@ -134,7 +134,7 @@ static bool ads_dc_name(const char *domain,
 #ifdef HAVE_ADS
 	*dc_ss = ads->ldap.ss;
 #else
-	zero_addr(dc_ss);
+	zero_sockaddr(dc_ss);
 #endif
 	ads_destroy(&ads);
 
@@ -217,7 +217,7 @@ bool get_dc_name(const char *domain,
 	bool ret;
 	bool our_domain = False;
 
-	zero_addr(&dc_ss);
+	zero_sockaddr(&dc_ss);
 
 	ret = False;
 
-- 
cgit