summaryrefslogtreecommitdiff
path: root/source4/libcli/resolve
diff options
context:
space:
mode:
Diffstat (limited to 'source4/libcli/resolve')
-rw-r--r--source4/libcli/resolve/resolve.c22
-rw-r--r--source4/libcli/resolve/resolve.h1
-rw-r--r--source4/libcli/resolve/resolve_lp.c46
3 files changed, 47 insertions, 22 deletions
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index fe36aa59ea..33ace09443 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -228,26 +228,4 @@ void make_nbt_name_server(struct nbt_name *nbt, const char *name)
make_nbt_name(nbt, name, NBT_NAME_SERVER);
}
-struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
-{
- const char **methods = lp_name_resolve_order(lp_ctx);
- int i;
- struct resolve_context *ret = resolve_context_init(lp_ctx);
-
- if (ret == NULL)
- return NULL;
-
- for (i = 0; methods != NULL && methods[i] != NULL; i++) {
- if (!strcmp(methods[i], "wins")) {
- resolve_context_add_wins_method(ret, lp_wins_server_list(lp_ctx));
- } else if (!strcmp(methods[i], "bcast")) {
- resolve_context_add_bcast_method(ret, lp_ctx);
- } else if (!strcmp(methods[i], "host")) {
- resolve_context_add_host_method(ret);
- } else {
- DEBUG(0, ("Unknown resolve method '%s'\n", methods[i]));
- }
- }
- return ret;
-}
diff --git a/source4/libcli/resolve/resolve.h b/source4/libcli/resolve/resolve.h
index 73cb78c124..9282074aa4 100644
--- a/source4/libcli/resolve/resolve.h
+++ b/source4/libcli/resolve/resolve.h
@@ -26,5 +26,6 @@
typedef struct composite_context *(*resolve_name_send_fn)(TALLOC_CTX *mem_ctx, struct event_context *, void *privdata, struct nbt_name *);
typedef NTSTATUS (*resolve_name_recv_fn)(struct composite_context *, TALLOC_CTX *, const char **);
#include "libcli/resolve/proto.h"
+#include "libcli/resolve/lp_proto.h"
#endif /* __RESOLVE_H__ */
diff --git a/source4/libcli/resolve/resolve_lp.c b/source4/libcli/resolve/resolve_lp.c
new file mode 100644
index 0000000000..5a506dca8b
--- /dev/null
+++ b/source4/libcli/resolve/resolve_lp.c
@@ -0,0 +1,46 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+ Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/resolve/resolve.h"
+#include "param/param.h"
+
+struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
+{
+ const char **methods = lp_name_resolve_order(lp_ctx);
+ int i;
+ struct resolve_context *ret = resolve_context_init(lp_ctx);
+
+ if (ret == NULL)
+ return NULL;
+
+ for (i = 0; methods != NULL && methods[i] != NULL; i++) {
+ if (!strcmp(methods[i], "wins")) {
+ resolve_context_add_wins_method(ret, lp_wins_server_list(lp_ctx));
+ } else if (!strcmp(methods[i], "bcast")) {
+ resolve_context_add_bcast_method(ret, lp_ctx);
+ } else if (!strcmp(methods[i], "host")) {
+ resolve_context_add_host_method(ret);
+ } else {
+ DEBUG(0, ("Unknown resolve method '%s'\n", methods[i]));
+ }
+ }
+
+ return ret;
+}