The branch, v3-2-test has been updated
via 3fa3891f8721e9f02594cd1be2dc6b9b88692416 (commit)
via 4c0e7270c42788e7f77c402032ae74cf0f8a7106 (commit)
via 4b0e636965bd37e7c0deecb7b5eff0cc4487408b (commit)
via e63cc54fab8a0b03573f76305eab366a3ee4eda1 (commit)
from e33286f4a68352e55df081d06307f64f190773b3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 3fa3891f8721e9f02594cd1be2dc6b9b88692416
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Wed Dec 26 01:03:28 2007 +0100
Move libnet_smbconf_reg_open_basepath() in source file
to group helper functions more logically.
Michael
commit 4c0e7270c42788e7f77c402032ae74cf0f8a7106
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Wed Dec 26 01:01:14 2007 +0100
Rename libnet_smbconf_open_basepath() to libnet_smbconf_reg_open_basepath().
Michael
commit 4b0e636965bd37e7c0deecb7b5eff0cc4487408b
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Wed Dec 26 00:58:11 2007 +0100
Rename libnet_smbconf_open_path() to libnet_smbconf_reg_open_path().
Michael
commit e63cc54fab8a0b03573f76305eab366a3ee4eda1
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Wed Dec 26 00:53:19 2007 +0100
Rename libnet_smbconf_open_path_q() to libnet_smbconf_open_path()
removing previouse libnet_smbconf_open_path() and adding
DEBUG output (instead of d_fprintf error output) to new
libnet_smbconf_open_path().
Michael
-----------------------------------------------------------------------
Summary of changes:
source/libnet/libnet_conf.c | 70 +++++++++++++++++-------------------------
source/utils/net_conf.c | 7 ++--
2 files changed, 32 insertions(+), 45 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index bb0e637..93e1300 100644
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -29,12 +29,11 @@
/*
* Open a subkey of KEY_SMBCONF (i.e a service)
- * - variant without error output (q = quiet)-
*/
-static WERROR libnet_smbconf_open_path_q(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;
@@ -54,12 +53,26 @@ static WERROR libnet_smbconf_open_path_q(TALLOC_CTX *ctx,
werr = reg_open_path(ctx, path, desired_access,
token, key);
+ if (!W_ERROR_IS_OK(werr)) {
+ DEBUG(1, ("Error opening registry path '%s': %s\n",
+ path, dos_errstr(werr)));
+ }
+
done:
TALLOC_FREE(path);
return werr;
}
/*
+ * open the base key KEY_SMBCONF
+ */
+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);
+}
+
+/*
* check if a subkey of KEY_SMBCONF of a given name exists
*/
bool libnet_smbconf_key_exists(const char *subkeyname)
@@ -69,7 +82,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_q(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;
}
@@ -96,36 +110,6 @@ static bool libnet_smbconf_value_exists(struct registry_key
*key,
}
/*
- * Open a subkey of KEY_SMBCONF (i.e a service)
- * - variant with error output -
- */
-WERROR libnet_smbconf_open_path(TALLOC_CTX *ctx, const char *subkeyname,
- uint32 desired_access,
- struct registry_key **key)
-{
- WERROR werr = WERR_OK;
-
- werr = libnet_smbconf_open_path_q(ctx, subkeyname, desired_access, key);
- if (!W_ERROR_IS_OK(werr)) {
- d_fprintf(stderr, "Error opening registry path '%s\\%s': %s\n",
- KEY_SMBCONF,
- (subkeyname == NULL) ? "" : subkeyname,
- dos_errstr(werr));
- }
-
- return werr;
-}
-
-/*
- * open the base key KEY_SMBCONF
- */
-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);
-}
-
-/*
* create a subkey of KEY_SMBCONF
*/
WERROR libnet_smbconf_reg_createkey_internal(TALLOC_CTX *ctx,
@@ -145,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;
}
@@ -298,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;
}
@@ -322,8 +307,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;
@@ -349,7 +334,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;
}
@@ -377,7 +363,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 df85d7e..8b89f2f 100644
--- a/source/utils/net_conf.c
+++ b/source/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;
}
@@ -565,7 +566,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;
}
--
Samba Shared Repository
