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)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 84e8c1a2b7af717806136f7f748ffa84e6250b28..a60118ad83247bed0a780e1416a4196688292604 100644 (file)
--- 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 {