[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Mon Mar 29 11:28:31 MDT 2010
The branch, master has been updated
via a5e6b55... registry: Fix compilation.
via 38fc9df... Revert reordering from commit 51bedf939568717424edd7732e1e315faa333849
via 2d67912... Revert "s4:registry - util.c - add harder checks for inputs on "reg_val_data_string""
via 16427ef... Revert "s4:registry - util.c - move the "REG_NONE" case in the conversion functions on top of the switch"
via b1c70d4... Revert "s4:registry - util.c - treat unsupported and binary values as the same in the conversion functions"
via cb670f3... Revert "s4:registry - adaptions for "add memory contexts for delete value/key functions""
via f8e67f198. Revert "s4:registry - "util" - make "reg_key_add_abs" consistent with "reg_key_del_abs""
via d90f1a7... Revert of commit 5b6ad54f43741c0c25b35e44cafe5fed352ff133 in registry.h
via 541e294... Remove incorrect const, something that was correct in commit 9c3e6249fd984b823a77cab0514601d2a487920a
via 3629798... Revert "s4:registry - "util" - remove "const" from "reg_abs_path""
from cac9981... s3:rpc_client: remove more unused code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a5e6b5589b9d8498740a289dba2d56d3eb14af72
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Mar 29 18:43:38 2010 +0200
registry: Fix compilation.
commit 38fc9dfdc6046e21cd8f0127e2cd88f72f81b3b3
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 17:07:09 2010 +0200
Revert reordering from commit 51bedf939568717424edd7732e1e315faa333849
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit 2d6791286b97236136de468ebf4173bd35336b6e
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 17:03:08 2010 +0200
Revert "s4:registry - util.c - add harder checks for inputs on "reg_val_data_string""
This reverts commit eb8c8a0ecaa9bfd29f090db21fccdad7751767ae.
Conflicts:
source4/lib/registry/util.c
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit 16427efb749d63b5a54b2b260ea8ac565f63a9e7
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 16:46:53 2010 +0200
Revert "s4:registry - util.c - move the "REG_NONE" case in the conversion functions on top of the switch"
This reverts commit 4e6c0e1f6f37a7e04d10dbf7abbf626f52232aaf.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit b1c70d49c9f8e99997fe3c9228e92db5e6ad3ad4
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 16:46:30 2010 +0200
Revert "s4:registry - util.c - treat unsupported and binary values as the same in the conversion functions"
This reverts commit cc3eec1681bb6d614e688f51e48bd76f6d513e67.
Conflicts:
source4/lib/registry/util.c
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit cb670f366cdc7d3dd457bd40fc37349c4484b54b
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 16:30:43 2010 +0200
Revert "s4:registry - adaptions for "add memory contexts for delete value/key functions""
This reverts commit 43170dafbcbe7464bce9b4c6d76532d7d0bf5b9a.
Conflicts:
source4/lib/registry/dir.c
source4/lib/registry/util.c
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit f8e67f198ad6e42f7563390012f30fffe43b92f7
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 16:18:46 2010 +0200
Revert "s4:registry - "util" - make "reg_key_add_abs" consistent with "reg_key_del_abs""
This reverts commit 9d8592978e28c492d971a3b5a4c0133febc149ea.
Conflicts:
source4/lib/registry/util.c
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit d90f1a7146385328dfd8e5245e7b1f83eb46e7e1
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 16:12:22 2010 +0200
Revert of commit 5b6ad54f43741c0c25b35e44cafe5fed352ff133 in registry.h
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit 541e2942f8dcda970a8b83c7832ea5c09cb38fc8
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 16:03:12 2010 +0200
Remove incorrect const, something that was correct in commit 9c3e6249fd984b823a77cab0514601d2a487920a
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
commit 3629798f72aa9126e115a8f38e0455245794f9c3
Author: Wilco Baan Hofman <wilco at baanhofman.nl>
Date: Sun Mar 28 15:59:53 2010 +0200
Revert "s4:registry - "util" - remove "const" from "reg_abs_path""
This reverts commit 9c3e6249fd984b823a77cab0514601d2a487920a.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source4/lib/registry/patchfile.c | 2 +-
source4/lib/registry/pyregistry.c | 2 +-
source4/lib/registry/registry.h | 3 +-
source4/lib/registry/util.c | 88 ++++++++++++++++++++----------------
4 files changed, 52 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c
index 9ca00bd..a01c355 100644
--- a/source4/lib/registry/patchfile.c
+++ b/source4/lib/registry/patchfile.c
@@ -435,7 +435,7 @@ static WERROR reg_diff_apply_del_key(void *_ctx, const char *key_name)
/* therefore all children recursively and the "WERR_BADFILE" result is */
/* expected. */
- reg_key_del_abs(ctx, ctx, key_name);
+ reg_key_del_abs(ctx, key_name);
return WERR_OK;
}
diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c
index d2302af..d7295b5 100644
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -61,7 +61,7 @@ static PyObject *py_key_del_abs(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "s", &path))
return NULL;
- result = reg_key_del_abs(NULL, ctx, path);
+ result = reg_key_del_abs(ctx, path);
PyErr_WERROR_IS_ERR_RAISE(result);
Py_RETURN_NONE;
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
index 8fe26ce..3ac50d5 100644
--- a/source4/lib/registry/registry.h
+++ b/source4/lib/registry/registry.h
@@ -460,8 +460,7 @@ bool reg_string_to_val(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_
const char *data_str, uint32_t *type, DATA_BLOB *data);
WERROR reg_open_key_abs(TALLOC_CTX *mem_ctx, struct registry_context *handle,
const char *name, struct registry_key **result);
-WERROR reg_key_del_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
- const char *path);
+WERROR reg_key_del_abs(struct registry_context *ctx, const char *path);
WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
const char *path, uint32_t access_mask,
struct security_descriptor *sec_desc,
diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c
index 456a9d3..69c49f2 100644
--- a/source4/lib/registry/util.c
+++ b/source4/lib/registry/util.c
@@ -69,38 +69,40 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx,
return talloc_strdup(mem_ctx, "");
switch (type) {
- case REG_NONE:
- /* "NULL" is the right return value */
- break;
case REG_EXPAND_SZ:
case REG_SZ:
- if (data.length % 2 == 0) {
- convert_string_talloc_convenience(mem_ctx,
- iconv_convenience,
- CH_UTF16, CH_UNIX,
- data.data,
- data.length,
- (void **)&ret,
- NULL, false);
- }
+ convert_string_talloc_convenience(mem_ctx,
+ iconv_convenience,
+ CH_UTF16, CH_UNIX,
+ data.data,
+ data.length,
+ (void **)&ret,
+ NULL, false);
break;
case REG_DWORD:
case REG_DWORD_BIG_ENDIAN:
- if (data.length == sizeof(uint32_t)) {
+ SMB_ASSERT(data.length == sizeof(uint32_t));
ret = talloc_asprintf(mem_ctx, "0x%8.8x",
IVAL(data.data, 0));
- }
break;
case REG_QWORD:
- if (data.length == sizeof(uint64_t)) {
- ret = talloc_asprintf(mem_ctx, "0x%16.16llx",
- BVAL(data.data, 0));
- }
+ SMB_ASSERT(data.length == sizeof(uint64_t));
+ ret = talloc_asprintf(mem_ctx, "0x%16.16llx",
+ BVAL(data.data, 0));
break;
case REG_BINARY:
- default:
ret = data_blob_hex_string_upper(mem_ctx, &data);
break;
+ case REG_NONE:
+ /* "NULL" is the right return value */
+ break;
+ case REG_MULTI_SZ:
+ /* FIXME: We don't support this yet */
+ break;
+ default:
+ /* FIXME */
+ /* Other datatypes aren't supported -> return "NULL" */
+ break;
}
return ret;
@@ -141,9 +143,6 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
/* Convert data appropriately */
switch (*type) {
- case REG_NONE:
- ZERO_STRUCTP(data);
- break;
case REG_SZ:
case REG_EXPAND_SZ:
return convert_string_talloc_convenience(mem_ctx,
@@ -154,6 +153,9 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
(void **)&data->data,
&data->length, false);
break;
+ case REG_BINARY:
+ *data = strhex_to_data_blob(mem_ctx, data_str);
+ break;
case REG_DWORD:
case REG_DWORD_BIG_ENDIAN: {
uint32_t tmp = strtol(data_str, NULL, 0);
@@ -169,10 +171,16 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
SBVAL(data->data, 0, tmp);
}
break;
- case REG_BINARY:
- default:
- *data = strhex_to_data_blob(mem_ctx, data_str);
+ case REG_NONE:
+ ZERO_STRUCTP(data);
break;
+ case REG_MULTI_SZ:
+ /* FIXME: We don't support this yet */
+ return false;
+ default:
+ /* FIXME */
+ /* Other datatypes aren't supported -> return no success */
+ return false;
}
return true;
}
@@ -211,7 +219,7 @@ WERROR reg_open_key_abs(TALLOC_CTX *mem_ctx, struct registry_context *handle,
static WERROR get_abs_parent(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
const char *path, struct registry_key **parent,
- char **name)
+ const char **name)
{
char *parent_name;
WERROR error;
@@ -234,11 +242,11 @@ static WERROR get_abs_parent(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
return WERR_OK;
}
-WERROR reg_key_del_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
- const char *path)
+WERROR reg_key_del_abs(struct registry_context *ctx, const char *path)
{
struct registry_key *parent;
- char *n;
+ const char *n;
+ TALLOC_CTX *mem_ctx = talloc_init("reg_key_del_abs");
WERROR error;
if (!strchr(path, '\\')) {
@@ -248,11 +256,10 @@ WERROR reg_key_del_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
error = get_abs_parent(mem_ctx, ctx, path, &parent, &n);
if (W_ERROR_IS_OK(error)) {
error = reg_key_del(mem_ctx, parent, n);
-
- talloc_free(parent);
- talloc_free(n);
}
+ talloc_free(mem_ctx);
+
return error;
}
@@ -262,7 +269,7 @@ WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
struct registry_key **result)
{
struct registry_key *parent;
- char *n;
+ const char *n;
WERROR error;
*result = NULL;
@@ -272,13 +279,16 @@ WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx,
}
error = get_abs_parent(mem_ctx, ctx, path, &parent, &n);
- if (W_ERROR_IS_OK(error)) {
- error = reg_key_add_name(mem_ctx, parent, n, NULL, sec_desc,
- result);
-
- talloc_free(parent);
- talloc_free(n);
+ if (!W_ERROR_IS_OK(error)) {
+ DEBUG(2, ("Opening parent of %s failed with %s\n", path,
+ win_errstr(error)));
+ return error;
}
+ error = reg_key_add_name(mem_ctx, parent, n, NULL, sec_desc, result);
+
+ talloc_free(parent);
+ talloc_free(n);
+
return error;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list