Rename libnet_smbconf_share_exists() to libnet_conf_share_exists().
authorMichael Adam <obnox@samba.org>
Thu, 3 Jan 2008 12:54:31 +0000 (13:54 +0100)
committerMichael Adam <obnox@samba.org>
Thu, 3 Jan 2008 13:17:49 +0000 (14:17 +0100)
Michael
(This used to be commit 3258758e5c8dfc2c681e1285cb34aaacae697a55)

source3/libnet/libnet_conf.c
source3/utils/net_conf.c

index 3cd3933b1f76417e6db40a139f09c63a9e09028e..cf11a42329f9c558615a25ce38914a253dba2ce8 100644 (file)
@@ -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;
        }
 
index 930d7b350811656385740b31abef10e15e20fb14..be1447f182ec1cb19e26d551f67d4dd788deb376 100644 (file)
@@ -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;