summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-07-26 12:36:53 +0200
committerMichael Adam <obnox@samba.org>2011-07-28 11:17:27 +0200
commitfbf254c19aa01984f02f1b7c95e294ff10178aab (patch)
treeba89e480fb0fc0baa2d695e8456763fa7da884ef
parentbff217cf4a3ea52f9509970ea9bf8520a281eb3e (diff)
downloadsamba-fbf254c19aa01984f02f1b7c95e294ff10178aab.tar.gz
samba-fbf254c19aa01984f02f1b7c95e294ff10178aab.tar.bz2
samba-fbf254c19aa01984f02f1b7c95e294ff10178aab.zip
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()
-rw-r--r--source3/libsmb/libsmb_context.c2
1 files changed, 1 insertions, 1 deletions
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) {