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/libsmb_server.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/libsmb/libsmb_server.c')

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$", "?????",
-- 
cgit