From 4b0e636965bd37e7c0deecb7b5eff0cc4487408b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 26 Dec 2007 00:58:11 +0100
Subject: [PATCH] Rename libnet_smbconf_open_path() to
 libnet_smbconf_reg_open_path().

Michael
---
 source/libnet/libnet_conf.c | 22 ++++++++++++----------
 source/utils/net_conf.c     |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index 3598f6c23ce..59989eccd58 100644
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -30,10 +30,10 @@
 /*
  * Open a subkey of KEY_SMBCONF (i.e a service)
  */
-WERROR libnet_smbconf_open_path(TALLOC_CTX *ctx,
-				       const char *subkeyname,
-				       uint32 desired_access,
-				       struct registry_key **key)
+WERROR libnet_smbconf_reg_open_path(TALLOC_CTX *ctx,
+				    const char *subkeyname,
+				    uint32 desired_access,
+				    struct registry_key **key)
 {
 	WERROR werr = WERR_OK;
 	char *path = NULL;
@@ -73,7 +73,8 @@ bool libnet_smbconf_key_exists(const char *subkeyname)
 	TALLOC_CTX *mem_ctx = talloc_stackframe();
 	struct registry_key *key = NULL;
 
-	werr = libnet_smbconf_open_path(mem_ctx, subkeyname, REG_KEY_READ, &key);
+	werr = libnet_smbconf_reg_open_path(mem_ctx, subkeyname, REG_KEY_READ,
+					    &key);
 	if (W_ERROR_IS_OK(werr)) {
 		ret = true;
 	}
@@ -105,7 +106,7 @@ static bool libnet_smbconf_value_exists(struct registry_key *key,
 WERROR libnet_smbconf_open_basepath(TALLOC_CTX *ctx, uint32 desired_access,
 			     	    struct registry_key **key)
 {
-	return libnet_smbconf_open_path(ctx, NULL, desired_access, key);
+	return libnet_smbconf_reg_open_path(ctx, NULL, desired_access, key);
 }
 
 /*
@@ -305,8 +306,8 @@ WERROR libnet_smbconf_setparm(const char *service,
 		werr = libnet_smbconf_reg_createkey_internal(mem_ctx, service,
 							     &key);
 	} else {
-		werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_WRITE,
-						&key);
+		werr = libnet_smbconf_reg_open_path(mem_ctx, service,
+						    REG_KEY_WRITE, &key);
 	}
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -332,7 +333,8 @@ WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 
-	werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_READ, &key);
+	werr = libnet_smbconf_reg_open_path(mem_ctx, service, REG_KEY_READ,
+					    &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -360,7 +362,7 @@ WERROR libnet_smbconf_delparm(const char *service,
 		return WERR_NO_SUCH_SERVICE;
 	}
 
-	werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_ALL, &key);
+	werr = libnet_smbconf_reg_open_path(mem_ctx, service, REG_KEY_ALL, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index df85d7eb4b4..348e91a15f0 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -565,7 +565,7 @@ int net_conf_showshare(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_open_path(ctx, argv[0], REG_KEY_READ, &key);
+	werr = libnet_smbconf_reg_open_path(ctx, argv[0], REG_KEY_READ, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
2.11.4.GIT