summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-03 13:54:31 +0100
committerMichael Adam <obnox@samba.org>2008-01-03 14:17:49 +0100
commit630de5f555b7fb897e1bb700b2a0a3d8d611e9bd (patch)
tree34d8b48af25c44cdf8b31dfda47d18443a16b0ed
parentdaf1a460c821f247c43c22f1e26785d3acdb3ac3 (diff)
downloadsamba-630de5f555b7fb897e1bb700b2a0a3d8d611e9bd.tar.gz
samba-630de5f555b7fb897e1bb700b2a0a3d8d611e9bd.tar.bz2
samba-630de5f555b7fb897e1bb700b2a0a3d8d611e9bd.zip
Rename libnet_smbconf_share_exists() to libnet_conf_share_exists().
Michael (This used to be commit 3258758e5c8dfc2c681e1285cb34aaacae697a55)
-rw-r--r--source3/libnet/libnet_conf.c12
-rw-r--r--source3/utils/net_conf.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 3cd3933b1f..cf11a42329 100644
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -538,7 +538,7 @@ WERROR libnet_conf_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)) {
+ if (libnet_conf_share_exists(GLOBAL_NAME)) {
werr = libnet_conf_add_string_to_array(tmp_ctx,
&tmp_share_names,
0, GLOBAL_NAME);
@@ -592,7 +592,7 @@ 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;
@@ -618,7 +618,7 @@ WERROR libnet_smbconf_create_share(const char *servicename)
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;
}
@@ -686,7 +686,7 @@ WERROR libnet_smbconf_setparm(const char *service,
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;
}
@@ -721,7 +721,7 @@ 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;
}
@@ -764,7 +764,7 @@ WERROR libnet_smbconf_delparm(const char *service,
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;
}
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 930d7b3508..be1447f182 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -207,7 +207,7 @@ static int import_process_service(TALLOC_CTX *ctx,
if (opt_testmode) {
d_printf("[%s]\n", servicename);
} else {
- if (libnet_smbconf_share_exists(servicename)) {
+ if (libnet_conf_share_exists(servicename)) {
werr = libnet_smbconf_delshare(servicename);
if (!W_ERROR_IS_OK(werr)) {
goto done;
@@ -596,7 +596,7 @@ static int net_conf_addshare(int argc, const char **argv)
goto done;
}
- if (libnet_smbconf_share_exists(sharename)) {
+ if (libnet_conf_share_exists(sharename)) {
d_fprintf(stderr, "ERROR: share %s already exists.\n",
sharename);
goto done;