This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
/**
* Test obtaining a predefined key.
*/
-static bool test_get_predefined(struct torture_context *tctx,
- const void *_data)
+static bool test_get_predefined(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root;
WERROR error;
* Test obtaining a predefined key.
*/
static bool test_get_predefined_unknown(struct torture_context *tctx,
- const void *_data)
+ void *_data)
{
- const struct registry_context *rctx = _data;
+ struct registry_context *rctx = _data;
struct registry_key *root;
WERROR error;
error = reg_get_predefined_key(rctx, 1337, &root);
- torture_assert_werr_equal(tctx, error, WERR_NOT_FOUND,
+ torture_assert_werr_equal(tctx, error, WERR_BADFILE,
"getting predefined key failed");
return true;
}
-static bool test_predef_key_by_name(struct torture_context *tctx,
- const void *_data)
+static bool test_predef_key_by_name(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root;
WERROR error;
}
static bool test_predef_key_by_name_invalid(struct torture_context *tctx,
- const void *_data)
+ void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root;
WERROR error;
/**
* Test creating a new subkey
*/
-static bool test_create_subkey(struct torture_context *tctx,
- const void *_data)
+static bool test_create_subkey(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root, *newkey;
WERROR error;
/**
* Test creating a new nested subkey
*/
-static bool test_create_nested_subkey(struct torture_context *tctx,
- const void *_data)
+static bool test_create_nested_subkey(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root, *newkey1, *newkey2;
WERROR error;
/**
* Test creating a new subkey
*/
-static bool test_key_add_abs_top(struct torture_context *tctx,
- const void *_data)
+static bool test_key_add_abs_top(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root;
WERROR error;
/**
* Test creating a new subkey
*/
-static bool test_key_add_abs(struct torture_context *tctx,
- const void *_data)
+static bool test_key_add_abs(struct torture_context *tctx, void *_data)
{
WERROR error;
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root, *result1, *result2;
error = reg_key_add_abs(tctx, rctx, "HKEY_CLASSES_ROOT\\bloe", 0, NULL,
}
-static bool test_del_key(struct torture_context *tctx, const void *_data)
+static bool test_del_key(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root, *newkey;
WERROR error;
torture_assert_werr_ok(tctx, error,
"getting predefined key failed");
- error = reg_key_add_name(rctx, root, "Hamburg", NULL, NULL, &newkey);
+ error = reg_key_add_name(rctx, root, "Polen", NULL, NULL, &newkey);
torture_assert_werr_ok(tctx, error, "Creating key return code");
torture_assert(tctx, newkey != NULL, "Creating new key");
- error = reg_key_del(root, "Hamburg");
+ error = reg_key_del(root, "Polen");
torture_assert_werr_ok(tctx, error, "Delete key");
- error = reg_key_del(root, "Hamburg");
- torture_assert_werr_equal(tctx, error, WERR_NOT_FOUND,
+ error = reg_key_del(root, "Polen");
+ torture_assert_werr_equal(tctx, error, WERR_BADFILE,
"Delete missing key");
return true;
* creating a single key for testing purposes.
*/
static bool create_test_key(struct torture_context *tctx,
- const struct registry_context *rctx,
+ struct registry_context *rctx,
const char *name,
struct registry_key **root,
struct registry_key **subkey)
}
-static bool test_flush_key(struct torture_context *tctx, const void *_data)
+static bool test_flush_key(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root, *subkey;
WERROR error;
- if (!create_test_key(tctx, rctx, "Munchen", &root, &subkey))
+ if (!create_test_key(tctx, rctx, "Bremen", &root, &subkey))
return false;
error = reg_key_flush(subkey);
return true;
}
-static bool test_query_key(struct torture_context *tctx, const void *_data)
+static bool test_query_key(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root, *subkey;
WERROR error;
NTTIME last_changed_time;
error = reg_key_get_info(tctx, subkey, &classname,
&num_subkeys, &num_values,
- &last_changed_time);
+ &last_changed_time, NULL, NULL, NULL);
torture_assert_werr_ok(tctx, error, "get info key");
torture_assert(tctx, classname == NULL, "classname");
return true;
}
-static bool test_query_key_nums(struct torture_context *tctx, const void *_data)
+static bool test_query_key_nums(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *root, *subkey1, *subkey2;
WERROR error;
uint32_t num_subkeys, num_values;
- uint32_t data = 42;
+ char data[4];
+ SIVAL(data, 0, 42);
if (!create_test_key(tctx, rctx, "Berlin", &root, &subkey1))
return false;
torture_assert_werr_ok(tctx, error, "set value");
error = reg_key_get_info(tctx, subkey1, NULL, &num_subkeys,
- &num_values, NULL);
+ &num_values, NULL, NULL, NULL, NULL);
torture_assert_werr_ok(tctx, error, "get info key");
torture_assert_int_equal(tctx, num_subkeys, 1, "num subkeys");
* the returned parameters for get_subkey_by_index are optional and
* that enumerating the parents of a non-top-level node works.
*/
-static bool test_list_subkeys(struct torture_context *tctx, const void *_data)
+static bool test_list_subkeys(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *subkey = NULL, *root;
WERROR error;
NTTIME last_mod_time;
/**
* Test setting a value
*/
-static bool test_set_value(struct torture_context *tctx, const void *_data)
+static bool test_set_value(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *subkey = NULL, *root;
WERROR error;
- uint32_t data = 42;
+ char data[4];
+
+ SIVAL(data, 0, 42);
if (!create_test_key(tctx, rctx, "Dusseldorf", &root, &subkey))
return false;
error = reg_val_set(subkey, "Answer", REG_DWORD,
- data_blob_talloc(tctx, &data, sizeof(data)));
+ data_blob_talloc(tctx, data, sizeof(data)));
torture_assert_werr_ok (tctx, error, "setting value");
return true;
/**
* Test getting/setting security descriptors
*/
-static bool test_security(struct torture_context *tctx, const void *_data)
+static bool test_security(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *subkey = NULL, *root;
WERROR error;
struct security_descriptor *osd, *nsd;
SEC_ACE_FLAG_OBJECT_INHERIT,
NULL);
- error = reg_set_security(subkey, osd);
- torture_assert_werr_ok(tctx, error, "setting security");
+ error = reg_set_sec_desc(subkey, osd);
+ torture_assert_werr_ok(tctx, error, "setting security descriptor");
- error = reg_get_security(tctx, subkey, &nsd);
- torture_assert_werr_ok (tctx, error, "setting security");
+ error = reg_get_sec_desc(tctx, subkey, &nsd);
+ torture_assert_werr_ok (tctx, error, "getting security descriptor");
torture_assert(tctx, security_descriptor_equal(osd, nsd),
"security descriptor changed!");
/**
* Test getting a value
*/
-static bool test_get_value(struct torture_context *tctx, const void *_data)
+static bool test_get_value(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *subkey = NULL, *root;
WERROR error;
DATA_BLOB data;
- uint32_t value = 42;
+ char value[4];
uint32_t type;
+ SIVAL(value, 0, 42);
if (!create_test_key(tctx, rctx, "Duisburg", &root, &subkey))
return false;
error = reg_key_get_value_by_name(tctx, subkey, __FUNCTION__, &type,
&data);
- torture_assert_werr_equal(tctx, error, WERR_NOT_FOUND,
+ torture_assert_werr_equal(tctx, error, WERR_BADFILE,
"getting missing value");
error = reg_val_set(subkey, __FUNCTION__, REG_DWORD,
- data_blob_talloc(tctx, &value, 4));
+ data_blob_talloc(tctx, value, sizeof(value)));
torture_assert_werr_ok(tctx, error, "setting value");
error = reg_key_get_value_by_name(tctx, subkey, __FUNCTION__, &type,
&data);
torture_assert_werr_ok(tctx, error, "getting value");
- torture_assert_int_equal(tctx, 4, data.length, "value length ok");
- torture_assert(tctx, memcmp(data.data, &value, 4) == 0,
- "value content ok");
+ torture_assert_int_equal(tctx, sizeof(value), data.length, "value length ok");
+ torture_assert_mem_equal(tctx, data.data, value, sizeof(value),
+ "value content ok");
torture_assert_int_equal(tctx, REG_DWORD, type, "value type");
return true;
/**
* Test unsetting a value
*/
-static bool test_del_value(struct torture_context *tctx, const void *_data)
+static bool test_del_value(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx =(struct registry_context *)_data;
struct registry_key *subkey = NULL, *root;
WERROR error;
DATA_BLOB data;
- uint32_t value = 42;
uint32_t type;
+ char value[4];
+ SIVAL(value, 0, 42);
- if (!create_test_key(tctx, rctx, "Duisburg", &root, &subkey))
+ if (!create_test_key(tctx, rctx, "Warschau", &root, &subkey))
return false;
error = reg_key_get_value_by_name(tctx, subkey, __FUNCTION__, &type,
&data);
- torture_assert_werr_equal(tctx, error, WERR_NOT_FOUND,
+ torture_assert_werr_equal(tctx, error, WERR_BADFILE,
"getting missing value");
error = reg_val_set(subkey, __FUNCTION__, REG_DWORD,
- data_blob_talloc(tctx, &value, 4));
+ data_blob_talloc(tctx, value, sizeof(value)));
torture_assert_werr_ok (tctx, error, "setting value");
error = reg_del_value(subkey, __FUNCTION__);
error = reg_key_get_value_by_name(tctx, subkey, __FUNCTION__,
&type, &data);
- torture_assert_werr_equal(tctx, error, WERR_NOT_FOUND,
+ torture_assert_werr_equal(tctx, error, WERR_BADFILE,
"getting missing value");
return true;
/**
* Test listing values
*/
-static bool test_list_values(struct torture_context *tctx, const void *_data)
+static bool test_list_values(struct torture_context *tctx, void *_data)
{
- const struct registry_context *rctx =
- (const struct registry_context *)_data;
+ struct registry_context *rctx = (struct registry_context *)_data;
struct registry_key *subkey = NULL, *root;
WERROR error;
DATA_BLOB data;
- uint32_t value = 42;
uint32_t type;
const char *name;
+ char value[4];
+ SIVAL(value, 0, 42);
if (!create_test_key(tctx, rctx, "Bonn", &root, &subkey))
return false;
error = reg_val_set(subkey, "bar", REG_DWORD,
- data_blob_talloc(tctx, &value, 4));
+ data_blob_talloc(tctx, value, sizeof(value)));
torture_assert_werr_ok (tctx, error, "setting value");
error = reg_key_get_value_by_index(tctx, subkey, 0, &name,
torture_assert_werr_ok(tctx, error, "getting value");
torture_assert_str_equal(tctx, name, "bar", "value name");
- torture_assert_int_equal(tctx, 4, data.length, "value length");
- torture_assert(tctx, memcmp(data.data, &value, 4) == 0,
+ torture_assert_int_equal(tctx, sizeof(value), data.length, "value length");
+ torture_assert_mem_equal(tctx, data.data, value, sizeof(value),
"value content");
torture_assert_int_equal(tctx, REG_DWORD, type, "value type");
struct hive_key *hive_key;
const char *filename;
- error = reg_open_local(tctx, &rctx, NULL, NULL);
+ error = reg_open_local(tctx, &rctx);
torture_assert_werr_ok(tctx, error, "Opening local registry failed");
status = torture_temp_dir(tctx, "registry-local", &tempdir);
torture_assert_ntstatus_ok(tctx, status, "Creating temp dir failed");
filename = talloc_asprintf(tctx, "%s/classes_root.ldb", tempdir);
- error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->lp_ctx, &hive_key);
+ error = reg_open_ldb_file(tctx, filename, NULL, NULL, tctx->ev, tctx->lp_ctx, &hive_key);
torture_assert_werr_ok(tctx, error, "Opening classes_root file failed");
error = reg_mount_hive(rctx, hive_key, HKEY_CLASSES_ROOT, NULL);
static void tcase_add_tests(struct torture_tcase *tcase)
{
torture_tcase_add_simple_test(tcase, "list_subkeys",
- test_list_subkeys);
+ test_list_subkeys);
torture_tcase_add_simple_test(tcase, "get_predefined_key",
- test_get_predefined);
+ test_get_predefined);
torture_tcase_add_simple_test(tcase, "get_predefined_key",
- test_get_predefined_unknown);
+ test_get_predefined_unknown);
torture_tcase_add_simple_test(tcase, "create_key",
- test_create_subkey);
+ test_create_subkey);
torture_tcase_add_simple_test(tcase, "create_key",
- test_create_nested_subkey);
+ test_create_nested_subkey);
torture_tcase_add_simple_test(tcase, "key_add_abs",
- test_key_add_abs);
+ test_key_add_abs);
torture_tcase_add_simple_test(tcase, "key_add_abs_top",
- test_key_add_abs_top);
+ test_key_add_abs_top);
torture_tcase_add_simple_test(tcase, "set_value",
- test_set_value);
+ test_set_value);
torture_tcase_add_simple_test(tcase, "get_value",
- test_get_value);
+ test_get_value);
torture_tcase_add_simple_test(tcase, "list_values",
- test_list_values);
+ test_list_values);
torture_tcase_add_simple_test(tcase, "del_key",
- test_del_key);
+ test_del_key);
torture_tcase_add_simple_test(tcase, "del_value",
- test_del_value);
+ test_del_value);
torture_tcase_add_simple_test(tcase, "flush_key",
- test_flush_key);
+ test_flush_key);
torture_tcase_add_simple_test(tcase, "query_key",
- test_query_key);
+ test_query_key);
torture_tcase_add_simple_test(tcase, "query_key_nums",
- test_query_key_nums);
+ test_query_key_nums);
torture_tcase_add_simple_test(tcase, "test_predef_key_by_name",
- test_predef_key_by_name);
+ test_predef_key_by_name);
torture_tcase_add_simple_test(tcase, "security",
- test_security);
- torture_tcase_add_simple_test(tcase, "test_predef_key_by_name_invalid",
- test_predef_key_by_name_invalid);
+ test_security);
+ torture_tcase_add_simple_test(tcase,"test_predef_key_by_name_invalid",
+ test_predef_key_by_name_invalid);
}
struct torture_suite *torture_registry_registry(TALLOC_CTX *mem_ctx)
git.samba.org / samba.git / blobdiff