summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2001-08-26 18:26:40 +0000
committerVolker Lendecke <vlendec@samba.org>2001-08-26 18:26:40 +0000
commitb7c11f6295efc8c1dca141f3b7a9910d4708d52b (patch)
tree57b7cfdd2186c32aac8b956f65c87ffb085c0163
parent7c09aa553da2f0b855e96396c13d854968537c30 (diff)
downloadsamba-b7c11f6295efc8c1dca141f3b7a9910d4708d52b.tar.gz
samba-b7c11f6295efc8c1dca141f3b7a9910d4708d52b.tar.xz
samba-b7c11f6295efc8c1dca141f3b7a9910d4708d52b.zip
Change default 'name resolve order' to WINS before DNS.
Volker (This used to be commit 5fc8c51983f36b0b2bbb2704a522026dc64d0b65)
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml2
-rw-r--r--source3/param/loadparm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 7456ba6e83a..08938fa1532 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -4577,7 +4577,7 @@
connected subnet.</para></listitem>
</itemizedlist>
- <para>Default: <command>name resolve order = lmhosts host wins bcast
+ <para>Default: <command>name resolve order = lmhosts wins host bcast
</command></para>
<para>Example: <command>name resolve order = lmhosts bcast host
</command></para>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a8365af0eb9..c69e2364080 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1208,7 +1208,7 @@ static void init_globals(void)
string_set(&Globals.szLogonHome, "\\\\%N\\%U");
string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile");
- string_set(&Globals.szNameResolveOrder, "lmhosts host wins bcast");
+ string_set(&Globals.szNameResolveOrder, "lmhosts wins host bcast");
Globals.bLoadPrinters = True;
Globals.bUseRhosts = False;