sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Rename libnet_smbconf_key_exists() to libnet_smbconf_share_exists()

Browse Source 
and move it to the api section of libnet_conf.c

Michael
(This used to be commit 9b5d8f4d95ebfd47831906019e11227aecc83aa1)
This commit is contained in:
Michael Adam 2007-12-31 01:14:44 +01:00
parent a74de0c7eb
commit e8a680cdf3
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source3/libnet/libnet_conf.c
View File

@ -100,26 +100,6 @@ static WERROR libnet_smbconf_reg_open_basepath(TALLOC_CTX *ctx,
return libnet_smbconf_reg_open_path(ctx, NULL, desired_access, key);
}
/*
* check if a subkey of KEY_SMBCONF of a given name exists
*/
bool libnet_smbconf_key_exists(const char *subkeyname)
{
bool ret = false;
WERROR werr = WERR_OK;
TALLOC_CTX *mem_ctx = talloc_stackframe();
struct registry_key *key = NULL;
werr = libnet_smbconf_reg_open_path(mem_ctx, subkeyname, REG_KEY_READ,
&key);
if (W_ERROR_IS_OK(werr)) {
ret = true;
}
TALLOC_FREE(mem_ctx);
return ret;
}
static bool libnet_smbconf_value_exists(struct registry_key *key,
const char *param)
{
@ -530,7 +510,7 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
}
/* make sure "global" is always listed first */
if (libnet_smbconf_key_exists(GLOBAL_NAME)) {
if (libnet_smbconf_share_exists(GLOBAL_NAME)) {
werr = libnet_smbconf_add_string_to_array(tmp_ctx,
&tmp_share_names,
0, GLOBAL_NAME);
@ -582,6 +562,26 @@ done:
return werr;
}
/**
* check if a share/service of a given name exists
*/
bool libnet_smbconf_share_exists(const char *subkeyname)
{
bool ret = false;
WERROR werr = WERR_OK;
TALLOC_CTX *mem_ctx = talloc_stackframe();
struct registry_key *key = NULL;
werr = libnet_smbconf_reg_open_path(mem_ctx, subkeyname, REG_KEY_READ,
&key);
if (W_ERROR_IS_OK(werr)) {
ret = true;
}
TALLOC_FREE(mem_ctx);
return ret;
}
/**
* get a definition of a share (service) from configuration.
*/
@ -638,7 +638,7 @@ WERROR libnet_smbconf_setparm(const char *service,
struct registry_key *key = NULL;
TALLOC_CTX *mem_ctx = talloc_stackframe();
if (!libnet_smbconf_key_exists(service)) {
if (!libnet_smbconf_share_exists(service)) {
werr = libnet_smbconf_reg_createkey_internal(mem_ctx, service,
&key);
} else {
@ -673,7 +673,7 @@ WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
goto done;
}
if (!libnet_smbconf_key_exists(service)) {
if (!libnet_smbconf_share_exists(service)) {
werr = WERR_NO_SUCH_SERVICE;
goto done;
}
@ -716,7 +716,7 @@ WERROR libnet_smbconf_delparm(const char *service,
WERROR werr = WERR_OK;
TALLOC_CTX *mem_ctx = talloc_stackframe();
if (!libnet_smbconf_key_exists(service)) {
if (!libnet_smbconf_share_exists(service)) {
return WERR_NO_SUCH_SERVICE;
}

2
source3/utils/net_conf.c
View File

@ -208,7 +208,7 @@ static int import_process_service(TALLOC_CTX *ctx,
if (opt_testmode) {
d_printf("[%s]\n", servicename);
} else {
if (libnet_smbconf_key_exists(servicename)) {
if (libnet_smbconf_share_exists(servicename)) {
werr = libnet_smbconf_delshare(servicename);
if (!W_ERROR_IS_OK(werr)) {
goto done;