diff options
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 5 | ||||
| -rw-r--r-- | source4/param/params.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 80f7709280..d968157a3a 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -65,7 +65,6 @@ #include "dlinklist.h" #include "param/loadparm.h" -BOOL in_client = False; /* Not in the client by default */ static BOOL bLoaded = False; #ifndef GLOBAL_NAME @@ -3025,9 +3024,7 @@ BOOL lp_load(const char *pszFname) 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) { + if (Globals.bWINSsupport) { lp_do_parameter(-1, "wins server", "127.0.0.1"); } diff --git a/source4/param/params.c b/source4/param/params.c index 1b5b02cfa3..34d537c395 100644 --- a/source4/param/params.c +++ b/source4/param/params.c @@ -518,8 +518,6 @@ static myFILE *OpenConfFile( const char *FileName ) */ { const char *func = "params.c:OpenConfFile() -"; - extern BOOL in_client; - int lvl = in_client?1:0; myFILE *ret; ret = malloc_p(myFILE); @@ -528,7 +526,7 @@ static myFILE *OpenConfFile( const char *FileName ) ret->buf = file_load(FileName, &ret->size); if( NULL == ret->buf ) { - DEBUG( lvl, + DEBUG( 1, ("%s Unable to open configuration file \"%s\":\n\t%s\n", func, FileName, strerror(errno)) ); SAFE_FREE(ret); |