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

[Michael Adam]

The branch, v3-2-test has been updated
       via  3acc0d84dc8f29b67ddaa1124224a93cb43b07ad (commit)
       via  bba04a8fba6fd5cf62578733cfdabea590e8ff51 (commit)
       via  1bb28bc1d8e83d174cd171e9d96f22ac524187c3 (commit)
      from  a34801d67789340b515c5e575c3fd3175dddbecf (commit)

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


- Log -----------------------------------------------------------------
commit 3acc0d84dc8f29b67ddaa1124224a93cb43b07ad
Author: Michael Adam <obnox at samba.org>
Date:   Mon Apr 21 00:20:35 2008 +0200

    loadparm: reformat - fix whitespace/tab
    
    Michael

commit bba04a8fba6fd5cf62578733cfdabea590e8ff51
Author: Michael Adam <obnox at samba.org>
Date:   Mon Apr 21 00:17:49 2008 +0200

    loadparm: rename bNoIncludes to bAllowIncludeRegistry (inverting logic)
    
    This is what that variable controls now...
    
    Michael

commit 1bb28bc1d8e83d174cd171e9d96f22ac524187c3
Author: Michael Adam <obnox at samba.org>
Date:   Mon Apr 21 00:06:45 2008 +0200

    loadparm: make lo_load_initial() only skip registry include.
    
    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

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

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


Changeset truncated at 500 lines:

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 84e8c1a..962c0a4 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -6727,17 +6727,16 @@ 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 (bNoIncludes) {
-		return true;
-	}
-
 	if (strequal(pszParmValue, INCLUDE_REGISTRY_NAME)) {
+		if (!bAllowIncludeRegistry) {
+			return true;
+		}
 		if (bInGlobalSection) {
 			return process_registry_globals();
 		} else {
@@ -8661,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;
@@ -8673,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();
@@ -8734,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();
@@ -8769,7 +8769,7 @@ bool lp_load_ex(const char *pszFname,
 
 	init_iconv();
 
-	bNoIncludes = false;
+	bAllowIncludeRegistry = true;
 
 	return (bRetval);
 }


-- 
Samba Shared Repository