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

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  6c80362e291d8c5e748b987a583e8e32acc36354 (commit)
      from  62fcad0c0548ab53e9c20cfd6301972c68172b95 (commit)

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


- Log -----------------------------------------------------------------
commit 6c80362e291d8c5e748b987a583e8e32acc36354
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jun 3 20:51:42 2008 +0200

    Always set "registry shares = yes" for "include = registry"
    
    This fixes the case where "include = registry" is set in the smb.conf text file
    and *only* shares (no [global] settings) are present in the registry.
    
    Michael, please check!
    
    Thanks,
    
    Volker

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

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


Changeset truncated at 500 lines:

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index ef6648a..1ce88df 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -6558,6 +6558,11 @@ static bool process_registry_globals(void)
 		goto done;
 	}
 
+	ret = do_parameter("registry shares", "yes", NULL);
+	if (!ret) {
+		goto done;
+	}
+
 	if (!smbconf_share_exists(conf_ctx, GLOBAL_NAME)) {
 		/* nothing to read from the registry yet but make sure lp_load
 		 * doesn't return false */
@@ -6575,7 +6580,6 @@ static bool process_registry_globals(void)
 		goto done;
 	}
 
-	ret = do_parameter("registry shares", "yes", NULL);
 	/* store the csn */
 	smbconf_changed(conf_ctx, &conf_last_csn, NULL, NULL);
 


-- 
Samba Shared Repository