[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-978-g42c7fb4

[Michael Adam]

The branch, v3-2-test has been updated
       via  42c7fb4ddfab9ff7592593533099ae872c1edca7 (commit)
      from  d665cecd8b1b40ad30ec435de0bd925cdea24795 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 42c7fb4ddfab9ff7592593533099ae872c1edca7
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 6 22:23:54 2008 +0200

    loadparm: reactivate special semantics of "include = registry" for now.
    
    This includes the configuration stored in HKLM/Software/Samba/smbconf .
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/param/loadparm.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 71632cd..9595ebd 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -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);


-- 
Samba Shared Repository