s4-libcli: Remove obsolete support for file resolving.

[obnox/samba/samba-obnox.git] / source4 / libcli / resolve / resolve_lp.c

diff --git a/source4/libcli/resolve/resolve_lp.c b/source4/libcli/resolve/resolve_lp.c
index 887e0d543e4e7ec0b21e4a89b0d58941ec22976f..56c7b0120d02ec106ac4d3a6e226ecae90409a45 100644 (file)
--- a/source4/libcli/resolve/resolve_lp.c
+++ b/source4/libcli/resolve/resolve_lp.c
@@ -21,9 +21,9 @@
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
 
-struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
+struct resolve_context *lpcfg_resolve_context(struct loadparm_context *lp_ctx)
 {
-       const char **methods = lp_name_resolve_order(lp_ctx);
+       const char **methods = lpcfg_name_resolve_order(lp_ctx);
        int i;
        struct resolve_context *ret = resolve_context_init(lp_ctx);
 
@@ -32,11 +32,15 @@ struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
 
        for (i = 0; methods != NULL && methods[i] != NULL; i++) {
                if (!strcmp(methods[i], "wins")) {
-                       resolve_context_add_wins_method_lp(ret, lp_ctx);
+                       if (lpcfg_disable_netbios(lp_ctx) == false) {
+                               resolve_context_add_wins_method_lp(ret, lp_ctx);
+                       }
                } else if (!strcmp(methods[i], "bcast")) {
-                       resolve_context_add_bcast_method_lp(ret, lp_ctx);
-               } else if (!strcmp(methods[i], "file")) {
-                       resolve_context_add_file_method_lp(ret, lp_ctx);
+                       if (lpcfg_disable_netbios(lp_ctx) == false) {
+                               resolve_context_add_bcast_method_lp(ret, lp_ctx);
+                       }
+               } else if (!strcmp(methods[i], "lmhosts")) {
+                       resolve_context_add_lmhosts_method(ret);
                } else if (!strcmp(methods[i], "host")) {
                        resolve_context_add_host_method(ret);
                } else {