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: rename bNoIncludes to bAllowIncludeRegistry (inverting logic)

Browse Source 
This is what that variable controls now...

Michael
(This used to be commit bba04a8fba6fd5cf62578733cfdabea590e8ff51)
This commit is contained in:
Michael Adam 2008-04-21 00:17:49 +02:00
parent 318c983d82
commit 4244655e5b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/param/loadparm.c
View File

@ -6727,14 +6727,14 @@ static bool handle_netbios_aliases(int snum, const char *pszParmValue, char **pt
/***************************************************************************
Handle the include operation.
***************************************************************************/
static bool bNoIncludes = false;
static bool bAllowIncludeRegistry = true;
static bool handle_include(int snum, const char *pszParmValue, char **ptr)
{
char *fname;
if (strequal(pszParmValue, INCLUDE_REGISTRY_NAME)) {
if (bNoIncludes) {
if (!bAllowIncludeRegistry) {
return true;
}
if (bInGlobalSection) {
@ -8660,7 +8660,7 @@ bool lp_load_ex(const char *pszFname,
bool save_defaults,
bool add_ipc,
bool initialize_globals,
bool no_includes)
bool allow_include_registry)
{
char *n2 = NULL;
bool bRetval;
@ -8672,7 +8672,7 @@ bool lp_load_ex(const char *pszFname,
bInGlobalSection = True;
bGlobalOnly = global_only;
bNoIncludes = no_includes;
bAllowIncludeRegistry = allow_include_registry;
init_globals(! initialize_globals);
debug_init();
@ -8733,7 +8733,8 @@ bool lp_load_ex(const char *pszFname,
init_globals(false);
lp_kill_all_services();
return lp_load_ex(pszFname, global_only, save_defaults,
add_ipc, initialize_globals, no_includes);
add_ipc, initialize_globals,
allow_include_registry);
}
} else if (lp_config_backend_is_registry()) {
bRetval = process_registry_globals();
@ -8768,7 +8769,7 @@ bool lp_load_ex(const char *pszFname,
init_iconv();
bNoIncludes = false;
bAllowIncludeRegistry = true;
return (bRetval);
}