diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-26 01:11:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:49 -0500 |
| commit | 2a90c448bd0c4f05038f0936aa0b3390b275c6dc (patch) | |
| tree | 33a325d8b93c3c0137a32af15ef678a72dd62bc9 /source4/param | |
| parent | 244882311bc93f0bee325901b082420a96f3f798 (diff) | |
| download | samba-2a90c448bd0c4f05038f0936aa0b3390b275c6dc.tar.gz samba-2a90c448bd0c4f05038f0936aa0b3390b275c6dc.tar.bz2 samba-2a90c448bd0c4f05038f0936aa0b3390b275c6dc.zip | |
r7916: - got rid of the in_client global
- make not finding smb.conf a level 1 message, not level 0. Most of our
tools handle no smb.conf, and those that don't should check for the
specific parameters they need, or use the defaults
(This used to be commit 8c17b61f8e0f6eefa6a1f853abc06d023627bbbb)
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); |