[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0pre3-69-g0352113
Karolin Seeger
kseeger at samba.org
Sun May 11 18:44:04 GMT 2008
The branch, v3-2-stable has been updated
via 03521136ccb4d4a52c9c0373beed7df2485397a9 (commit)
from 463f6d87c756bffa4cacf2bdbf55e47f6e88050a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 03521136ccb4d4a52c9c0373beed7df2485397a9
Author: Michael Adam <obnox at samba.org>
Date: Sat May 10 00:13:11 2008 +0200
loadparm: Fix activation of registry globals in lp_load_*.
This completes bba04a8fba6fd5cf62578733cfdabea590e8ff51:
The reverted logic has to be put into the callers
lp_load() and lp_load_initial_only() of lp_load_ex(), too.
Silly bug.
Michael
(cherry picked from commit 8bab6d651f1cd0efe5aa1e7808b3f043602a3dfa)
-----------------------------------------------------------------------
Summary of changes:
source/param/loadparm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 09049db..b539684 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -8783,7 +8783,7 @@ bool lp_load(const char *pszFname,
save_defaults,
add_ipc,
initialize_globals,
- false);
+ true);
}
bool lp_load_initial_only(const char *pszFname)
@@ -8793,7 +8793,7 @@ bool lp_load_initial_only(const char *pszFname)
false,
false,
true,
- true);
+ false);
}
/***************************************************************************
--
Samba Shared Repository
More information about the samba-cvs
mailing list