s4:ntvfs: remove socket_address based functions

metze

diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index 5b551cd3450c6ee3f58988d59d7d6b4d009ff9ca..02281e749cafed9e9e51d31dec3041f997808785 100644 (file)
--- 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 c743126d24b7c10c432e519eddfd07405fdf10b2..608db134178c32f7571f42dab5d538e2d8d2befb 100644 (file)
--- 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);
-}