summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b0b793df60..ad8e27be98 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -67,6 +67,7 @@
BOOL in_client = False; /* Not in the client by default */
BOOL bLoaded = False;
+BOOL in_client = False;
extern int DEBUGLEVEL;
extern pstring user_socket_options;
@@ -2485,8 +2486,10 @@ BOOL lp_load(char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc)
set_default_server_announce_type();
- /* We set a WINS server address of 127.0.0.1 if we are in the client */
- /* and we have WINS support enabled */
+ bLoaded = True;
+
+ /* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */
+ /* if bWINSsupport is true and we are in the client */
if (in_client && Globals.bWINSsupport) {
@@ -2494,8 +2497,6 @@ BOOL lp_load(char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc)
}
- bLoaded = True;
-
return (bRetval);
}