From c8565c0e7acc6febf1b4015bde6baa1c5b7adddc Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 13 Dec 2008 10:57:44 +0100
Subject: [PATCH] s4:libcli/resolve: remove all backend specific sync functions

metze
---
 source4/libcli/resolve/bcast.c   | 20 --------------------
 source4/libcli/resolve/host.c    | 11 -----------
 source4/libcli/resolve/nbtlist.c | 20 --------------------
 source4/libcli/resolve/resolve.c | 13 -------------
 source4/libcli/resolve/wins.c    | 21 ---------------------
 5 files changed, 85 deletions(-)

diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c
index 0a71ebed991..a572e873fcd 100644
--- a/source4/libcli/resolve/bcast.c
+++ b/source4/libcli/resolve/bcast.c
@@ -85,26 +85,6 @@ NTSTATUS resolve_name_bcast_recv(struct composite_context *c,
 	return status;
 }
 
-/*
-  broadcast name resolution method - sync call
- */
-NTSTATUS resolve_name_bcast(struct nbt_name *name, 
-			    TALLOC_CTX *mem_ctx,
-			    struct interface *ifaces,
-			    uint16_t nbt_port,
-			    int nbt_timeout,
-			    struct socket_address ***addrs)
-{
-	struct resolve_bcast_data *data = talloc(mem_ctx, struct resolve_bcast_data);
-	struct composite_context *c;
-	data->ifaces = talloc_reference(data, ifaces);
-	data->nbt_port = nbt_port;
-	data->nbt_timeout = nbt_timeout;
-	
-	c = resolve_name_bcast_send(mem_ctx, NULL, data, name);
-	return resolve_name_bcast_recv(c, mem_ctx, addrs);
-}
-
 bool resolve_context_add_bcast_method(struct resolve_context *ctx, struct interface *ifaces, uint16_t nbt_port, int nbt_timeout)
 {
 	struct resolve_bcast_data *data = talloc(ctx, struct resolve_bcast_data);
diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index 1fbee7e22cc..2facb543626 100644
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -51,17 +51,6 @@ NTSTATUS resolve_name_host_recv(struct composite_context *c,
 	return resolve_name_dns_ex_recv(c, mem_ctx, addrs);
 }
 
-/*
-  getaddrinfo() name resolution method - sync call
- */
-NTSTATUS resolve_name_host(struct nbt_name *name, 
-			    TALLOC_CTX *mem_ctx,
-			    struct socket_address ***addrs)
-{
-	struct composite_context *c = resolve_name_host_send(mem_ctx, NULL, NULL, name);
-	return resolve_name_host_recv(c, mem_ctx, addrs);
-}
-
 bool resolve_context_add_host_method(struct resolve_context *ctx)
 {
 	return resolve_context_add_method(ctx, resolve_name_host_send, resolve_name_host_recv,
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index 9c53fcb7ecd..76721e2af52 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -195,23 +195,3 @@ NTSTATUS resolve_name_nbtlist_recv(struct composite_context *c,
 	return status;
 }
 
-/*
-  nbt list of addresses name resolution method - sync call
- */
-NTSTATUS resolve_name_nbtlist(struct nbt_name *name, 
-			      TALLOC_CTX *mem_ctx,
-			      const char **address_list,
-			      struct interface *ifaces, 
-			      uint16_t nbt_port,
-			      int nbt_timeout,
-			      bool broadcast, bool wins_lookup,
-			      struct socket_address ***addrs)
-{
-	struct composite_context *c = resolve_name_nbtlist_send(mem_ctx, NULL, 
-								name, address_list, 
-								ifaces, nbt_port,
-								nbt_timeout,
-							        broadcast, wins_lookup);
-	return resolve_name_nbtlist_recv(c, mem_ctx, addrs);
-}
-
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index 12764e1084c..68b806506da 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -199,19 +199,6 @@ NTSTATUS resolve_name_all_recv(struct composite_context *c,
 	return status;
 }
 
-/*
-  general name resolution - sync call
- */
-NTSTATUS resolve_all_name(struct resolve_context *ctx,
-		      struct nbt_name *name,
-		      TALLOC_CTX *mem_ctx,
-		      struct socket_address ***addrs,
-		      struct event_context *ev)
-{
-	struct composite_context *c = resolve_name_all_send(ctx, name, ev);
-	return resolve_name_all_recv(c, mem_ctx, addrs);
-}
-
 struct composite_context *resolve_name_send(struct resolve_context *ctx,
 					    struct nbt_name *name,
 					    struct event_context *event_ctx)
diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c
index ae142f70548..ba25b6c5c96 100644
--- a/source4/libcli/resolve/wins.c
+++ b/source4/libcli/resolve/wins.c
@@ -57,27 +57,6 @@ NTSTATUS resolve_name_wins_recv(struct composite_context *c,
 	return resolve_name_nbtlist_recv(c, mem_ctx, addrs);
 }
 
-/*
-  wins name resolution method - sync call
- */
-NTSTATUS resolve_name_wins(struct nbt_name *name, 
-			    TALLOC_CTX *mem_ctx,
-			    const char **address_list,
-			    struct interface *ifaces,
-			    uint16_t nbt_port,
-			    int nbt_timeout,
-			    struct socket_address ***addrs)
-{
-	struct composite_context *c;
-	struct resolve_wins_data *wins_data = talloc(mem_ctx, struct resolve_wins_data);
-	wins_data->address_list = address_list;
-	wins_data->ifaces = ifaces;
-	wins_data->nbt_port = nbt_port;
-	wins_data->nbt_timeout = nbt_timeout;
-	c = resolve_name_wins_send(mem_ctx, NULL, wins_data, name);
-	return resolve_name_wins_recv(c, mem_ctx, addrs);
-}
-
 bool resolve_context_add_wins_method(struct resolve_context *ctx, const char **address_list, struct interface *ifaces, uint16_t nbt_port, int nbt_timeout)
 {
 	struct resolve_wins_data *wins_data = talloc(ctx, struct resolve_wins_data);
-- 
2.34.1