summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-12-11 09:01:56 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:21 +0100
commit6a56c111d7a08e5add115edcdc81653cc19d3a4c (patch)
tree18b045887516eab5813aee7728baaaec090d8a85
parentbb02fcda5a8704351afcc93171202f8ad342e05e (diff)
downloadsamba-6a56c111d7a08e5add115edcdc81653cc19d3a4c.tar.gz
samba-6a56c111d7a08e5add115edcdc81653cc19d3a4c.tar.bz2
samba-6a56c111d7a08e5add115edcdc81653cc19d3a4c.zip
r26391: samba4 doesn't support 'lmhosts' as resolve module
metze (This used to be commit cdb64b41018928122898257f65d2573109b473cc)
-rw-r--r--source4/libcli/resolve/resolve.c2
-rw-r--r--source4/param/loadparm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index ad2d58a64c..fe36aa59ea 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -245,7 +245,7 @@ struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
} else if (!strcmp(methods[i], "host")) {
resolve_context_add_host_method(ret);
} else {
- DEBUG(0, ("Unknown resolve method '%s'", methods[i]));
+ DEBUG(0, ("Unknown resolve method '%s'\n", methods[i]));
}
}
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 564dede3a5..07b8cbbdf4 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2270,7 +2270,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
myname = get_myname();
lp_do_global_parameter(lp_ctx, "netbios name", myname);
SAFE_FREE(myname);
- lp_do_global_parameter(lp_ctx, "name resolve order", "lmhosts wins host bcast");
+ lp_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast");
lp_do_global_parameter(lp_ctx, "fstype", FSTYPE_STRING);
lp_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");