summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-22 23:03:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:40 -0500
commit2cd2c87e889d7a852e3fe94e37c18fe60daf7b9c (patch)
tree57b1f40a32f727cc3fa0866259c64a440df65b9d /source4
parentac4ee3e20b3823bb7b6cb35ce8855b8313f0fa8d (diff)
downloadsamba-2cd2c87e889d7a852e3fe94e37c18fe60daf7b9c.tar.gz
samba-2cd2c87e889d7a852e3fe94e37c18fe60daf7b9c.tar.bz2
samba-2cd2c87e889d7a852e3fe94e37c18fe60daf7b9c.zip
r12442: only set the "wins server" parameter if it's not set
metze (This used to be commit 5054890b6871f1e25938ae76a2d660ce168877e8)
Diffstat (limited to 'source4')
-rw-r--r--source4/param/loadparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 361450821a..290dd361e8 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2401,7 +2401,7 @@ BOOL lp_load(void)
bLoaded = True;
- if (Globals.bWINSsupport) {
+ if (!Globals.szWINSservers && Globals.bWINSsupport) {
lp_do_parameter(-1, "wins server", "127.0.0.1");
}