summaryrefslogtreecommitdiff
path: root/source/param
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-21 00:06:45 +0200
committerMichael Adam <obnox@samba.org>2008-04-21 00:21:23 +0200
commit1bb28bc1d8e83d174cd171e9d96f22ac524187c3 (patch)
tree90f1be1133618ad021c0d90ef32617f233e82948 /source/param
parenta34801d67789340b515c5e575c3fd3175dddbecf (diff)
downloadsamba-1bb28bc1d8e83d174cd171e9d96f22ac524187c3.tar.gz
loadparm: make lo_load_initial() only skip registry include.
This is only to be able to set everything properly for registry before reading registry includes. This fixes "make test" as non-root user in a directory, where root-daemons have already created a messaging.tdb in the compiled in lockdir... Michael
Diffstat (limited to 'source/param')
-rw-r--r--source/param/loadparm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 84e8c1a2b7a..a60118ad832 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -6733,11 +6733,10 @@ static bool handle_include(int snum, const char *pszParmValue, char **ptr)
{
char *fname;
- if (bNoIncludes) {
- return true;
- }
-
if (strequal(pszParmValue, INCLUDE_REGISTRY_NAME)) {
+ if (bNoIncludes) {
+ return true;
+ }
if (bInGlobalSection) {
return process_registry_globals();
} else {