diff options
| -rw-r--r-- | source3/client/client.c | 3 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 436b0c3c7c..a6a3be7338 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -27,6 +27,7 @@ #define REGISTER 0 #endif +extern BOOL in_client; pstring cur_dir = "\\"; pstring cd_path = ""; extern BOOL in_client; @@ -3790,7 +3791,7 @@ static void usage(char *pname) DEBUG(0,("Failed to get my hostname.\n")); } - in_client = True; + in_client = True; /* Make sure that we tell lp_load we are */ if (!lp_load(servicesf,True,False,False)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf); 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); } |