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

[Michael Adam]

The branch, v3-2-test has been updated
       via  59b81bfd0abecb190d0c49e62581b26f10b96829 (commit)
      from  3fda711f2526914bf18ec004d553453e692b1e85 (commit)

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


- Log -----------------------------------------------------------------
commit 59b81bfd0abecb190d0c49e62581b26f10b96829
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 13 21:57:55 2008 +0200

    loadparm: remove pfunc parameter from process_registry_globals().
    
    Use do_parameter() directly.
    
    Michael

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

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


Changeset truncated at 500 lines:

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index d5fd571..71632cd 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -6486,7 +6486,7 @@ bool service_ok(int iService)
 /*
  * process_registry_globals
  */
-static bool process_registry_globals(bool (*pfunc)(const char *, const char *, void *))
+static bool process_registry_globals(void)
 {
 	WERROR werr;
 	char **param_names;
@@ -6518,13 +6518,14 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *, v
 	}
 
 	for (count = 0; count < num_params; count++) {
-		ret = pfunc(param_names[count], param_values[count], NULL);
+		ret = do_parameter(param_names[count], param_values[count],
+				   NULL);
 		if (ret != true) {
 			goto done;
 		}
 	}
 
-	ret = pfunc("registry shares", "yes", NULL);
+	ret = do_parameter("registry shares", "yes", NULL);
 	/* store the csn */
 	smbconf_changed(conf_ctx, &conf_last_csn, NULL, NULL);
 
@@ -8711,7 +8712,7 @@ bool lp_load(const char *pszFname,
 				       add_ipc, initialize_globals);
 		}
 	} else if (lp_config_backend_is_registry()) {
-		bRetval = process_registry_globals(do_parameter);
+		bRetval = process_registry_globals();
 	} else {
 		DEBUG(0, ("Illegal config  backend given: %d\n",
 			  lp_config_backend()));


-- 
Samba Shared Repository