Rename libnet_reg_createkey_internal() to libnet_smbconf_reg_createkey_internal().

Michael
(This used to be commit 0e7f215f54c68b2d40f65f90ed11c41e1a7ef5ed)

diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 9d06f8287b702b7d63c14bbc9e851510378d4501..69a105f8f53da4e2f6d426dcfaa4f0f0b611a78f 100644 (file)
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -134,9 +134,9 @@ WERROR libnet_smbconf_open_basepath(TALLOC_CTX *ctx, uint32 desired_access,
 /*
  * create a subkey of KEY_SMBCONF
  */
 /*
  * create a subkey of KEY_SMBCONF
  */

-WERROR libnet_reg_createkey_internal(TALLOC_CTX *ctx,
-                                    const char * subkeyname,
-                                    struct registry_key **newkey)
+WERROR libnet_smbconf_reg_createkey_internal(TALLOC_CTX *ctx,
+                                            const char * subkeyname,
+                                            struct registry_key **newkey)

 {
        WERROR werr = WERR_OK;
        struct registry_key *create_parent = NULL;
 {
        WERROR werr = WERR_OK;
        struct registry_key *create_parent = NULL;


@@ -258,7 +258,8 @@ WERROR libnet_smbconf_setparm(TALLOC_CTX *mem_ctx,
        struct registry_key *key = NULL;
 
        if (!libnet_smbconf_key_exists(mem_ctx, service)) {
        struct registry_key *key = NULL;
 
        if (!libnet_smbconf_key_exists(mem_ctx, service)) {

-               werr = libnet_reg_createkey_internal(mem_ctx, service, &key);
+               werr = libnet_smbconf_reg_createkey_internal(mem_ctx, service,
+                                                            &key);

        } else {
                werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_WRITE,
                                                &key);
        } else {
                werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_WRITE,
                                                &key);

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 1ab137891008f3dece39ed52a2dd5db54409513c..673d37317789a079b605d06f046006675ce1e937 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -346,7 +346,7 @@ static int import_process_service(TALLOC_CTX *ctx,
                                goto done;
                        }
                }
                                goto done;
                        }
                }

-               werr = libnet_reg_createkey_internal(tmp_ctx, servicename, &key);
+               werr = libnet_smbconf_reg_createkey_internal(tmp_ctx, servicename, &key);

                if (!W_ERROR_IS_OK(werr)) {
                        goto done;
                }
                if (!W_ERROR_IS_OK(werr)) {
                        goto done;
                }


@@ -776,7 +776,7 @@ int net_conf_addshare(int argc, const char **argv)
         * create the share
         */
 
         * create the share
         */
 

-       werr = libnet_reg_createkey_internal(NULL, argv[0], &newkey);
+       werr = libnet_smbconf_reg_createkey_internal(NULL, argv[0], &newkey);

        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }