From 7261a9b9f76d19e6a2179a48e903e2fee4ee64a1 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 16:36:48 +1000 Subject: s4-libcli Remove resolve_name() as it conflicts with Samba3. This was just a wrapper around resolve_name_ex(), so just call that instead. Andrew Bartlett --- source4/libcli/raw/clisocket.c | 2 +- source4/libcli/resolve/resolve.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'source4/libcli') diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c index 84bf250f6a..bf608f1ec1 100644 --- a/source4/libcli/raw/clisocket.c +++ b/source4/libcli/raw/clisocket.c @@ -229,7 +229,7 @@ _PUBLIC_ struct smbcli_socket *smbcli_sock_connect_byname(const char *host, cons make_nbt_name(&nbt_name, host, name_type); - status = resolve_name(resolve_ctx, &nbt_name, tmp_ctx, &address, event_ctx); + status = resolve_name_ex(resolve_ctx, 0, 0, &nbt_name, tmp_ctx, &address, event_ctx); if (!NT_STATUS_IS_OK(status)) { talloc_free(tmp_ctx); return NULL; diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c index c17e93a1f6..ef61c38f79 100644 --- a/source4/libcli/resolve/resolve.c +++ b/source4/libcli/resolve/resolve.c @@ -316,18 +316,6 @@ NTSTATUS resolve_name_ex(struct resolve_context *ctx, } -/* - general name resolution - sync call - */ -NTSTATUS resolve_name(struct resolve_context *ctx, - struct nbt_name *name, - TALLOC_CTX *mem_ctx, - const char **reply_addr, - struct tevent_context *ev) -{ - return resolve_name_ex(ctx, 0, 0, name, mem_ctx, reply_addr, ev); -} - /* Initialise a struct nbt_name with a NULL scope */ void make_nbt_name(struct nbt_name *nbt, const char *name, int type) -- cgit