summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/param/loadparm.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8e222f5da5..259bb74581 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -809,9 +809,7 @@ static void init_globals(void)
/* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */
string_set(&Globals.szLogonHome, "\\\\%N\\%U");
string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile");
- /* Set szWINSserver to 127.0.0.1 so that we have something reasonable */
- /* in case it is not set in the smb.conf */
- string_set(&Globals.szWINSserver, "127.0.0.1");
+
string_set(&Globals.szNameResolveOrder, "lmhosts host wins bcast");
Globals.bLoadPrinters = True;
@@ -2484,6 +2482,15 @@ BOOL lp_load(char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc)
bLoaded = True;
+ /* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */
+ /* if bWINSsupport is True */
+
+ if (Globals.bWINSsupport) {
+
+ string_set(&Globals.szWINSserver, "127.0.0.1");
+
+ }
+
return (bRetval);
}