From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 26 Apr 2010 11:38:00 +0000 (+0200)
Subject: s4:ntvfs: remove socket_address based functions
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=d94c94fcb94ae0dfd221b5c807ec310f9c0fd8ed;p=abartlet%2Fsamba.git%2F.git

s4:ntvfs: remove socket_address based functions

metze
---

diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index 5b551cd3450..02281e749ca 100644
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -209,9 +209,6 @@ struct ntvfs_context {
 	} oplock;
 
 	struct {
-		void *private_data;
-		struct socket_address *(*get_my_addr)(void *private_data, TALLOC_CTX *mem_ctx);
-		struct socket_address *(*get_peer_addr)(void *private_data, TALLOC_CTX *mem_ctx);
 		const struct tsocket_address *local_address;
 		const struct tsocket_address *remote_address;
 	} client;
diff --git a/source4/ntvfs/ntvfs_interface.c b/source4/ntvfs/ntvfs_interface.c
index c743126d24b..608db134178 100644
--- a/source4/ntvfs/ntvfs_interface.c
+++ b/source4/ntvfs/ntvfs_interface.c
@@ -711,32 +711,3 @@ NTSTATUS ntvfs_send_oplock_break(struct ntvfs_module_context *ntvfs,
 	return ntvfs->ctx->oplock.handler(ntvfs->ctx->oplock.private_data, handle, level);
 }
 
-/* client connection callback */
-NTSTATUS ntvfs_set_addr_callbacks(struct ntvfs_context *ntvfs,
-					   struct socket_address *(*my_addr)(void *private_data, TALLOC_CTX *mem_ctx),
-					   struct socket_address *(*peer_addr)(void *private_data, TALLOC_CTX *mem_ctx),
-					   void *private_data)
-{
-	ntvfs->client.get_peer_addr	= my_addr;
-	ntvfs->client.get_my_addr	= peer_addr;
-	ntvfs->client.private_data	= private_data;
-	return NT_STATUS_OK;
-}
-
-struct socket_address *ntvfs_get_my_addr(struct ntvfs_module_context *ntvfs, TALLOC_CTX *mem_ctx)
-{
-	if (!ntvfs->ctx->client.get_my_addr) {
-		return NULL;
-	}
-
-	return ntvfs->ctx->client.get_my_addr(ntvfs->ctx->client.private_data, mem_ctx);
-}
-
-struct socket_address *ntvfs_get_peer_addr(struct ntvfs_module_context *ntvfs, TALLOC_CTX *mem_ctx)
-{
-	if (!ntvfs->ctx->client.get_peer_addr) {
-		return NULL;
-	}
-
-	return ntvfs->ctx->client.get_peer_addr(ntvfs->ctx->client.private_data, mem_ctx);
-}