From ca3d1b9bf01a56755a5c248a808ffafdce3e1a82 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 5 Oct 1998 02:55:53 +0000
Subject: removed requirement of having a smb.conf for smbwrapper to work.
 (This used to be commit af58bf2ff8ddbf974dbafa36cf1b679226371e09)

---
 source3/param/params.c    | 6 ++++--
 source3/smbwrapper/smbw.c | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3')

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);
 
-- 
cgit