sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

loadparm: make lo_load_initial() only skip registry include.

Browse Source 
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)
This commit is contained in:
Michael Adam 2008-04-21 00:06:45 +02:00
parent 50e64115fc
commit 318c983d82
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/param/loadparm.c
View File

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