diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-10-05 02:55:53 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-10-05 02:55:53 +0000 |
| commit | ca3d1b9bf01a56755a5c248a808ffafdce3e1a82 (patch) | |
| tree | 4273ef4002ee361db00ed1d5412ac6795016c02b /source3 | |
| parent | ecb7ee7a034961a38a2922f481a3235c615903bd (diff) | |
| download | samba-ca3d1b9bf01a56755a5c248a808ffafdce3e1a82.tar.gz samba-ca3d1b9bf01a56755a5c248a808ffafdce3e1a82.tar.bz2 samba-ca3d1b9bf01a56755a5c248a808ffafdce3e1a82.zip | |
removed requirement of having a smb.conf for smbwrapper to work.
(This used to be commit af58bf2ff8ddbf974dbafa36cf1b679226371e09)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/params.c | 6 | ||||
| -rw-r--r-- | source3/smbwrapper/smbw.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/param/params.c b/source3/param/params.c index 2a0a253f20..2f54b72131 100644 --- a/source3/param/params.c +++ b/source3/param/params.c @@ -490,17 +490,19 @@ static FILE *OpenConfFile( char *FileName ) { FILE *OpenedFile; char *func = "params.c:OpenConfFile() -"; + extern BOOL in_client; + int lvl = in_client?1:0; if( NULL == FileName || 0 == *FileName ) { - DEBUG( 0, ("%s No configuration filename specified.\n", func) ); + DEBUG( lvl, ("%s No configuration filename specified.\n", func) ); return( NULL ); } OpenedFile = fopen( FileName, "r" ); if( NULL == OpenedFile ) { - DEBUG( 0, + DEBUG( lvl, ("%s Unable to open configuration file \"%s\":\n\t%s\n", func, FileName, strerror(errno)) ); } diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c index dbc4e2ddd9..76cd8e1e65 100644 --- a/source3/smbwrapper/smbw.c +++ b/source3/smbwrapper/smbw.c @@ -69,9 +69,7 @@ void smbw_init(void) load_interfaces(); - if (!lp_load(servicesf,True,False,False)) { - exit(1); - } + lp_load(servicesf,True,False,False); get_myname(global_myname,NULL); |