[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1311-g077bcc1

Michael Adam obnox at samba.org
Wed Apr 29 00:24:54 GMT 2009


The branch, master has been updated
       via  077bcc11257697b243916fbb02cd72b3a122b9ba (commit)
       via  fb3b6576127ce837ac711e87c293d1f4cf97473c (commit)
      from  67ca76c288eb095ae59e98927317d51c96c89551 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 077bcc11257697b243916fbb02cd72b3a122b9ba
Author: Michael Adam <obnox at samba.org>
Date:   Wed Apr 29 01:49:53 2009 +0200

    s3:smbd/service: switch load_registry_service/shares to use loadparm routines
    
    instead of reading the registry directly with tdb and activating the
    configure options by hand.
    
    This eliminates the need for repeating checks done in loadparm.
    For instance it disables registry shares without path in the server
    as is the case with text based shares.
    
    Michael

commit fb3b6576127ce837ac711e87c293d1f4cf97473c
Author: Michael Adam <obnox at samba.org>
Date:   Wed Apr 29 01:31:03 2009 +0200

    s3:loadparm: refactor process_registry_service out or process_registry_globals
    
    Michael

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

Summary of changes:
 source3/include/proto.h  |    2 +
 source3/param/loadparm.c |   38 ++++++++++++++++-------
 source3/smbd/service.c   |   73 ++--------------------------------------------
 3 files changed, 31 insertions(+), 82 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 46600e2..2eb838f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4079,6 +4079,8 @@ bool lp_string_is_valid_boolean(const char *parm_value);
 bool lp_invert_boolean(const char *str, const char **inverse_str);
 bool lp_canonicalize_boolean(const char *str, const char**canon_str);
 bool service_ok(int iService);
+bool process_registry_service(const char *service_name);
+bool process_registry_shares(void);
 bool lp_config_backend_is_registry(void);
 bool lp_config_backend_is_file(void);
 bool lp_file_list_changed(void);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7e2affe..7b79402 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6824,10 +6824,10 @@ static bool process_smbconf_service(struct smbconf_service *service)
 	return true;
 }
 
-/*
- * process_registry_globals
+/**
+ * load a service from registry and activate it
  */
-static bool process_registry_globals(void)
+bool process_registry_service(const char *service_name)
 {
 	WERROR werr;
 	struct smbconf_service *service = NULL;
@@ -6839,19 +6839,18 @@ static bool process_registry_globals(void)
 		goto done;
 	}
 
-	ret = do_parameter("registry shares", "yes", NULL);
-	if (!ret) {
-		goto done;
-	}
+	DEBUG(5, ("process_registry_service: service name %s\n", service_name));
 
-	if (!smbconf_share_exists(conf_ctx, GLOBAL_NAME)) {
-		/* nothing to read from the registry yet but make sure lp_load
-		 * doesn't return false */
+	if (!smbconf_share_exists(conf_ctx, service_name)) {
+		/*
+		 * Registry does not contain data for this service (yet),
+		 * but make sure lp_load doesn't return false.
+		 */
 		ret = true;
 		goto done;
 	}
 
-	werr = smbconf_get_share(conf_ctx, mem_ctx, GLOBAL_NAME, &service);
+	werr = smbconf_get_share(conf_ctx, mem_ctx, service_name, &service);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -6869,7 +6868,22 @@ done:
 	return ret;
 }
 
-static bool process_registry_shares(void)
+/*
+ * process_registry_globals
+ */
+static bool process_registry_globals(void)
+{
+	bool ret;
+
+	ret = do_parameter("registry shares", "yes", NULL);
+	if (!ret) {
+		return ret;
+	}
+
+	return process_registry_service(GLOBAL_NAME);
+}
+
+bool process_registry_shares(void)
 {
 	WERROR werr;
 	uint32_t count;
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index e33f04d..c66a4d3 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -220,16 +220,6 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir)
 
 static int load_registry_service(const char *servicename)
 {
-	struct registry_key *key;
-	char *path;
-	WERROR err;
-
-	uint32 i;
-	char *value_name;
-	struct registry_value *value;
-
-	int res = -1;
-
 	if (!lp_registry_shares()) {
 		return -1;
 	}
@@ -242,79 +232,22 @@ static int load_registry_service(const char *servicename)
 		return -2;
 	}
 
-	if (asprintf(&path, "%s\\%s", KEY_SMBCONF, servicename) == -1) {
-		return -1;
-	}
-
-	err = reg_open_path(NULL, path, REG_KEY_READ, get_root_nt_token(),
-			    &key);
-	SAFE_FREE(path);
-
-	if (!W_ERROR_IS_OK(err)) {
+	if (!process_registry_service(servicename)) {
 		return -1;
 	}
 
-	res = lp_add_service(servicename, -1);
-	if (res == -1) {
-		goto error;
-	}
-
-	for (i=0;
-	     W_ERROR_IS_OK(reg_enumvalue(key, key, i, &value_name, &value));
-	     i++) {
-		switch (value->type) {
-		case REG_DWORD: { 
-			char *tmp;
-			if (asprintf(&tmp, "%d", value->v.dword) == -1) {
-				continue;
-			}
-			lp_do_parameter(res, value_name, tmp);
-			SAFE_FREE(tmp);
-			break;
-		}
-		case REG_SZ: {
-			lp_do_parameter(res, value_name, value->v.sz.str);
-			break;
-		}
-		default:
-			/* Ignore all the rest */
-			break;
-		}
-
-		TALLOC_FREE(value_name);
-		TALLOC_FREE(value);
-	}
-
- error:
-
-	TALLOC_FREE(key);
-	return res;
+	return lp_servicenumber(servicename);
 }
 
 void load_registry_shares(void)
 {
-	struct registry_key *key;
-	char *name;
-	WERROR err;
-	int i;
-
 	DEBUG(8, ("load_registry_shares()\n"));
 	if (!lp_registry_shares()) {
 		return;
 	}
 
-	err = reg_open_path(NULL, KEY_SMBCONF, REG_KEY_READ,
-			    get_root_nt_token(), &key);
-	if (!(W_ERROR_IS_OK(err))) {
-		return;
-	}
-
-	for (i=0; W_ERROR_IS_OK(reg_enumkey(key, key, i, &name, NULL)); i++) {
-		load_registry_service(name);
-		TALLOC_FREE(name);
-	}
+	process_registry_shares();
 
-	TALLOC_FREE(key);
 	return;
 }
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list