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

[Michael Adam]

The branch, v3-3-test has been updated
       via  5e2b925367241c41793b2eb7a628e9fc9f3ac8ff (commit)
      from  3b1dae7c31b881834ca4494c4434ae97a56ce6c7 (commit)

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


- Log -----------------------------------------------------------------
commit 5e2b925367241c41793b2eb7a628e9fc9f3ac8ff
Author: Michael Adam <obnox at samba.org>
Date:   Mon May 26 11:58:11 2008 +0200

    loadarm: fix testparm with "config backend = registry".
    
    Set the iServiceIndex to "-1" for starup with either config
    backend (originally only for text backend). Otherwise,
    process_registry_shares() will fail.
    
    Currently, the only user of lp_load_with_registry_shares() is testparm.
    
    Michael

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

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


Changeset truncated at 500 lines:

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index e45c8b8..c272274 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -8746,6 +8746,9 @@ bool lp_load_ex(const char *pszFname,
 		lp_save_defaults();
 	}
 
+	/* We get sections first, so have to start 'behind' to make up */
+	iServiceIndex = -1;
+
 	if (Globals.param_opt != NULL) {
 		data = Globals.param_opt;
 		while (data) {
@@ -8769,8 +8772,6 @@ bool lp_load_ex(const char *pszFname,
 
 		add_to_file_list(pszFname, n2);
 
-		/* We get sections first, so have to start 'behind' to make up */
-		iServiceIndex = -1;
 		bRetval = pm_process(n2, do_section, do_parameter, NULL);
 		SAFE_FREE(n2);
 


-- 
Samba Shared Repository