From fbf254c19aa01984f02f1b7c95e294ff10178aab Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 26 Jul 2011 12:36:53 +0200 Subject: s3:libsmb: fix a call to lp_load to reinit the globals in any case The potential previous lp_load of $HOME/.smb/smb.conf might have failed halfway through and might have left globals initialized in an unwanted state. So we should make sure to clean up before loading the dyn_CONFIGFILE() --- source3/libsmb/libsmb_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/libsmb/libsmb_context.c') diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index 789a555400..766728963b 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -76,7 +76,7 @@ SMBC_module_init(void * punused) * defaults ... */ - if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, False)) { + if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True)) { DEBUG(5, ("Could not load config file: %s\n", get_dyn_CONFIGFILE())); } else if (home) { -- cgit