From: Michael Adam <obnox@samba.org>
Date: Sun, 20 Apr 2008 22:06:45 +0000 (+0200)
Subject: loadparm: make lo_load_initial() only skip registry include.
X-Git-Tag: samba-3.3.0pre1~2641^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bb28bc1d8e83d174cd171e9d96f22ac524187c3;p=thirdparty%2Fsamba.git

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
---

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 {