[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-1045-g4c404d6
Michael Adam
obnox at samba.org
Thu Jan 3 13:19:24 GMT 2008
The branch, v3-2-test has been updated
via 4c404d627ccfaf1c17f4b6b1ebab6fce357d9ab1 (commit)
via a559533c0c8a80f3f4078bbc2675de395359485f (commit)
via 073eeca51e46da6a687175aadbfdbb9e029532d6 (commit)
via d08556dbc7071933feaeec538f01ac8f6a637b1d (commit)
via e00cb415d30b3e72ccfb7e5c366c95ec0f9c6247 (commit)
via 2075baf551ca7fc6bcee6b93f63fd7fbf75f9a50 (commit)
via 1575612f1936312125e7778a9a4227e444ea36cf (commit)
via 6bc4ee210855dbfbee9e86b59e90b08ecb3a9df9 (commit)
via 3258758e5c8dfc2c681e1285cb34aaacae697a55 (commit)
via 2e4beee66b3672c3259b312aca3d482598731119 (commit)
via e8f7c07699b5b93acd81b24bca908769f0b5e8d8 (commit)
via 42ae33a96228e916d7d530d844be6937a80d4fea (commit)
via c23e6636a886d93b98c9439ba081def0385f67ac (commit)
via 3f9f35335127a673639fa30c88cdea6c79f04b92 (commit)
via 96b2923bc3c57700352869627c38609529d53cd2 (commit)
via cd1846943cbcc02ea9fa3b9237bd02e667a475db (commit)
via 49f740797bb7fc5edacbd4c3e8b1eb1aab131ea4 (commit)
via c2ba52b2c34abc42b4ff7945715dc36e08a2f112 (commit)
via 4d86d2dd6f0a577e446ccb4b362b3cd80f819600 (commit)
via 9868364e2c7827ac7914bee711a65d4456a5e366 (commit)
via 0dd3967bfd88a4d90941e80134c549f5ade63ad0 (commit)
via e568f42e2146fa6510a86746581409450887ff16 (commit)
from 8befb22672d54a9255e5bdaf9cb0bb4e2b631245 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 4c404d627ccfaf1c17f4b6b1ebab6fce357d9ab1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 14:17:42 2008 +0100
Use GLOBAL_NAME constant.
Michael
commit a559533c0c8a80f3f4078bbc2675de395359485f
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 14:15:05 2008 +0100
Rename libnet_smbconf_set_global_param() to libnet_conf_set_global_parameter().
Now all functions are converted to the consistent naming scheme.
Michael
commit 073eeca51e46da6a687175aadbfdbb9e029532d6
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 14:11:20 2008 +0100
Rename libnet_smbconf_delparm() to libnet_conf_delete_parameter().
Michael
commit d08556dbc7071933feaeec538f01ac8f6a637b1d
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 14:08:45 2008 +0100
Rename libnet_smbconf_getparm() to libnet_conf_get_parameter().
Michael
commit e00cb415d30b3e72ccfb7e5c366c95ec0f9c6247
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 14:06:09 2008 +0100
Rename libnet_smbconf_setparm() to libnet_conf_set_parameter().
Michael
commit 2075baf551ca7fc6bcee6b93f63fd7fbf75f9a50
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 14:01:50 2008 +0100
Rename libnet_smbconf_delshare() to libnet_conf_delete_share().
Michael
commit 1575612f1936312125e7778a9a4227e444ea36cf
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:59:14 2008 +0100
Rename libnet_smbconf_getshare() to libnet_conf_get_share().
Michael
commit 6bc4ee210855dbfbee9e86b59e90b08ecb3a9df9
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:55:43 2008 +0100
Rename libnet_smbconf_create_share() to libnet_conf_create_share().
Michael
commit 3258758e5c8dfc2c681e1285cb34aaacae697a55
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:54:31 2008 +0100
Rename libnet_smbconf_share_exists() to libnet_conf_share_exists().
Michael
commit 2e4beee66b3672c3259b312aca3d482598731119
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:53:04 2008 +0100
Rename libnet_smbconf_get_share_names() to libnet_conf_get_share_names().
Michael
commit e8f7c07699b5b93acd81b24bca908769f0b5e8d8
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:50:55 2008 +0100
Rename libnet_smbconf_get_config() to libnet_conf_get_config().
Michael
commit 42ae33a96228e916d7d530d844be6937a80d4fea
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:48:56 2008 +0100
Rename libnet_smbconf_drop() to libnet_conf_drop().
Michael
commit c23e6636a886d93b98c9439ba081def0385f67ac
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:46:45 2008 +0100
Rename libnet_smbconf_reg_get_values() to libnet_conf_reg_get_values().
Now all internal helper functions are converted to the consistent
naming scheme.
Michael
commit 3f9f35335127a673639fa30c88cdea6c79f04b92
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:45:14 2008 +0100
Rename libnet_smbconf_format_registry_value() to libnet_conf_format_registry_value().
Michael
commit 96b2923bc3c57700352869627c38609529d53cd2
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:43:34 2008 +0100
Rename libnet_smbconf_reg_set_value() to libnet_conf_reg_set_value().
Michael
commit cd1846943cbcc02ea9fa3b9237bd02e667a475db
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:42:40 2008 +0100
Rename libnet_smbconf_reg_create_service_key() to libnet_conf_reg_create_service_key().
Michael
commit 49f740797bb7fc5edacbd4c3e8b1eb1aab131ea4
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:40:40 2008 +0100
Rename libnet_smbconf_value_exists() to libnet_conf_value_exists().
Michael
commit c2ba52b2c34abc42b4ff7945715dc36e08a2f112
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:38:55 2008 +0100
Rename libnet_smbconf_reg_open_basekey() to libnet_conf_reg_open_base_key().
Michael
commit 4d86d2dd6f0a577e446ccb4b362b3cd80f819600
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:36:25 2008 +0100
Rename libnet_smbconf_reg_open_service_key() to libnet_conf_reg_open_service_key().
Michael
commit 9868364e2c7827ac7914bee711a65d4456a5e366
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:33:10 2008 +0100
Rename libnet_smbconf_reg_open_path() to libnet_conf_reg_open_path().
Michael
commit 0dd3967bfd88a4d90941e80134c549f5ade63ad0
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 13:31:23 2008 +0100
Rename libnet_smbconf_add_string_to_array() to libnet_conf_add_string_to_array().
This is the start of making nomenclature more consistent
(functions in libnet_conf.c should be called libnet_conf_*,
not libnet_smbconf_* ...
Michael
commit e568f42e2146fa6510a86746581409450887ff16
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 3 12:08:49 2008 +0100
Happy new year again.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/lib/netapi/serverinfo.c | 4 +-
source/libnet/libnet_conf.c | 215 ++++++++++++++++++++--------------------
source/libnet/libnet_join.c | 20 ++--
source/utils/net_conf.c | 46 +++++-----
4 files changed, 141 insertions(+), 144 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/serverinfo.c b/source/lib/netapi/serverinfo.c
index 27c7c4b..0e356e0 100644
--- a/source/lib/netapi/serverinfo.c
+++ b/source/lib/netapi/serverinfo.c
@@ -167,8 +167,8 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
return WERR_NOT_SUPPORTED;
}
- return libnet_smbconf_set_global_param("server string",
- info1005->comment);
+ return libnet_conf_set_global_parameter("server string",
+ info1005->comment);
}
static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index 01c4237..ea3f708 100644
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -31,10 +31,10 @@
/**
* add a string to a talloced array of strings.
*/
-static WERROR libnet_smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
- char ***array,
- uint32_t count,
- const char *string)
+static WERROR libnet_conf_add_string_to_array(TALLOC_CTX *mem_ctx,
+ char ***array,
+ uint32_t count,
+ const char *string)
{
char **new_array = NULL;
@@ -57,10 +57,10 @@ static WERROR libnet_smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
/**
* Open a registry key specified by "path"
*/
-static WERROR libnet_smbconf_reg_open_path(TALLOC_CTX *mem_ctx,
- const char *path,
- uint32 desired_access,
- struct registry_key **key)
+static WERROR libnet_conf_reg_open_path(TALLOC_CTX *mem_ctx,
+ const char *path,
+ uint32 desired_access,
+ struct registry_key **key)
{
WERROR werr = WERR_OK;
NT_USER_TOKEN *token;
@@ -101,10 +101,10 @@ done:
/**
* Open a subkey of KEY_SMBCONF (i.e a service)
*/
-static WERROR libnet_smbconf_reg_open_service_key(TALLOC_CTX *ctx,
- const char *servicename,
- uint32 desired_access,
- struct registry_key **key)
+static WERROR libnet_conf_reg_open_service_key(TALLOC_CTX *ctx,
+ const char *servicename,
+ uint32 desired_access,
+ struct registry_key **key)
{
WERROR werr = WERR_OK;
char *path = NULL;
@@ -117,7 +117,7 @@ static WERROR libnet_smbconf_reg_open_service_key(TALLOC_CTX *ctx,
path = talloc_asprintf(ctx, "%s\\%s", KEY_SMBCONF, servicename);
- werr = libnet_smbconf_reg_open_path(ctx, path, desired_access, key);
+ werr = libnet_conf_reg_open_path(ctx, path, desired_access, key);
done:
TALLOC_FREE(path);
@@ -127,16 +127,15 @@ done:
/*
* open the base key KEY_SMBCONF
*/
-static WERROR libnet_smbconf_reg_open_basekey(TALLOC_CTX *ctx,
- uint32 desired_access,
- struct registry_key **key)
+static WERROR libnet_conf_reg_open_base_key(TALLOC_CTX *ctx,
+ uint32 desired_access,
+ struct registry_key **key)
{
- return libnet_smbconf_reg_open_path(ctx, KEY_SMBCONF, desired_access,
- key);
+ return libnet_conf_reg_open_path(ctx, KEY_SMBCONF, desired_access, key);
}
-static bool libnet_smbconf_value_exists(struct registry_key *key,
- const char *param)
+static bool libnet_conf_value_exists(struct registry_key *key,
+ const char *param)
{
bool ret = false;
WERROR werr = WERR_OK;
@@ -155,9 +154,9 @@ static bool libnet_smbconf_value_exists(struct registry_key *key,
/*
* create a subkey of KEY_SMBCONF
*/
-static WERROR libnet_smbconf_reg_create_service_key(TALLOC_CTX *ctx,
- const char * subkeyname,
- struct registry_key **newkey)
+static WERROR libnet_conf_reg_create_service_key(TALLOC_CTX *ctx,
+ const char * subkeyname,
+ struct registry_key **newkey)
{
WERROR werr = WERR_OK;
struct registry_key *create_parent = NULL;
@@ -172,8 +171,8 @@ static WERROR libnet_smbconf_reg_create_service_key(TALLOC_CTX *ctx,
goto done;
}
- werr = libnet_smbconf_reg_open_basekey(create_ctx, REG_KEY_WRITE,
- &create_parent);
+ werr = libnet_conf_reg_open_base_key(create_ctx, REG_KEY_WRITE,
+ &create_parent);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -197,9 +196,9 @@ done:
/*
* add a value to a key.
*/
-static WERROR libnet_smbconf_reg_set_value(struct registry_key *key,
- const char *valname,
- const char *valstr)
+static WERROR libnet_conf_reg_set_value(struct registry_key *key,
+ const char *valname,
+ const char *valstr)
{
struct registry_value val;
WERROR werr = WERR_OK;
@@ -271,8 +270,8 @@ done:
* which are ar stored as REG_SZ values, so the incomplete
* handling should be ok.
*/
-static char *libnet_smbconf_format_registry_value(TALLOC_CTX *mem_ctx,
- struct registry_value *value)
+static char *libnet_conf_format_registry_value(TALLOC_CTX *mem_ctx,
+ struct registry_value *value)
{
char *result = NULL;
@@ -312,11 +311,11 @@ static char *libnet_smbconf_format_registry_value(TALLOC_CTX *mem_ctx,
* Get the values of a key as a list of value names
* and a list of value strings (ordered)
*/
-static WERROR libnet_smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
- struct registry_key *key,
- uint32_t *num_values,
- char ***value_names,
- char ***value_strings)
+static WERROR libnet_conf_reg_get_values(TALLOC_CTX *mem_ctx,
+ struct registry_key *key,
+ uint32_t *num_values,
+ char ***value_names,
+ char ***value_strings)
{
TALLOC_CTX *tmp_ctx = NULL;
WERROR werr = WERR_OK;
@@ -346,19 +345,19 @@ static WERROR libnet_smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
{
char *valstring;
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_valnames,
- count, valname);
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_valnames,
+ count, valname);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
- valstring = libnet_smbconf_format_registry_value(tmp_ctx,
- valvalue);
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_valstrings,
- count,
- valstring);
+ valstring = libnet_conf_format_registry_value(tmp_ctx,
+ valvalue);
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_valstrings,
+ count,
+ valstring);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -392,7 +391,7 @@ done:
/**
* Drop the whole configuration (restarting empty).
*/
-WERROR libnet_smbconf_drop(void)
+WERROR libnet_conf_drop(void)
{
char *path, *p;
WERROR werr = WERR_OK;
@@ -408,8 +407,8 @@ WERROR libnet_smbconf_drop(void)
}
p = strrchr(path, '\\');
*p = '\0';
- werr = libnet_smbconf_reg_open_path(mem_ctx, path, REG_KEY_WRITE,
- &parent_key);
+ werr = libnet_conf_reg_open_path(mem_ctx, path, REG_KEY_WRITE,
+ &parent_key);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -438,9 +437,9 @@ done:
* param_names : list of lists of parameter names for each share
* param_values : list of lists of parameter values for each share
*/
-WERROR libnet_smbconf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
- char ***share_names, uint32_t **num_params,
- char ****param_names, char ****param_values)
+WERROR libnet_conf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
+ char ***share_names, uint32_t **num_params,
+ char ****param_names, char ****param_values)
{
WERROR werr = WERR_OK;
TALLOC_CTX *tmp_ctx = NULL;
@@ -465,8 +464,8 @@ WERROR libnet_smbconf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
goto done;
}
- werr = libnet_smbconf_get_share_names(tmp_ctx, &tmp_num_shares,
- &tmp_share_names);
+ werr = libnet_conf_get_share_names(tmp_ctx, &tmp_num_shares,
+ &tmp_share_names);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -483,10 +482,10 @@ WERROR libnet_smbconf_get_config(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
}
for (count = 0; count < tmp_num_shares; count++) {
- werr = libnet_smbconf_getshare(mem_ctx, tmp_share_names[count],
- &tmp_num_params[count],
- &tmp_param_names[count],
- &tmp_param_values[count]);
+ werr = libnet_conf_get_share(mem_ctx, tmp_share_names[count],
+ &tmp_num_params[count],
+ &tmp_param_names[count],
+ &tmp_param_values[count]);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -516,8 +515,8 @@ done:
/**
* get the list of share names defined in the configuration.
*/
-WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
- char ***share_names)
+WERROR libnet_conf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
+ char ***share_names)
{
uint32_t count;
uint32_t added_count = 0;
@@ -539,19 +538,18 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
}
/* make sure "global" is always listed first */
- if (libnet_smbconf_share_exists(GLOBAL_NAME)) {
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_share_names,
- 0, GLOBAL_NAME);
+ if (libnet_conf_share_exists(GLOBAL_NAME)) {
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_share_names,
+ 0, GLOBAL_NAME);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
added_count++;
}
- werr = libnet_smbconf_reg_open_basekey(tmp_ctx,
- SEC_RIGHTS_ENUM_SUBKEYS,
- &key);
+ werr = libnet_conf_reg_open_base_key(tmp_ctx, SEC_RIGHTS_ENUM_SUBKEYS,
+ &key);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -565,10 +563,10 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
continue;
}
- werr = libnet_smbconf_add_string_to_array(tmp_ctx,
- &tmp_share_names,
- added_count,
- subkey_name);
+ werr = libnet_conf_add_string_to_array(tmp_ctx,
+ &tmp_share_names,
+ added_count,
+ subkey_name);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -594,15 +592,15 @@ done:
/**
* check if a share/service of a given name exists
*/
-bool libnet_smbconf_share_exists(const char *servicename)
+bool libnet_conf_share_exists(const char *servicename)
{
bool ret = false;
WERROR werr = WERR_OK;
TALLOC_CTX *mem_ctx = talloc_stackframe();
struct registry_key *key = NULL;
- werr = libnet_smbconf_reg_open_service_key(mem_ctx, servicename,
- REG_KEY_READ, &key);
+ werr = libnet_conf_reg_open_service_key(mem_ctx, servicename,
+ REG_KEY_READ, &key);
if (W_ERROR_IS_OK(werr)) {
ret = true;
}
@@ -614,18 +612,18 @@ bool libnet_smbconf_share_exists(const char *servicename)
/**
* Add a service if it does not already exist.
*/
-WERROR libnet_smbconf_create_share(const char *servicename)
+WERROR libnet_conf_create_share(const char *servicename)
{
WERROR werr;
TALLOC_CTX *mem_ctx = talloc_stackframe();
struct registry_key *key = NULL;
- if (libnet_smbconf_share_exists(servicename)) {
+ if (libnet_conf_share_exists(servicename)) {
werr = WERR_ALREADY_EXISTS;
goto done;
}
- werr = libnet_smbconf_reg_create_service_key(mem_ctx, servicename, &key);
+ werr = libnet_conf_reg_create_service_key(mem_ctx, servicename, &key);
done:
TALLOC_FREE(mem_ctx);
@@ -635,21 +633,21 @@ done:
/**
* get a definition of a share (service) from configuration.
*/
-WERROR libnet_smbconf_getshare(TALLOC_CTX *mem_ctx, const char *servicename,
- uint32_t *num_params, char ***param_names,
- char ***param_values)
+WERROR libnet_conf_get_share(TALLOC_CTX *mem_ctx, const char *servicename,
+ uint32_t *num_params, char ***param_names,
+ char ***param_values)
{
WERROR werr = WERR_OK;
struct registry_key *key = NULL;
- werr = libnet_smbconf_reg_open_service_key(mem_ctx, servicename,
- REG_KEY_READ, &key);
+ werr = libnet_conf_reg_open_service_key(mem_ctx, servicename,
+ REG_KEY_READ, &key);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
- werr = libnet_smbconf_reg_get_values(mem_ctx, key, num_params,
- param_names, param_values);
+ werr = libnet_conf_reg_get_values(mem_ctx, key, num_params,
+ param_names, param_values);
done:
TALLOC_FREE(key);
@@ -659,13 +657,13 @@ done:
/**
* delete a service from configuration
*/
-WERROR libnet_smbconf_delshare(const char *servicename)
+WERROR libnet_conf_delete_share(const char *servicename)
{
WERROR werr = WERR_OK;
struct registry_key *key = NULL;
TALLOC_CTX *ctx = talloc_stackframe();
- werr = libnet_smbconf_reg_open_basekey(ctx, REG_KEY_WRITE, &key);
+ werr = libnet_conf_reg_open_base_key(ctx, REG_KEY_WRITE, &key);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -680,26 +678,26 @@ done:
/**
* set a configuration parameter to the value provided.
*/
-WERROR libnet_smbconf_setparm(const char *service,
- const char *param,
- const char *valstr)
+WERROR libnet_conf_set_parameter(const char *service,
+ const char *param,
+ const char *valstr)
{
WERROR werr;
struct registry_key *key = NULL;
TALLOC_CTX *mem_ctx = talloc_stackframe();
- if (!libnet_smbconf_share_exists(service)) {
+ if (!libnet_conf_share_exists(service)) {
werr = WERR_NO_SUCH_SERVICE;
goto done;
}
- werr = libnet_smbconf_reg_open_service_key(mem_ctx, service,
- REG_KEY_WRITE, &key);
+ werr = libnet_conf_reg_open_service_key(mem_ctx, service, REG_KEY_WRITE,
+ &key);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
- werr = libnet_smbconf_reg_set_value(key, param, valstr);
+ werr = libnet_conf_reg_set_value(key, param, valstr);
done:
TALLOC_FREE(mem_ctx);
@@ -709,10 +707,10 @@ done:
/**
* get the value of a configuration parameter as a string
*/
-WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
- const char *service,
- const char *param,
- char **valstr)
+WERROR libnet_conf_get_parameter(TALLOC_CTX *mem_ctx,
+ const char *service,
+ const char *param,
+ char **valstr)
{
WERROR werr = WERR_OK;
struct registry_key *key = NULL;
@@ -723,18 +721,18 @@ WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
goto done;
}
- if (!libnet_smbconf_share_exists(service)) {
+ if (!libnet_conf_share_exists(service)) {
werr = WERR_NO_SUCH_SERVICE;
goto done;
}
- werr = libnet_smbconf_reg_open_service_key(mem_ctx, service,
- REG_KEY_READ, &key);
+ werr = libnet_conf_reg_open_service_key(mem_ctx, service, REG_KEY_READ,
+ &key);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
- if (!libnet_smbconf_value_exists(key, param)) {
+ if (!libnet_conf_value_exists(key, param)) {
werr = WERR_INVALID_PARAM;
goto done;
}
@@ -744,7 +742,7 @@ WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
goto done;
}
- *valstr = libnet_smbconf_format_registry_value(mem_ctx, value);
+ *valstr = libnet_conf_format_registry_value(mem_ctx, value);
if (*valstr == NULL) {
werr = WERR_NOMEM;
@@ -759,24 +757,23 @@ done:
/**
* delete a parameter from configuration
*/
-WERROR libnet_smbconf_delparm(const char *service,
- const char *param)
+WERROR libnet_conf_delete_parameter(const char *service, const char *param)
{
struct registry_key *key = NULL;
WERROR werr = WERR_OK;
TALLOC_CTX *mem_ctx = talloc_stackframe();
- if (!libnet_smbconf_share_exists(service)) {
+ if (!libnet_conf_share_exists(service)) {
return WERR_NO_SUCH_SERVICE;
}
- werr = libnet_smbconf_reg_open_service_key(mem_ctx, service,
- REG_KEY_ALL, &key);
+ werr = libnet_conf_reg_open_service_key(mem_ctx, service, REG_KEY_ALL,
+ &key);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
- if (!libnet_smbconf_value_exists(key, param)) {
+ if (!libnet_conf_value_exists(key, param)) {
werr = WERR_INVALID_PARAM;
goto done;
}
@@ -795,9 +792,9 @@ done:
*
--
Samba Shared Repository
More information about the samba-cvs
mailing list