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

loadparm: reactivate special semantics of "include = registry" for now.

This includes the configuration stored in HKLM/Software/Samba/smbconf .

Michael
(This used to be commit 42c7fb4ddfab9ff7592593533099ae872c1edca7)
This commit is contained in:
Michael Adam 2008-04-06 22:23:54 +02:00
parent 78d88cbaeb
commit 2e1e83b4c0

View File

@ -70,6 +70,14 @@ extern userdom_struct current_user_info;
#define HOMES_NAME "homes"
#endif
/* the special value for the include parameter
* to be interpreted not as a file name but to
* trigger loading of the global smb.conf options
* from registry. */
#ifndef INCLUDE_REGISTRY_NAME
#define INCLUDE_REGISTRY_NAME "registry"
#endif
static bool in_client = False; /* Not in the client by default */
static struct smbconf_csn conf_last_csn;
static struct smbconf_ctx *conf_ctx = NULL;
@ -6724,6 +6732,16 @@ static bool handle_include(int snum, const char *pszParmValue, char **ptr)
{
char *fname;
if (strequal(pszParmValue, INCLUDE_REGISTRY_NAME)) {
if (bInGlobalSection) {
return process_registry_globals();
} else {
DEBUG(1, ("\"include = registry\" only effective "
"in %s section\n", GLOBAL_NAME));
return false;
}
}
fname = alloc_sub_basic(get_current_username(),
current_user_info.domain,
pszParmValue);