r4891: - added a generic resolve_name() async interface in libcli/resolve/,

   which will eventually try all resolution methods setup in smb.conf

 - only resolution backend at the moment is bcast, which does a
   parallel broadcast to all configured network interfaces, and takes
   the first reply that comes in (this nicely demonstrates how to do
   parallel requests using the async APIs)

 - converted all the existing code to use the new resolve_name() api

 - removed all the old nmb code (yay!)
(This used to be commit 239c310f255e43dd2d1c2433f666c9faaacbdce3)

1 files changed, 11 insertions, 5 deletions

diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 0edb95e1a1..e981049535 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -326,10 +326,11 @@ resolve a hostname and connect
 ****************************************************************************/
 BOOL smbcli_sock_connect_byname(struct smbcli_socket *sock, const char *host, int port)
 {
-	int name_type = 0x20;
-	struct ipv4_addr ip;
-	char *name, *p;
+	int name_type = NBT_NAME_SERVER;
+	const char *address;
 	NTSTATUS status;
+	struct nbt_name nbt_name;
+	char *name, *p;
 
 	name = talloc_strdup(sock, host);
 
@@ -339,13 +340,18 @@ BOOL smbcli_sock_connect_byname(struct smbcli_socket *sock, const char *host, in
 		*p = 0;
 	}
 
-	if (!resolve_name(name, name, &ip, name_type)) {
+	nbt_name.name = name;
+	nbt_name.type = name_type;
+	nbt_name.scope = NULL;
+	
+	status = resolve_name(&nbt_name, sock, &address);
+	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
 
 	sock->hostname = name;
 
-	status = smbcli_sock_connect(sock, sys_inet_ntoa(ip), port);
+	status = smbcli_sock_connect(sock, address, port);
 
 	return NT_STATUS_IS_OK(status);
 }