summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-16 17:09:07 +0100
committerMichael Adam <obnox@samba.org>2008-01-16 17:10:02 +0100
commit762ca95be758d00f0dacf05d38e650af89f0bfba (patch)
tree79adee9178f49cd2861b5d3a0810eafa299e7b51 /source3
parent7bfceba4bc49f5f5c8d2836dfd76e1ec15459631 (diff)
downloadsamba-762ca95be758d00f0dacf05d38e650af89f0bfba.tar.gz
samba-762ca95be758d00f0dacf05d38e650af89f0bfba.tar.bz2
samba-762ca95be758d00f0dacf05d38e650af89f0bfba.zip
Remove special semantics of "include = registry" from loadparm.c
This is now replaced by "config backend = registry". Michael (This used to be commit 56801810253ae870437f694947f58c27661cef9b)
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 90b015b5a2..4fc8b89ec1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -70,16 +70,7 @@ 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 int regdb_last_seqnum = 0;
-static bool include_registry_globals = False;
#define CONFIG_BACKEND_FILE 0
#define CONFIG_BACKEND_REGISTRY 1
@@ -3443,8 +3434,6 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
char * valstr;
struct registry_value *value = NULL;
- include_registry_globals = True;
-
ZERO_STRUCT(data);
reg_tdb = lp_regdb_open();
@@ -3557,8 +3546,6 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
smb_panic("Failed to create talloc context!");
}
- include_registry_globals = True;
-
if (!registry_init_regdb()) {
DEBUG(1, ("Error initializing the registry.\n"));
goto done;
@@ -3658,11 +3645,6 @@ static void add_to_file_list(const char *fname, const char *subfname)
}
}
-bool lp_include_registry_globals(void)
-{
- return include_registry_globals;
-}
-
/**
* Utility function for outsiders to check if we're running on registry.
*/
@@ -3804,17 +3786,6 @@ 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(do_parameter);
- }
- 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);