The branch, v3-2-test has been updated
via 0fe095e85ca981e5660a67f3fb7d7965ae62c667 (commit)
via 29f46c2d45e7ad7f8a9a525f9ac82c050a510967 (commit)
via d3a20c4d5a8109334cd3ed665ba60cfcc4425059 (commit)
from f5570dcf503a4b28ebf624d06fd090f3b6b0a560 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0fe095e85ca981e5660a67f3fb7d7965ae62c667
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sun Dec 23 23:58:58 2007 +0100
Fix rights error in libnet_smbconf_delparm().
Introduced by additional test for existence of given parameter.
Michael
commit 29f46c2d45e7ad7f8a9a525f9ac82c050a510967
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sun Dec 23 23:02:47 2007 +0100
Remove redundant check of return value.
Michael
commit d3a20c4d5a8109334cd3ed665ba60cfcc4425059
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sun Dec 23 15:07:20 2007 +0100
Move logic of net_conf_getparm() to libnet_conf.c.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/libnet/libnet_conf.c | 29 ++++++++++++++++++++++++++---
source/utils/net_conf.c | 22 ++++++++++------------
2 files changed, 36 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libnet/libnet_conf.c b/source/libnet/libnet_conf.c
index 69a105f..3a64c3d 100644
--- a/source/libnet/libnet_conf.c
+++ b/source/libnet/libnet_conf.c
@@ -271,6 +271,30 @@ WERROR libnet_smbconf_setparm(TALLOC_CTX *mem_ctx,
return werr;
}
+WERROR libnet_smbconf_getparm(TALLOC_CTX *mem_ctx,
+ const char *service,
+ const char *param,
+ struct registry_value **value)
+{
+ WERROR werr;
+ struct registry_key *key = NULL;
+
+ if (!libnet_smbconf_key_exists(mem_ctx, service)) {
+ return WERR_NO_SUCH_SERVICE;
+ }
+
+ werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_READ, &key);
+ W_ERROR_NOT_OK_RETURN(werr);
+
+ if (!libnet_smbconf_value_exists(mem_ctx, key, param)) {
+ return WERR_INVALID_PARAM;
+ }
+
+ werr = reg_queryvalue(mem_ctx, key, param, value);
+
+ return werr;
+}
+
WERROR libnet_smbconf_delparm(TALLOC_CTX *mem_ctx,
const char *service,
const char *param)
@@ -282,7 +306,7 @@ WERROR libnet_smbconf_delparm(TALLOC_CTX *mem_ctx,
return WERR_NO_SUCH_SERVICE;
}
- werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_READ, &key);
+ werr = libnet_smbconf_open_path(mem_ctx, service, REG_KEY_ALL, &key);
W_ERROR_NOT_OK_RETURN(werr);
if (!libnet_smbconf_value_exists(mem_ctx, key, param)) {
@@ -290,9 +314,8 @@ WERROR libnet_smbconf_delparm(TALLOC_CTX *mem_ctx,
}
werr = reg_deletevalue(key, param);
- W_ERROR_NOT_OK_RETURN(werr);
- return WERR_OK;
+ return werr;
}
diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index 673d373..f3f2321 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -869,7 +869,6 @@ static int net_conf_getparm(int argc, const char **argv)
{
int ret = -1;
WERROR werr = WERR_OK;
- struct registry_key *key = NULL;
char *service = NULL;
char *param = NULL;
struct registry_value *value = NULL;
@@ -884,21 +883,20 @@ static int net_conf_getparm(int argc, const char **argv)
service = strdup_lower(argv[0]);
param = strdup_lower(argv[1]);
- if (!libnet_smbconf_key_exists(ctx, service)) {
+ werr = libnet_smbconf_getparm(ctx, service, param, &value);
+
+ if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
d_fprintf(stderr,
- "ERROR: given service '%s' does not exist.\n",
+ "Error: given service '%s' does not exist.\n",
service);
goto done;
- }
-
- werr = libnet_smbconf_open_path(ctx, service, REG_KEY_READ, &key);
- if (!W_ERROR_IS_OK(werr)) {
+ } else if (W_ERROR_EQUAL(werr, WERR_INVALID_PARAM)) {
+ d_fprintf(stderr,
+ "Error: given parameter '%s' is not set.\n",
+ param);
goto done;
- }
-
- werr = reg_queryvalue(ctx, key, param, &value);
- if (!W_ERROR_IS_OK(werr)) {
- d_fprintf(stderr, "Error querying value '%s': %s.\n",
+ } else if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "Error getting value '%s': %s.\n",
param, dos_errstr(werr));
goto done;
}
--
Samba Shared Repository
