diff options
author | Michael Adam <obnox@samba.org> | 2008-04-21 00:06:45 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2008-04-21 00:21:23 +0200 |
commit | 1bb28bc1d8e83d174cd171e9d96f22ac524187c3 (patch) | |
tree | 90f1be1133618ad021c0d90ef32617f233e82948 /source/param | |
parent | a34801d67789340b515c5e575c3fd3175dddbecf (diff) | |
download | samba-1bb28bc1d8e83d174cd171e9d96f22ac524187c3.tar.gz samba-1bb28bc1d8e83d174cd171e9d96f22ac524187c3.tar.xz samba-1bb28bc1d8e83d174cd171e9d96f22ac524187c3.zip |
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.c | 7 |
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 { |