summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-07-07 22:33:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:52 -0500
commit1bea19c1273bdf934663afc0ba63c3873a2fa303 (patch)
tree55a1a4ea023fd9780d704dac12206ae0313a06b3
parentcba898808e4caf7f7f622dcd9124e115babf5f5a (diff)
downloadsamba-1bea19c1273bdf934663afc0ba63c3873a2fa303.tar.gz
samba-1bea19c1273bdf934663afc0ba63c3873a2fa303.tar.bz2
samba-1bea19c1273bdf934663afc0ba63c3873a2fa303.zip
r23749: Simplify prototype of reg_setvalue_internal:
eliminate "type" parameter since we store only REG_SZ. Michael (This used to be commit 65ce4633171eabd6fc94677cb7d884d6125d0745)
-rw-r--r--source3/utils/net_conf.c31
1 files changed, 9 insertions, 22 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index f06a5f660d..9d4f4601e4 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -147,7 +147,6 @@ static char *format_value(TALLOC_CTX *mem_ctx, struct registry_value *value)
*/
static WERROR reg_setvalue_internal(struct registry_key *key,
const char *valname,
- const char *valtype,
const char *valstr)
{
struct registry_value val;
@@ -155,21 +154,9 @@ static WERROR reg_setvalue_internal(struct registry_key *key,
ZERO_STRUCT(val);
- if (strequal(valtype, "dword")) {
- val.type = REG_DWORD;
- val.v.dword = strtoul(valstr, NULL, 10);
- }
- else if (strequal(valtype, "sz")) {
- val.type = REG_SZ;
- val.v.sz.str = CONST_DISCARD(char *, valstr);
- val.v.sz.len = strlen(valstr) + 1;
- }
- else {
- d_fprintf(stderr, "Only value types DWORD and SZ are"
- "currently implemented for setting values.\n");
- werr = WERR_INVALID_PARAM;
- goto done;
- }
+ val.type = REG_SZ;
+ val.v.sz.str = CONST_DISCARD(char *, valstr);
+ val.v.sz.len = strlen(valstr) + 1;
if (!lp_parameter_is_valid(valname)) {
d_fprintf(stderr, "Invalid parameter '%s' given.\n", valname);
@@ -577,7 +564,7 @@ static int import_process_service(TALLOC_CTX *ctx,
}
else {
werr = reg_setvalue_internal(key, parm->label,
- "sz", valstr);
+ valstr);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -979,21 +966,21 @@ int net_conf_addshare(int argc, const char **argv)
/* add config params as values */
- werr = reg_setvalue_internal(newkey, "path", "sz", path);
+ werr = reg_setvalue_internal(newkey, "path", path);
if (!W_ERROR_IS_OK(werr))
goto done;
if (comment != NULL) {
- werr = reg_setvalue_internal(newkey, "comment", "sz", comment);
+ werr = reg_setvalue_internal(newkey, "comment", comment);
if (!W_ERROR_IS_OK(werr))
goto done;
}
- werr = reg_setvalue_internal(newkey, "guest ok", "sz", guest_ok);
+ werr = reg_setvalue_internal(newkey, "guest ok", guest_ok);
if (!W_ERROR_IS_OK(werr))
goto done;
- werr = reg_setvalue_internal(newkey, "writeable", "sz", writeable);
+ werr = reg_setvalue_internal(newkey, "writeable", writeable);
if (!W_ERROR_IS_OK(werr))
goto done;
@@ -1053,7 +1040,7 @@ static int net_conf_setparm(int argc, const char **argv)
goto done;
}
- werr = reg_setvalue_internal(key, param, "sz", value_str);
+ werr = reg_setvalue_internal(key, param, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, "Error setting value '%s': %s\n",
param, dos_errstr(werr));