summaryrefslogtreecommitdiff
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
commit318c983d829dce6ed7f1428ad025f6a9b97ddda6 (patch)
tree96a5f4a952c2c900d95e1906fe6f909cead13084
parent50e64115fc45a1887838efad5b33e5fe226fb564 (diff)
downloadsamba-318c983d829dce6ed7f1428ad025f6a9b97ddda6.tar.gz
samba-318c983d829dce6ed7f1428ad025f6a9b97ddda6.tar.bz2
samba-318c983d829dce6ed7f1428ad025f6a9b97ddda6.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 (This used to be commit 1bb28bc1d8e83d174cd171e9d96f22ac524187c3)
-rw-r--r--source3/param/loadparm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 84e8c1a2b7..a60118ad83 100644
--- a/source3/param/loadparm.c
+++ b/source3/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 {