summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-10-05 02:55:53 +0000
committerAndrew Tridgell <tridge@samba.org>1998-10-05 02:55:53 +0000
commitaf58bf2ff8ddbf974dbafa36cf1b679226371e09 (patch)
treee9ee23ce708251f226e5f3dd3e3da776e30e56b6
parentf1d82e02ff7f2201de5fb13af4cadec648765017 (diff)
downloadsamba-af58bf2ff8ddbf974dbafa36cf1b679226371e09.tar.gz
samba-af58bf2ff8ddbf974dbafa36cf1b679226371e09.tar.xz
samba-af58bf2ff8ddbf974dbafa36cf1b679226371e09.zip
removed requirement of having a smb.conf for smbwrapper to work.
-rw-r--r--source/param/params.c6
-rw-r--r--source/smbwrapper/smbw.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/source/param/params.c b/source/param/params.c
index 2a0a253f208..2f54b721317 100644
--- a/source/param/params.c
+++ b/source/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/source/smbwrapper/smbw.c b/source/smbwrapper/smbw.c
index dbc4e2ddd9b..76cd8e1e65c 100644
--- a/source/smbwrapper/smbw.c
+++ b/source/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);