Rename libnet_smbconf_open_basepath() to libnet_smbconf_reg_open_basepath().

Michael
(This used to be commit 4c0e7270c42788e7f77c402032ae74cf0f8a7106)

diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 59989eccd58eeae42f09e13200c4b303d45eae4f..3c765769fe0b7b83c2da7ef079bca160a2287ab5 100644 (file)
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -103,8 +103,8 @@ static bool libnet_smbconf_value_exists(struct registry_key *key,
 /*
  * open the base key KEY_SMBCONF
  */
-WERROR libnet_smbconf_open_basepath(TALLOC_CTX *ctx, uint32 desired_access,
-                                   struct registry_key **key)
+WERROR libnet_smbconf_reg_open_basepath(TALLOC_CTX *ctx, uint32 desired_access,
+                                       struct registry_key **key)
 {
        return libnet_smbconf_reg_open_path(ctx, NULL, desired_access, key);
 }
@@ -129,7 +129,8 @@ WERROR libnet_smbconf_reg_createkey_internal(TALLOC_CTX *ctx,
                goto done;
        }
 
-       werr = libnet_smbconf_open_basepath(create_ctx, REG_KEY_WRITE, &create_parent);
+       werr = libnet_smbconf_reg_open_basepath(create_ctx, REG_KEY_WRITE,
+                                               &create_parent);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -282,7 +283,7 @@ WERROR libnet_smbconf_delshare(const char *servicename)
        struct registry_key *key = NULL;
        TALLOC_CTX *ctx = talloc_stackframe();
 
-       werr = libnet_smbconf_open_basepath(ctx, REG_KEY_WRITE, &key);
+       werr = libnet_smbconf_reg_open_basepath(ctx, REG_KEY_WRITE, &key);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 348e91a15f0728ceeb98c0ec21305013cef49a36..8b89f2fa6f09560c6d0706aecf98832fcee5d19d 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -345,7 +345,7 @@ int net_conf_list(int argc, const char **argv)
                goto done;
        }
 
-       werr = libnet_smbconf_open_basepath(ctx, REG_KEY_READ, &base_key);
+       werr = libnet_smbconf_reg_open_basepath(ctx, REG_KEY_READ, &base_key);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -503,7 +503,8 @@ int net_conf_listshares(int argc, const char **argv)
                goto done;
        }
 
-       werr = libnet_smbconf_open_basepath(ctx, SEC_RIGHTS_ENUM_SUBKEYS, &key);
+       werr = libnet_smbconf_reg_open_basepath(ctx, SEC_RIGHTS_ENUM_SUBKEYS,
+                                               &key);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }