Copyright (C) Tim Potter 2003
Copyright (C) Jelmer Vernooij 2004-2007
- Copyright (C) Günther Deschner 2007
+ Copyright (C) Günther Deschner 2007,2010
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
#include "librpc/gen_ndr/ndr_winreg_c.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "libcli/security/security.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
#include "param/param.h"
#include "lib/registry/registry.h"
#define TEST_SUBKEY_SD TEST_KEY4 "\\subkey_sd"
#define TEST_SUBSUBKEY_SD TEST_KEY4 "\\subkey_sd\\subsubkey_sd"
#define TEST_VALUE "torture_value_name"
+#define TEST_KEY_VOLATILE "torture_volatile_key"
+#define TEST_SUBKEY_VOLATILE "torture_volatile_subkey"
+#define TEST_KEY_SYMLINK "torture_symlink_key"
#define TEST_SID "S-1-5-21-1234567890-1234567890-1234567890-500"
}
}
-static bool test_GetVersion(struct dcerpc_pipe *p,
+static bool test_GetVersion(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle)
{
struct winreg_GetVersion r;
uint32_t v;
+ torture_comment(tctx, "Testing GetVersion\n");
+
ZERO_STRUCT(r);
r.in.handle = handle;
r.out.version = &v;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_GetVersion(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_GetVersion_r(b, tctx, &r),
"GetVersion failed");
torture_assert_werr_ok(tctx, r.out.result, "GetVersion failed");
return true;
}
-static bool test_NotifyChangeKeyValue(struct dcerpc_pipe *p,
+static bool test_NotifyChangeKeyValue(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle)
{
init_winreg_String(&r.in.string1, NULL);
init_winreg_String(&r.in.string2, NULL);
- if (torture_setting_bool(tctx, "samba3", false)) {
- torture_skip(tctx, "skipping NotifyChangeKeyValue test against Samba 3");
- }
-
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_NotifyChangeKeyValue(p, tctx, &r),
+ dcerpc_winreg_NotifyChangeKeyValue_r(b, tctx, &r),
"NotifyChangeKeyValue failed");
if (!W_ERROR_IS_OK(r.out.result)) {
return true;
}
-static bool test_CreateKey(struct dcerpc_pipe *p, struct torture_context *tctx,
- struct policy_handle *handle, const char *name,
- const char *kclass)
+static bool test_CreateKey_opts(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle,
+ const char *name,
+ const char *kclass,
+ uint32_t options,
+ uint32_t access_mask,
+ struct winreg_SecBuf *secdesc,
+ WERROR expected_result,
+ enum winreg_CreateAction *action_taken_p,
+ struct policy_handle *new_handle_p)
{
struct winreg_CreateKey r;
struct policy_handle newhandle;
enum winreg_CreateAction action_taken = 0;
+ torture_comment(tctx, "Testing CreateKey(%s)\n", name);
+
ZERO_STRUCT(r);
r.in.handle = handle;
- r.out.new_handle = &newhandle;
init_winreg_String(&r.in.name, name);
init_winreg_String(&r.in.keyclass, kclass);
- r.in.options = 0x0;
- r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
- r.in.action_taken = r.out.action_taken = &action_taken;
- r.in.secdesc = NULL;
+ r.in.options = options;
+ r.in.access_mask = access_mask;
+ r.in.action_taken = &action_taken;
+ r.in.secdesc = secdesc;
+ r.out.new_handle = &newhandle;
+ r.out.action_taken = &action_taken;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CreateKey(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CreateKey_r(b, tctx, &r),
"CreateKey failed");
- torture_assert_werr_ok(tctx, r.out.result, "CreateKey failed");
+ torture_assert_werr_equal(tctx, r.out.result, expected_result, "CreateKey failed");
+
+ if (new_handle_p) {
+ *new_handle_p = newhandle;
+ }
+ if (action_taken_p) {
+ *action_taken_p = *r.out.action_taken;
+ }
return true;
}
+static bool test_CreateKey(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
+ struct policy_handle *handle, const char *name,
+ const char *kclass)
+{
+ return test_CreateKey_opts(tctx, b, handle, name, kclass,
+ REG_OPTION_NON_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ NULL, /* secdesc */
+ WERR_OK,
+ NULL, /* action_taken */
+ NULL /* new_handle */);
+}
/*
createkey testing with a SD
*/
-static bool test_CreateKey_sd(struct dcerpc_pipe *p,
+static bool test_CreateKey_sd(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle, const char *name,
const char *kclass,
NULL);
torture_assert_ndr_success(tctx,
- ndr_push_struct_blob(&sdblob, tctx, NULL, sd,
+ ndr_push_struct_blob(&sdblob, tctx, sd,
(ndr_push_flags_fn_t)ndr_push_security_descriptor),
"Failed to push security_descriptor ?!\n");
r.in.action_taken = r.out.action_taken = &action_taken;
r.in.secdesc = &secbuf;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CreateKey(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CreateKey_r(b, tctx, &r),
"CreateKey with sd failed");
torture_assert_werr_ok(tctx, r.out.result, "CreateKey with sd failed");
struct security_descriptor *sd = NULL;
uint32_t sec_info;
DATA_BLOB sdblob;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (sec_info_ptr) {
sec_info = *sec_info_ptr;
r.in.sd->size = 0x1000;
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_GetKeySecurity(p, tctx, &r),
+ dcerpc_winreg_GetKeySecurity_r(b, tctx, &r),
"GetKeySecurity failed");
torture_assert_werr_equal(tctx, r.out.result, get_werr,
sd = talloc_zero(tctx, struct security_descriptor);
torture_assert_ndr_success(tctx,
- ndr_pull_struct_blob(&sdblob, tctx, NULL, sd,
+ ndr_pull_struct_blob(&sdblob, tctx, sd,
(ndr_pull_flags_fn_t)ndr_pull_security_descriptor),
"pull_security_descriptor failed");
struct KeySecurityData *sdata = NULL;
DATA_BLOB sdblob;
uint32_t sec_info;
+ struct dcerpc_binding_handle *b = p->binding_handle;
ZERO_STRUCT(r);
}
torture_assert_ndr_success(tctx,
- ndr_push_struct_blob(&sdblob, tctx, NULL, sd,
+ ndr_push_struct_blob(&sdblob, tctx, sd,
(ndr_push_flags_fn_t)ndr_push_security_descriptor),
"push_security_descriptor failed");
r.in.sd = sdata;
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_SetKeySecurity(p, tctx, &r),
+ dcerpc_winreg_SetKeySecurity_r(b, tctx, &r),
"SetKeySecurity failed");
torture_assert_werr_equal(tctx, r.out.result, werr,
return _test_SetKeySecurity(p, tctx, handle, NULL, sd, WERR_OK);
}
-static bool test_CloseKey(struct dcerpc_pipe *p, struct torture_context *tctx,
+static bool test_CloseKey(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
struct policy_handle *handle)
{
struct winreg_CloseKey r;
ZERO_STRUCT(r);
r.in.handle = r.out.handle = handle;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CloseKey(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_CloseKey_r(b, tctx, &r),
"CloseKey failed");
torture_assert_werr_ok(tctx, r.out.result, "CloseKey failed");
return true;
}
-static bool test_FlushKey(struct dcerpc_pipe *p, struct torture_context *tctx,
+static bool test_FlushKey(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
struct policy_handle *handle)
{
struct winreg_FlushKey r;
ZERO_STRUCT(r);
r.in.handle = handle;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_FlushKey(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_FlushKey_r(b, tctx, &r),
"FlushKey failed");
torture_assert_werr_ok(tctx, r.out.result, "FlushKey failed");
return true;
}
-static bool _test_OpenKey(struct dcerpc_pipe *p, struct torture_context *tctx,
- struct policy_handle *hive_handle,
- const char *keyname, uint32_t access_mask,
- struct policy_handle *key_handle,
- WERROR open_werr,
- bool *success)
+static bool test_OpenKey_opts(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *hive_handle,
+ const char *keyname,
+ uint32_t options,
+ uint32_t access_mask,
+ struct policy_handle *key_handle,
+ WERROR expected_result)
{
struct winreg_OpenKey r;
ZERO_STRUCT(r);
r.in.parent_handle = hive_handle;
init_winreg_String(&r.in.keyname, keyname);
- r.in.unknown = 0x00000000;
+ r.in.options = options;
r.in.access_mask = access_mask;
r.out.handle = key_handle;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_OpenKey(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_OpenKey_r(b, tctx, &r),
"OpenKey failed");
- torture_assert_werr_equal(tctx, r.out.result, open_werr,
+ torture_assert_werr_equal(tctx, r.out.result, expected_result,
"OpenKey failed");
- if (success && W_ERROR_EQUAL(r.out.result, WERR_OK)) {
- *success = true;
- }
-
return true;
}
-static bool test_OpenKey(struct dcerpc_pipe *p, struct torture_context *tctx,
+static bool test_OpenKey(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
struct policy_handle *hive_handle,
const char *keyname, struct policy_handle *key_handle)
{
- return _test_OpenKey(p, tctx, hive_handle, keyname,
- SEC_FLAG_MAXIMUM_ALLOWED, key_handle,
- WERR_OK, NULL);
+ return test_OpenKey_opts(tctx, b, hive_handle, keyname,
+ REG_OPTION_NON_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ key_handle,
+ WERR_OK);
}
-static bool test_Cleanup(struct dcerpc_pipe *p, struct torture_context *tctx,
+static bool test_Cleanup(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
struct policy_handle *handle, const char *key)
{
struct winreg_DeleteKey r;
r.in.handle = handle;
init_winreg_String(&r.in.key, key);
- dcerpc_winreg_DeleteKey(p, tctx, &r);
+ dcerpc_winreg_DeleteKey_r(b, tctx, &r);
return true;
}
{
struct policy_handle new_handle;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
torture_comment(tctx, "SecurityDescriptor get & set\n");
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
ret = false;
}
- if (!test_CloseKey(p, tctx, &new_handle)) {
+ if (!test_CloseKey(b, tctx, &new_handle)) {
return false;
}
{
struct policy_handle new_handle;
bool ret = true;
- bool got_key = false;
+ struct dcerpc_binding_handle *b = p->binding_handle;
- if (!_test_OpenKey(p, tctx, handle, key, access_mask, &new_handle,
- open_werr, &got_key)) {
- return false;
- }
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, key,
+ REG_OPTION_NON_VOLATILE,
+ access_mask,
+ &new_handle,
+ open_werr),
+ "failed to open key");
- if (!got_key) {
+ if (!W_ERROR_IS_OK(open_werr)) {
return true;
}
ret = false;
}
- if (!test_CloseKey(p, tctx, &new_handle)) {
+ if (!test_CloseKey(b, tctx, &new_handle)) {
return false;
}
{
struct policy_handle new_handle;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
ret = test_dacl_trustee_present(p, tctx, &new_handle, sid);
- test_CloseKey(p, tctx, &new_handle);
+ test_CloseKey(b, tctx, &new_handle);
return ret;
}
{
struct policy_handle new_handle;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
- if (!_test_OpenKey(p, tctx, handle, key, SEC_FLAG_SYSTEM_SECURITY,
- &new_handle, WERR_OK, NULL)) {
- return false;
- }
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, key,
+ REG_OPTION_NON_VOLATILE,
+ SEC_FLAG_SYSTEM_SECURITY,
+ &new_handle,
+ WERR_OK),
+ "failed to open key");
ret = test_sacl_trustee_present(p, tctx, &new_handle, sid);
- test_CloseKey(p, tctx, &new_handle);
+ test_CloseKey(b, tctx, &new_handle);
return ret;
}
{
struct policy_handle new_handle;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
ret = test_owner_present(p, tctx, &new_handle, sid);
- test_CloseKey(p, tctx, &new_handle);
+ test_CloseKey(b, tctx, &new_handle);
return ret;
}
{
struct policy_handle new_handle;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
ret = test_group_present(p, tctx, &new_handle, sid);
- test_CloseKey(p, tctx, &new_handle);
+ test_CloseKey(b, tctx, &new_handle);
return ret;
}
{
struct policy_handle new_handle;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
ret = false;
}
- if (!test_CloseKey(p, tctx, &new_handle)) {
+ if (!test_CloseKey(b, tctx, &new_handle)) {
ret = false;
}
{
struct policy_handle new_handle;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
ret = false;
}
- if (!test_CloseKey(p, tctx, &new_handle)) {
+ if (!test_CloseKey(b, tctx, &new_handle)) {
ret = false;
}
struct security_descriptor *sd_orig = NULL;
struct security_ace *ace = NULL;
struct policy_handle new_handle;
- NTSTATUS status;
bool ret = true;
+ struct dcerpc_binding_handle *b = p->binding_handle;
torture_comment(tctx, "SecurityDescriptor inheritance\n");
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
SEC_STD_REQUIRED,
SEC_ACE_FLAG_CONTAINER_INHERIT);
- status = security_descriptor_dacl_add(sd, ace);
- if (!NT_STATUS_IS_OK(status)) {
- printf("failed to add ace: %s\n", nt_errstr(status));
- return false;
- }
+ torture_assert_ntstatus_ok(tctx,
+ security_descriptor_dacl_add(sd, ace),
+ "failed to add ace");
/* FIXME: add further tests for these flags */
sd->type |= SEC_DESC_DACL_AUTO_INHERIT_REQ |
return false;
}
- if (!test_dacl_ace_present(p, tctx, &new_handle, ace)) {
- printf("new ACE not present!\n");
- return false;
- }
+ torture_assert(tctx,
+ test_dacl_ace_present(p, tctx, &new_handle, ace),
+ "new ACE not present!");
- if (!test_CloseKey(p, tctx, &new_handle)) {
+ if (!test_CloseKey(b, tctx, &new_handle)) {
return false;
}
- if (!test_CreateKey(p, tctx, handle, TEST_SUBKEY_SD, NULL)) {
+ if (!test_CreateKey(b, tctx, handle, TEST_SUBKEY_SD, NULL)) {
ret = false;
goto out;
}
- if (!test_OpenKey(p, tctx, handle, TEST_SUBKEY_SD, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, TEST_SUBKEY_SD, &new_handle)) {
ret = false;
goto out;
}
if (!test_dacl_ace_present(p, tctx, &new_handle, ace)) {
- printf("inherited ACE not present!\n");
+ torture_comment(tctx, "inherited ACE not present!\n");
ret = false;
goto out;
}
- test_CloseKey(p, tctx, &new_handle);
- if (!test_CreateKey(p, tctx, handle, TEST_SUBSUBKEY_SD, NULL)) {
+ test_CloseKey(b, tctx, &new_handle);
+ if (!test_CreateKey(b, tctx, handle, TEST_SUBSUBKEY_SD, NULL)) {
ret = false;
goto out;
}
- if (!test_OpenKey(p, tctx, handle, TEST_SUBSUBKEY_SD, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, TEST_SUBSUBKEY_SD, &new_handle)) {
ret = false;
goto out;
}
if (!test_dacl_ace_present(p, tctx, &new_handle, ace)) {
- printf("inherited ACE not present!\n");
+ torture_comment(tctx, "inherited ACE not present!\n");
ret = false;
goto out;
}
out:
- test_CloseKey(p, tctx, &new_handle);
- test_Cleanup(p, tctx, handle, TEST_SUBKEY_SD);
+ test_CloseKey(b, tctx, &new_handle);
+ test_Cleanup(b, tctx, handle, TEST_SUBKEY_SD);
test_RestoreSecurity(p, tctx, handle, key, sd_orig);
return true;
struct security_ace *ace = NULL;
struct policy_handle new_handle;
struct dom_sid *sid = NULL;
- NTSTATUS status;
bool ret = true;
uint8_t ace_flags = 0x0;
+ struct dcerpc_binding_handle *b = p->binding_handle;
torture_comment(tctx, "SecurityDescriptor inheritance block\n");
- if (!test_OpenKey(p, tctx, handle, key, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, key, &new_handle)) {
return false;
}
SEC_ACE_FLAG_CONTAINER_INHERIT |
SEC_ACE_FLAG_NO_PROPAGATE_INHERIT);
- status = security_descriptor_dacl_add(sd, ace);
- if (!NT_STATUS_IS_OK(status)) {
- printf("failed to add ace: %s\n", nt_errstr(status));
- return false;
- }
+ torture_assert_ntstatus_ok(tctx,
+ security_descriptor_dacl_add(sd, ace),
+ "failed to add ace");
if (!_test_SetKeySecurity(p, tctx, &new_handle, NULL, sd, WERR_OK)) {
return false;
}
- if (!test_dacl_ace_present(p, tctx, &new_handle, ace)) {
- printf("new ACE not present!\n");
- return false;
- }
+ torture_assert(tctx,
+ test_dacl_ace_present(p, tctx, &new_handle, ace),
+ "new ACE not present!");
- if (!test_CloseKey(p, tctx, &new_handle)) {
+ if (!test_CloseKey(b, tctx, &new_handle)) {
return false;
}
- if (!test_CreateKey(p, tctx, handle, TEST_SUBSUBKEY_SD, NULL)) {
+ if (!test_CreateKey(b, tctx, handle, TEST_SUBSUBKEY_SD, NULL)) {
return false;
}
- if (!test_OpenKey(p, tctx, handle, TEST_SUBSUBKEY_SD, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, TEST_SUBSUBKEY_SD, &new_handle)) {
ret = false;
goto out;
}
if (test_dacl_ace_present(p, tctx, &new_handle, ace)) {
- printf("inherited ACE present but should not!\n");
+ torture_comment(tctx, "inherited ACE present but should not!\n");
ret = false;
goto out;
}
}
if (test_dacl_trustee_present(p, tctx, &new_handle, sid)) {
- printf("inherited trustee SID present but should not!\n");
+ torture_comment(tctx, "inherited trustee SID present but should not!\n");
ret = false;
goto out;
}
- test_CloseKey(p, tctx, &new_handle);
+ test_CloseKey(b, tctx, &new_handle);
- if (!test_OpenKey(p, tctx, handle, TEST_SUBKEY_SD, &new_handle)) {
+ if (!test_OpenKey(b, tctx, handle, TEST_SUBKEY_SD, &new_handle)) {
ret = false;
goto out;
}
if (test_dacl_ace_present(p, tctx, &new_handle, ace)) {
- printf("inherited ACE present but should not!\n");
+ torture_comment(tctx, "inherited ACE present but should not!\n");
ret = false;
goto out;
}
if (!test_dacl_trustee_flags_present(p, tctx, &new_handle, sid, ace_flags)) {
- printf("inherited trustee SID with flags 0x%02x not present!\n",
+ torture_comment(tctx, "inherited trustee SID with flags 0x%02x not present!\n",
ace_flags);
ret = false;
goto out;
}
out:
- test_CloseKey(p, tctx, &new_handle);
- test_Cleanup(p, tctx, handle, TEST_SUBKEY_SD);
+ test_CloseKey(b, tctx, &new_handle);
+ test_Cleanup(b, tctx, handle, TEST_SUBKEY_SD);
test_RestoreSecurity(p, tctx, handle, key, sd_orig);
return ret;
const struct dom_sid *sid)
{
struct policy_handle new_handle;
- bool open_success = false;
+ struct dcerpc_binding_handle *b = p->binding_handle;
torture_comment(tctx, "SecurityDescriptor (%s) sets for secinfo: "
"0x%08x, access_mask: 0x%08x\n",
test, sec_info, access_mask);
- if (!_test_OpenKey(p, tctx, handle, key,
- access_mask,
- &new_handle,
- WERR_OK,
- &open_success)) {
- return false;
- }
-
- if (!open_success) {
- printf("key did not open\n");
- test_CloseKey(p, tctx, &new_handle);
- return false;
- }
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, key,
+ REG_OPTION_NON_VOLATILE,
+ access_mask,
+ &new_handle,
+ WERR_OK),
+ "failed to open key");
if (!_test_SetKeySecurity(p, tctx, &new_handle, &sec_info,
sd,
"SetKeySecurity with secinfo: 0x%08x has failed\n",
sec_info);
smb_panic("");
- test_CloseKey(p, tctx, &new_handle);
+ test_CloseKey(b, tctx, &new_handle);
return false;
}
- test_CloseKey(p, tctx, &new_handle);
+ test_CloseKey(b, tctx, &new_handle);
if (W_ERROR_IS_OK(set_werr)) {
bool present;
sec_info_owner_tests[i].fn,
sid))
{
- printf("test_SetSecurityDescriptor_SecInfo failed for OWNER\n");
+ torture_comment(tctx, "test_SetSecurityDescriptor_SecInfo failed for OWNER\n");
ret = false;
goto out;
}
sec_info_group_tests[i].fn,
sid))
{
- printf("test_SetSecurityDescriptor_SecInfo failed for GROUP\n");
+ torture_comment(tctx, "test_SetSecurityDescriptor_SecInfo failed for GROUP\n");
ret = false;
goto out;
}
sec_info_dacl_tests[i].fn,
sid))
{
- printf("test_SetSecurityDescriptor_SecInfo failed for DACL\n");
+ torture_comment(tctx, "test_SetSecurityDescriptor_SecInfo failed for DACL\n");
ret = false;
goto out;
}
sec_info_sacl_tests[i].fn,
sid))
{
- printf("test_SetSecurityDescriptor_SecInfo failed for SACL\n");
+ torture_comment(tctx, "test_SetSecurityDescriptor_SecInfo failed for SACL\n");
ret = false;
goto out;
}
bool ret = true;
if (!test_SecurityDescriptor(p, tctx, handle, key)) {
- printf("test_SecurityDescriptor failed\n");
+ torture_comment(tctx, "test_SecurityDescriptor failed\n");
ret = false;
}
if (!test_SecurityDescriptorInheritance(p, tctx, handle, key)) {
- printf("test_SecurityDescriptorInheritance failed\n");
+ torture_comment(tctx, "test_SecurityDescriptorInheritance failed\n");
ret = false;
}
if (!test_SecurityDescriptorBlockInheritance(p, tctx, handle, key)) {
- printf("test_SecurityDescriptorBlockInheritance failed\n");
+ torture_comment(tctx, "test_SecurityDescriptorBlockInheritance failed\n");
ret = false;
}
if (!test_SecurityDescriptorsSecInfo(p, tctx, handle, key)) {
- printf("test_SecurityDescriptorsSecInfo failed\n");
+ torture_comment(tctx, "test_SecurityDescriptorsSecInfo failed\n");
ret = false;
}
if (!test_SecurityDescriptorsMasks(p, tctx, handle, key)) {
- printf("test_SecurityDescriptorsMasks failed\n");
+ torture_comment(tctx, "test_SecurityDescriptorsMasks failed\n");
ret = false;
}
return ret;
}
-static bool test_DeleteKey(struct dcerpc_pipe *p, struct torture_context *tctx,
- struct policy_handle *handle, const char *key)
+static bool test_DeleteKey_opts(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
+ struct policy_handle *handle,
+ const char *key,
+ WERROR expected_result)
{
- NTSTATUS status;
struct winreg_DeleteKey r;
+ torture_comment(tctx, "Testing DeleteKey(%s)\n", key);
+
r.in.handle = handle;
init_winreg_String(&r.in.key, key);
- status = dcerpc_winreg_DeleteKey(p, tctx, &r);
-
- torture_assert_ntstatus_ok(tctx, status, "DeleteKey failed");
- torture_assert_werr_ok(tctx, r.out.result, "DeleteKey failed");
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_DeleteKey_r(b, tctx, &r),
+ "Delete Key failed");
+ torture_assert_werr_equal(tctx, r.out.result, expected_result,
+ "DeleteKey failed");
return true;
}
-static bool test_QueryInfoKey(struct dcerpc_pipe *p,
+static bool test_DeleteKey(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
+ struct policy_handle *handle, const char *key)
+{
+ return test_DeleteKey_opts(b, tctx, handle, key, WERR_OK);
+}
+
+static bool test_QueryInfoKey(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle, char *kclass)
{
init_winreg_String(r.in.classname, kclass);
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_QueryInfoKey(p, tctx, &r),
+ dcerpc_winreg_QueryInfoKey_r(b, tctx, &r),
"QueryInfoKey failed");
torture_assert_werr_ok(tctx, r.out.result, "QueryInfoKey failed");
return true;
}
-static bool test_SetValue(struct dcerpc_pipe *p,
+static bool test_SetValue(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle,
const char *value_name,
r.in.data = data;
r.in.size = size;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_SetValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_SetValue_r(b, tctx, &r),
"winreg_SetValue failed");
torture_assert_werr_ok(tctx, r.out.result,
"winreg_SetValue failed");
return true;
}
-static bool test_DeleteValue(struct dcerpc_pipe *p,
+static bool test_DeleteValue(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle,
const char *value_name)
r.in.handle = handle;
r.in.value = value;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_DeleteValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_DeleteValue_r(b, tctx, &r),
"winreg_DeleteValue failed");
torture_assert_werr_ok(tctx, r.out.result,
"winreg_DeleteValue failed");
struct winreg_StringBuf kclass, name;
NTSTATUS status;
NTTIME t = 0;
+ struct dcerpc_binding_handle *b = p->binding_handle;
kclass.name = "";
kclass.size = 1024;
name.name = NULL;
name.size = 1024;
- status = dcerpc_winreg_EnumKey(p, tctx, &r);
+ status = dcerpc_winreg_EnumKey_r(b, tctx, &r);
if (NT_STATUS_IS_OK(status) && W_ERROR_IS_OK(r.out.result)) {
struct policy_handle key_handle;
r.in.enum_index,
r.out.name->name);
- if (!test_OpenKey(p, tctx, handle, r.out.name->name,
+ if (!test_OpenKey(b, tctx, handle, r.out.name->name,
&key_handle)) {
} else {
test_key(p, tctx, &key_handle,
return true;
}
-static bool test_QueryMultipleValues(struct dcerpc_pipe *p,
+static bool test_QueryMultipleValues(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle,
const char *valuename)
{
struct winreg_QueryMultipleValues r;
- NTSTATUS status;
uint32_t bufsize=0;
ZERO_STRUCT(r);
r.in.buffer = r.out.buffer = talloc_zero_array(tctx, uint8_t,
*r.in.buffer_size);
- status = dcerpc_winreg_QueryMultipleValues(p, tctx, &r);
-
- if(NT_STATUS_IS_ERR(status))
- torture_fail(tctx, "QueryMultipleValues failed");
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_winreg_QueryMultipleValues_r(b, tctx, &r),
+ "QueryMultipleValues failed");
talloc_free(r.in.buffer);
bufsize += 0x20;
return true;
}
-static bool test_QueryValue(struct dcerpc_pipe *p,
+static bool test_QueryValue(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle,
const char *valuename)
r.in.data_size = &offered;
r.in.data_length = &zero;
- status = dcerpc_winreg_QueryValue(p, tctx, &r);
+ status = dcerpc_winreg_QueryValue_r(b, tctx, &r);
if (NT_STATUS_IS_ERR(status)) {
torture_fail(tctx, "QueryValue failed");
}
return true;
}
-static bool test_QueryValue_full(struct dcerpc_pipe *p,
+static bool test_QueryValue_full(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle,
const char *valuename,
uint32_t data_length = 0;
uint8_t *data = NULL;
WERROR expected_error = WERR_BADFILE;
+ const char *errmsg_nonexisting = "expected WERR_BADFILE for nonexisting value";
if (valuename == NULL) {
expected_error = WERR_INVALID_PARAM;
+ errmsg_nonexisting = "expected WERR_INVALID_PARAM for NULL valuename";
}
ZERO_STRUCT(r);
r.in.handle = handle;
r.in.value_name = &value_name;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue(p, tctx, &r), "QueryValue failed");
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue_r(b, tctx, &r), "QueryValue failed");
torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM,
"expected WERR_INVALID_PARAM for NULL winreg_String.name");
init_winreg_String(&value_name, valuename);
r.in.value_name = &value_name;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue_r(b, tctx, &r),
"QueryValue failed");
torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM,
- "QueryValue failed");
+ "expected WERR_INVALID_PARAM for missing type length and size");
r.in.type = &type;
r.out.type = &type;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue_r(b, tctx, &r),
"QueryValue failed");
torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM,
- "QueryValue failed");
+ "expected WERR_INVALID_PARAM for missing length and size");
r.in.data_length = &data_length;
r.out.data_length = &data_length;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue_r(b, tctx, &r),
"QueryValue failed");
torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM,
- "QueryValue failed");
+ "expected WERR_INVALID_PARAM for missing size");
r.in.data_size = &data_size;
r.out.data_size = &data_size;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue_r(b, tctx, &r),
"QueryValue failed");
if (existing_value) {
torture_assert_werr_ok(tctx, r.out.result,
"QueryValue failed");
} else {
torture_assert_werr_equal(tctx, r.out.result, expected_error,
- "QueryValue failed");
+ errmsg_nonexisting);
}
real_data_size = *r.out.data_size;
r.out.data = data;
*r.in.data_size = 0;
*r.out.data_size = 0;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue_r(b, tctx, &r),
"QueryValue failed");
if (existing_value) {
torture_assert_werr_equal(tctx, r.out.result, WERR_MORE_DATA,
- "QueryValue failed");
+ "expected WERR_MORE_DATA for query with too small buffer");
} else {
torture_assert_werr_equal(tctx, r.out.result, expected_error,
- "QueryValue failed");
+ errmsg_nonexisting);
}
data = talloc_zero_array(tctx, uint8_t, real_data_size);
r.out.data = data;
r.in.data_size = &real_data_size;
r.out.data_size = &real_data_size;
- torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue(p, tctx, &r),
+ torture_assert_ntstatus_ok(tctx, dcerpc_winreg_QueryValue_r(b, tctx, &r),
"QueryValue failed");
if (existing_value) {
torture_assert_werr_ok(tctx, r.out.result,
"QueryValue failed");
} else {
torture_assert_werr_equal(tctx, r.out.result, expected_error,
- "QueryValue failed");
+ errmsg_nonexisting);
}
return true;
}
-static bool test_EnumValue(struct dcerpc_pipe *p, struct torture_context *tctx,
+static bool test_EnumValue(struct dcerpc_binding_handle *b,
+ struct torture_context *tctx,
struct policy_handle *handle, int max_valnamelen,
int max_valbufsize)
{
do {
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_EnumValue(p, tctx, &r),
+ dcerpc_winreg_EnumValue_r(b, tctx, &r),
"EnumValue failed");
if (W_ERROR_IS_OK(r.out.result)) {
- ret &= test_QueryValue(p, tctx, handle,
+ ret &= test_QueryValue(b, tctx, handle,
r.out.name->name);
- ret &= test_QueryMultipleValues(p, tctx, handle,
+ ret &= test_QueryMultipleValues(b, tctx, handle,
r.out.name->name);
}
return ret;
}
-static bool test_AbortSystemShutdown(struct dcerpc_pipe *p,
+static bool test_AbortSystemShutdown(struct dcerpc_binding_handle *b,
struct torture_context *tctx)
{
struct winreg_AbortSystemShutdown r;
r.in.server = &server;
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_AbortSystemShutdown(p, tctx, &r),
+ dcerpc_winreg_AbortSystemShutdown_r(b, tctx, &r),
"AbortSystemShutdown failed");
torture_assert_werr_ok(tctx, r.out.result,
{
struct winreg_InitiateSystemShutdown r;
uint16_t hostname = 0x0;
+ struct dcerpc_binding_handle *b = p->binding_handle;
ZERO_STRUCT(r);
r.in.hostname = &hostname;
r.in.do_reboot = 1;
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_InitiateSystemShutdown(p, tctx, &r),
+ dcerpc_winreg_InitiateSystemShutdown_r(b, tctx, &r),
"InitiateSystemShutdown failed");
torture_assert_werr_ok(tctx, r.out.result,
"InitiateSystemShutdown failed");
- return test_AbortSystemShutdown(p, tctx);
+ return test_AbortSystemShutdown(b, tctx);
}
{
struct winreg_InitiateSystemShutdownEx r;
uint16_t hostname = 0x0;
+ struct dcerpc_binding_handle *b = p->binding_handle;
ZERO_STRUCT(r);
r.in.hostname = &hostname;
r.in.reason = 0;
torture_assert_ntstatus_ok(tctx,
- dcerpc_winreg_InitiateSystemShutdownEx(p, tctx, &r),
+ dcerpc_winreg_InitiateSystemShutdownEx_r(b, tctx, &r),
"InitiateSystemShutdownEx failed");
torture_assert_werr_ok(tctx, r.out.result,
"InitiateSystemShutdownEx failed");
- return test_AbortSystemShutdown(p, tctx);
+ return test_AbortSystemShutdown(b, tctx);
}
#define MAX_DEPTH 2 /* Only go this far down the tree */
struct policy_handle *handle, int depth,
bool test_security)
{
+ struct dcerpc_binding_handle *b = p->binding_handle;
+
if (depth == MAX_DEPTH)
return true;
- if (!test_QueryInfoKey(p, tctx, handle, NULL)) {
+ if (!test_QueryInfoKey(b, tctx, handle, NULL)) {
}
- if (!test_NotifyChangeKeyValue(p, tctx, handle)) {
+ if (!test_NotifyChangeKeyValue(b, tctx, handle)) {
}
if (test_security && !test_GetKeySecurity(p, tctx, handle, NULL)) {
if (!test_EnumKey(p, tctx, handle, depth, test_security)) {
}
- if (!test_EnumValue(p, tctx, handle, 0xFF, 0xFFFF)) {
+ if (!test_EnumValue(b, tctx, handle, 0xFF, 0xFFFF)) {
}
- test_CloseKey(p, tctx, handle);
+ test_CloseKey(b, tctx, handle);
return true;
}
-static bool test_SetValue_simple(struct dcerpc_pipe *p,
+static bool test_SetValue_simple(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle)
{
const char *value_name = TEST_VALUE;
uint32_t value = 0x12345678;
+ uint64_t value2 = 0x12345678;
const char *string = "torture";
+ const char *array[2];
DATA_BLOB blob;
enum winreg_Type types[] = {
REG_DWORD,
+ REG_DWORD_BIG_ENDIAN,
+ REG_QWORD,
REG_BINARY,
REG_SZ,
REG_MULTI_SZ
};
int t;
+ array[0] = "array0";
+ array[1] = NULL;
+
torture_comment(tctx, "Testing SetValue (standard formats)\n");
for (t=0; t < ARRAY_SIZE(types); t++) {
switch (types[t]) {
case REG_DWORD:
+ case REG_DWORD_BIG_ENDIAN:
blob = data_blob_talloc_zero(tctx, 4);
SIVAL(blob.data, 0, value);
break;
+ case REG_QWORD:
+ blob = data_blob_talloc_zero(tctx, 8);
+ SBVAL(blob.data, 0, value2);
+ break;
case REG_BINARY:
blob = data_blob_string_const("binary_blob");
break;
case REG_SZ:
- torture_assert(tctx,
- convert_string_talloc_convenience(tctx, lp_iconv_convenience(tctx->lp_ctx),
- CH_UNIX, CH_UTF16,
- string,
- strlen(string)+1,
- (void **)&blob.data,
- &blob.length,
- false), "");
+ torture_assert(tctx, push_reg_sz(tctx, &blob, string), "failed to push REG_SZ");
break;
case REG_MULTI_SZ:
- torture_assert(tctx,
- convert_string_talloc_convenience(tctx, lp_iconv_convenience(tctx->lp_ctx),
- CH_UNIX, CH_UTF16,
- string,
- strlen(string)+1,
- (void **)&blob.data,
- &blob.length,
- false), "");
- torture_assert(tctx, data_blob_realloc(tctx, &blob, blob.length + 2), "");
- memset(&blob.data[blob.length - 2], '\0', 2);
+ torture_assert(tctx, push_reg_multi_sz(tctx, &blob, array), "failed to push REG_MULTI_SZ");
break;
default:
break;
}
torture_assert(tctx,
- test_SetValue(p, tctx, handle, value_name, types[t], blob.data, blob.length),
+ test_SetValue(b, tctx, handle, value_name, types[t], blob.data, blob.length),
"test_SetValue failed");
torture_assert(tctx,
- test_QueryValue_full(p, tctx, handle, value_name, true),
+ test_QueryValue_full(b, tctx, handle, value_name, true),
talloc_asprintf(tctx, "test_QueryValue_full for %s value failed", value_name));
torture_assert(tctx,
- test_winreg_QueryValue(tctx, p, handle, value_name, &w_type, &w_size, &w_length, &w_data),
+ test_winreg_QueryValue(tctx, b, handle, value_name, &w_type, &w_size, &w_length, &w_data),
"test_winreg_QueryValue failed");
torture_assert(tctx,
- test_DeleteValue(p, tctx, handle, value_name),
+ test_DeleteValue(b, tctx, handle, value_name),
"test_DeleteValue failed");
torture_assert_int_equal(tctx, w_type, types[t], "winreg type mismatch");
return true;
}
-typedef NTSTATUS (*winreg_open_fn)(struct dcerpc_pipe *, TALLOC_CTX *, void *);
-
-static bool test_Open_Security(struct torture_context *tctx,
- struct dcerpc_pipe *p, void *userdata)
-{
- struct policy_handle handle, newhandle;
- bool ret = true, created2 = false;
- bool created4 = false;
- struct winreg_OpenHKLM r;
-
- winreg_open_fn open_fn = userdata;
-
- ZERO_STRUCT(r);
- r.in.system_name = 0;
- r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
- r.out.handle = &handle;
-
- torture_assert_ntstatus_ok(tctx, open_fn(p, tctx, &r),
- "open");
-
- test_Cleanup(p, tctx, &handle, TEST_KEY_BASE);
-
- if (!test_CreateKey(p, tctx, &handle, TEST_KEY_BASE, NULL)) {
- torture_comment(tctx,
- "CreateKey (TEST_KEY_BASE) failed\n");
- }
-
- if (test_CreateKey_sd(p, tctx, &handle, TEST_KEY2,
- NULL, &newhandle)) {
- created2 = true;
- }
-
- if (created2 && !test_CloseKey(p, tctx, &newhandle)) {
- printf("CloseKey failed\n");
- ret = false;
- }
-
- if (test_CreateKey_sd(p, tctx, &handle, TEST_KEY4, NULL, &newhandle)) {
- created4 = true;
- }
-
- if (created4 && !test_CloseKey(p, tctx, &newhandle)) {
- printf("CloseKey failed\n");
- ret = false;
- }
-
- if (created4 && !test_SecurityDescriptors(p, tctx, &handle, TEST_KEY4)) {
- ret = false;
- }
-
- if (created4 && !test_DeleteKey(p, tctx, &handle, TEST_KEY4)) {
- printf("DeleteKey failed\n");
- ret = false;
- }
-
- if (created2 && !test_DeleteKey(p, tctx, &handle, TEST_KEY2)) {
- printf("DeleteKey failed\n");
- ret = false;
- }
-
- /* The HKCR hive has a very large fanout */
- if (open_fn == (void *)dcerpc_winreg_OpenHKCR) {
- if(!test_key(p, tctx, &handle, MAX_DEPTH - 1, true)) {
- ret = false;
- }
- } else {
- if (!test_key(p, tctx, &handle, 0, true)) {
- ret = false;
- }
- }
-
- test_Cleanup(p, tctx, &handle, TEST_KEY_BASE);
+typedef NTSTATUS (*winreg_open_fn)(struct dcerpc_binding_handle *, TALLOC_CTX *, void *);
- return ret;
-}
-
-static bool test_SetValue_extended(struct dcerpc_pipe *p,
+static bool test_SetValue_extended(struct dcerpc_binding_handle *b,
struct torture_context *tctx,
struct policy_handle *handle)
{
14,
55,
123456,
- 653210
+ 653210,
+ __LINE__
};
- const char *str = "abcdefghijklmnopqrstuvwxzy";
- int t, s;
+ int t, l;
+
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
+ torture_skip(tctx, "skipping extended SetValue test against Samba");
+ }
torture_comment(tctx, "Testing SetValue (extended formats)\n");
for (t=0; t < ARRAY_SIZE(types); t++) {
- for (s=0; s < strlen(str); s++) {
+ for (l=0; l < 32; l++) {
enum winreg_Type w_type;
uint32_t w_size, w_length;
uint8_t *w_data;
- const char *string = talloc_strndup(tctx, str, s);
- DATA_BLOB blob = data_blob_string_const(string);
+ uint32_t size;
+ uint8_t *data;
+
+ size = l;
+ data = talloc_array(tctx, uint8_t, size);
+
+ generate_random_buffer(data, size);
torture_assert(tctx,
- test_SetValue(p, tctx, handle, value_name, types[t], blob.data, blob.length),
+ test_SetValue(b, tctx, handle, value_name, types[t], data, size),
"test_SetValue failed");
torture_assert(tctx,
- test_winreg_QueryValue(tctx, p, handle, value_name, &w_type, &w_size, &w_length, &w_data),
+ test_winreg_QueryValue(tctx, b, handle, value_name, &w_type, &w_size, &w_length, &w_data),
"test_winreg_QueryValue failed");
torture_assert(tctx,
- test_DeleteValue(p, tctx, handle, value_name),
+ test_DeleteValue(b, tctx, handle, value_name),
"test_DeleteValue failed");
torture_assert_int_equal(tctx, w_type, types[t], "winreg type mismatch");
- torture_assert_int_equal(tctx, w_size, blob.length, "winreg size mismatch");
- torture_assert_int_equal(tctx, w_length, blob.length, "winreg length mismatch");
- torture_assert_mem_equal(tctx, w_data, blob.data, blob.length, "winreg buffer mismatch");
+ torture_assert_int_equal(tctx, w_size, size, "winreg size mismatch");
+ torture_assert_int_equal(tctx, w_length, size, "winreg length mismatch");
+ torture_assert_mem_equal(tctx, w_data, data, size, "winreg buffer mismatch");
}
}
#define KEY_CURRENT_VERSION "SOFTWARE\\MICROSOFT\\WINDOWS NT\\CURRENTVERSION"
#define VALUE_CURRENT_VERSION "CurrentVersion"
-static bool test_Open(struct torture_context *tctx, struct dcerpc_pipe *p,
- void *userdata)
+static bool test_HKLM_wellknown(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle)
{
- struct policy_handle handle, newhandle;
- bool ret = true, created = false, deleted = false;
- bool created3 = false, created_subkey = false;
- struct winreg_OpenHKLM r;
+ struct policy_handle newhandle;
- winreg_open_fn open_fn = userdata;
+ /* FIXME: s3 does not support SEC_FLAG_MAXIMUM_ALLOWED yet */
+ if (torture_setting_bool(tctx, "samba3", false)) {
+ torture_assert(tctx, test_OpenKey_opts(tctx, b, handle,
+ KEY_CURRENT_VERSION,
+ REG_OPTION_NON_VOLATILE,
+ KEY_QUERY_VALUE,
+ &newhandle,
+ WERR_OK),
+ "failed to open current version key");
+ } else {
+ torture_assert(tctx, test_OpenKey(b, tctx, handle, KEY_CURRENT_VERSION, &newhandle),
+ "failed to open current version key");
+ }
+
+ torture_assert(tctx, test_QueryValue_full(b, tctx, &newhandle, VALUE_CURRENT_VERSION, true),
+ "failed to query current version");
+ torture_assert(tctx, test_QueryValue_full(b, tctx, &newhandle, "IDoNotExist", false),
+ "succeeded to query nonexistent value");
+ torture_assert(tctx, test_QueryValue_full(b, tctx, &newhandle, NULL, false),
+ "succeeded to query value with NULL name");
+ torture_assert(tctx, test_QueryValue_full(b, tctx, &newhandle, "", false),
+ "succeeded to query nonexistent default value (\"\")");
+
+ torture_assert(tctx, test_CloseKey(b, tctx, &newhandle),
+ "failed to close current version key");
+
+ return true;
+}
+
+static bool test_OpenHive(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle,
+ int hkey)
+{
+ struct winreg_OpenHKLM r;
- ZERO_STRUCT(r);
r.in.system_name = 0;
r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
- r.out.handle = &handle;
+ r.out.handle = handle;
- torture_assert_ntstatus_ok(tctx, open_fn(p, tctx, &r),
- "open");
+ switch (hkey) {
+ case HKEY_LOCAL_MACHINE:
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_winreg_OpenHKLM_r(b, tctx, &r),
+ "failed to open HKLM");
+ torture_assert_werr_ok(tctx, r.out.result,
+ "failed to open HKLM");
+ break;
+ case HKEY_CURRENT_USER:
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_winreg_OpenHKCU_r(b, tctx, (struct winreg_OpenHKCU *)&r),
+ "failed to open HKCU");
+ torture_assert_werr_ok(tctx, r.out.result,
+ "failed to open HKCU");
+ break;
+ case HKEY_USERS:
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_winreg_OpenHKU_r(b, tctx, (struct winreg_OpenHKU *)&r),
+ "failed to open HKU");
+ torture_assert_werr_ok(tctx, r.out.result,
+ "failed to open HKU");
+ break;
+ case HKEY_CLASSES_ROOT:
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_winreg_OpenHKCR_r(b, tctx, (struct winreg_OpenHKCR *)&r),
+ "failed to open HKCR");
+ torture_assert_werr_ok(tctx, r.out.result,
+ "failed to open HKCR");
+ break;
+ default:
+ torture_warning(tctx, "unsupported hkey: 0x%08x\n", hkey);
+ return false;
+ }
- if (open_fn == (void *)dcerpc_winreg_OpenHKLM) {
-#if 0
- torture_assert(tctx, test_OpenKey(p, tctx, &handle, KEY_CURRENT_VERSION, &newhandle),
- "failed to open current version key");
-#else
- torture_assert(tctx, _test_OpenKey(p, tctx, &handle, KEY_CURRENT_VERSION, KEY_QUERY_VALUE, &newhandle, WERR_OK, NULL),
- "failed to open current version key");
-#endif
- torture_assert(tctx, test_QueryValue_full(p, tctx, &newhandle, VALUE_CURRENT_VERSION, true),
- "failed to query current version");
- torture_assert(tctx, test_QueryValue_full(p, tctx, &newhandle, "IDoNotExist", false),
- "failed to query current version");
- torture_assert(tctx, test_CloseKey(p, tctx, &newhandle),
- "failed to close current version key");
+ return true;
+}
+
+static bool test_volatile_keys(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle,
+ int hkey)
+{
+ struct policy_handle new_handle;
+ enum winreg_CreateAction action_taken;
+
+ torture_comment(tctx, "Testing VOLATILE key\n");
+
+ test_DeleteKey(b, tctx, handle, TEST_KEY_VOLATILE);
+
+ torture_assert(tctx,
+ test_CreateKey_opts(tctx, b, handle, TEST_KEY_VOLATILE, NULL,
+ REG_OPTION_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ NULL,
+ WERR_OK,
+ &action_taken,
+ &new_handle),
+ "failed to create REG_OPTION_VOLATILE type key");
+
+ torture_assert_int_equal(tctx, action_taken, REG_CREATED_NEW_KEY, "unexpected action");
+
+ torture_assert(tctx,
+ test_CreateKey_opts(tctx, b, &new_handle, TEST_SUBKEY_VOLATILE, NULL,
+ REG_OPTION_NON_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ NULL,
+ WERR_CHILD_MUST_BE_VOLATILE,
+ NULL,
+ NULL),
+ "failed to fail create REG_OPTION_VOLATILE type key");
+
+ torture_assert(tctx,
+ test_CloseKey(b, tctx, &new_handle),
+ "failed to close");
+
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, TEST_KEY_VOLATILE,
+ REG_OPTION_NON_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &new_handle,
+ WERR_OK),
+ "failed to open volatile key");
+
+ torture_assert(tctx,
+ test_DeleteKey(b, tctx, handle, TEST_KEY_VOLATILE),
+ "failed to delete key");
+
+ torture_assert(tctx,
+ test_CreateKey_opts(tctx, b, handle, TEST_KEY_VOLATILE, NULL,
+ REG_OPTION_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ NULL,
+ WERR_OK,
+ &action_taken,
+ &new_handle),
+ "failed to create REG_OPTION_VOLATILE type key");
+
+ torture_assert_int_equal(tctx, action_taken, REG_CREATED_NEW_KEY, "unexpected action");
+
+ torture_assert(tctx,
+ test_CloseKey(b, tctx, &new_handle),
+ "failed to close");
+
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, TEST_KEY_VOLATILE,
+ REG_OPTION_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &new_handle,
+ WERR_OK),
+ "failed to open volatile key");
+
+ torture_assert(tctx,
+ test_CloseKey(b, tctx, &new_handle),
+ "failed to close");
+
+ torture_assert(tctx,
+ test_CloseKey(b, tctx, handle),
+ "failed to close");
+
+ torture_assert(tctx,
+ test_OpenHive(tctx, b, handle, hkey),
+ "failed top open hive");
+
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, TEST_KEY_VOLATILE,
+ REG_OPTION_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &new_handle,
+ WERR_BADFILE),
+ "failed to open volatile key");
+
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, TEST_KEY_VOLATILE,
+ REG_OPTION_NON_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &new_handle,
+ WERR_BADFILE),
+ "failed to open volatile key");
+
+ torture_comment(tctx, "Testing VOLATILE key succeeded\n");
+
+ return true;
+}
+
+static const char *kernel_mode_registry_path(struct torture_context *tctx,
+ int hkey,
+ const char *sid_string,
+ const char *path)
+{
+ switch (hkey) {
+ case HKEY_LOCAL_MACHINE:
+ return talloc_asprintf(tctx, "\\Registry\\MACHINE\\%s", path);
+ case HKEY_CURRENT_USER:
+ return talloc_asprintf(tctx, "\\Registry\\USER\\%s\\%s", sid_string, path);
+ case HKEY_USERS:
+ return talloc_asprintf(tctx, "\\Registry\\USER\\%s", path);
+ case HKEY_CLASSES_ROOT:
+ return talloc_asprintf(tctx, "\\Registry\\MACHINE\\Software\\Classes\\%s", path);
+ default:
+ torture_warning(tctx, "unsupported hkey: 0x%08x\n", hkey);
+ return NULL;
+ }
+
+ return NULL;
+}
+
+static bool test_symlink_keys(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle,
+ int hkey)
+{
+ struct policy_handle new_handle;
+ enum winreg_CreateAction action_taken;
+ DATA_BLOB blob;
+ /* symlink destination needs to be a kernel mode registry path */
+ const char *dest = "\\Registry\\MACHINE\\SOFTWARE\\foo";
+
+ /* disable until we know how to *not* screw up a windows registry */
+ torture_skip(tctx, "symlink test disabled");
+
+ torture_comment(tctx, "Testing REG_OPTION_CREATE_LINK key\n");
+
+ test_DeleteKey(b, tctx, handle, TEST_KEY_SYMLINK);
+
+ torture_assert(tctx,
+ test_CreateKey_opts(tctx, b, handle, TEST_KEY_SYMLINK, NULL,
+ REG_OPTION_CREATE_LINK | REG_OPTION_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ NULL,
+ WERR_OK,
+ &action_taken,
+ &new_handle),
+ "failed to create REG_OPTION_CREATE_LINK type key");
+
+ torture_assert_int_equal(tctx, action_taken, REG_CREATED_NEW_KEY, "unexpected action");
+
+ torture_assert(tctx,
+ convert_string_talloc(tctx, CH_UNIX, CH_UTF16,
+ dest, strlen(dest), /* not NULL terminated */
+ &blob.data, &blob.length,
+ false),
+ "failed to convert");
+
+ torture_assert(tctx,
+ test_SetValue(b, tctx, &new_handle, "SymbolicLinkValue", REG_LINK, blob.data, blob.length),
+ "failed to create SymbolicLinkValue value");
+
+ torture_assert(tctx,
+ test_CloseKey(b, tctx, &new_handle),
+ "failed to close");
+
+ torture_assert(tctx,
+ test_OpenKey_opts(tctx, b, handle, TEST_KEY_SYMLINK,
+ REG_OPTION_OPEN_LINK | REG_OPTION_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &new_handle,
+ WERR_OK),
+ "failed to open symlink key");
+
+ torture_assert(tctx,
+ test_DeleteKey(b, tctx, handle, TEST_KEY_SYMLINK),
+ "failed to delete key");
+
+ return true;
+}
+
+static bool test_CreateKey_keytypes(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle,
+ int hkey)
+{
+
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
+ torture_skip(tctx, "skipping CreateKey keytypes test against Samba");
}
- test_Cleanup(p, tctx, &handle, TEST_KEY_BASE);
+ torture_assert(tctx,
+ test_volatile_keys(tctx, b, handle, hkey),
+ "failed to test volatile keys");
+
+ torture_assert(tctx,
+ test_symlink_keys(tctx, b, handle, hkey),
+ "failed to test symlink keys");
- if (!test_CreateKey(p, tctx, &handle, TEST_KEY_BASE, NULL)) {
+ return true;
+}
+
+static bool test_key_base(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ struct policy_handle *handle,
+ int hkey)
+{
+ struct policy_handle newhandle;
+ bool ret = true, created = false, deleted = false;
+ bool created3 = false;
+
+ test_Cleanup(b, tctx, handle, TEST_KEY_BASE);
+
+ if (!test_CreateKey(b, tctx, handle, TEST_KEY_BASE, NULL)) {
torture_comment(tctx,
"CreateKey (TEST_KEY_BASE) failed\n");
}
- if (!test_CreateKey(p, tctx, &handle, TEST_KEY1, NULL)) {
+ if (!test_CreateKey(b, tctx, handle, TEST_KEY1, NULL)) {
torture_comment(tctx,
"CreateKey failed - not considering a failure\n");
} else {
created = true;
}
- if (created && !test_FlushKey(p, tctx, &handle)) {
- torture_comment(tctx, "FlushKey failed\n");
- ret = false;
- }
+ if (created) {
+ if (!test_FlushKey(b, tctx, handle)) {
+ torture_comment(tctx, "FlushKey failed\n");
+ ret = false;
+ }
- if (created && !test_OpenKey(p, tctx, &handle, TEST_KEY1, &newhandle))
- torture_fail(tctx,
- "CreateKey failed (OpenKey after Create didn't work)\n");
+ if (!test_OpenKey(b, tctx, handle, TEST_KEY1, &newhandle)) {
+ torture_fail(tctx,
+ "CreateKey failed (OpenKey after Create didn't work)\n");
+ }
- if (created) {
- torture_assert(tctx, test_SetValue_simple(p, tctx, &newhandle),
- "simple SetValue test failed");
- if (!test_SetValue_extended(p, tctx, &newhandle)) {
- if (torture_setting_bool(tctx, "samba3", false)) {
- torture_warning(tctx, "extended SetValue test failed");
- } else {
- torture_fail(tctx, "extended SetValue test failed");
+ if (hkey == HKEY_CURRENT_USER) {
+ torture_assert(tctx, test_SetValue_simple(b, tctx, &newhandle),
+ "simple SetValue test failed");
+ torture_assert(tctx, test_SetValue_extended(b, tctx, &newhandle),
+ "extended SetValue test failed");
+ torture_assert(tctx, test_CreateKey_keytypes(tctx, b, &newhandle, hkey),
+ "keytype test failed");
+ }
+
+ if (!test_CloseKey(b, tctx, &newhandle)) {
+ torture_fail(tctx,
+ "CreateKey failed (CloseKey after Open didn't work)\n");
+ }
+
+ if (!test_DeleteKey(b, tctx, handle, TEST_KEY1)) {
+ torture_comment(tctx, "DeleteKey failed\n");
+ ret = false;
+ } else {
+ deleted = true;
+ }
+
+ if (!test_FlushKey(b, tctx, handle)) {
+ torture_comment(tctx, "FlushKey failed\n");
+ ret = false;
+ }
+
+ if (deleted) {
+ if (!test_OpenKey_opts(tctx, b, handle, TEST_KEY1,
+ REG_OPTION_NON_VOLATILE,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &newhandle,
+ WERR_BADFILE)) {
+ torture_comment(tctx,
+ "DeleteKey failed (OpenKey after Delete "
+ "did not return WERR_BADFILE)\n");
+ ret = false;
+ }
+ }
+
+ if (test_CreateKey(b, tctx, handle, TEST_KEY3, NULL)) {
+ created3 = true;
+ }
+
+ if (created3) {
+ if (test_CreateKey(b, tctx, handle, TEST_SUBKEY, NULL)) {
+ if (!test_DeleteKey(b, tctx, handle, TEST_SUBKEY)) {
+ torture_comment(tctx, "DeleteKey failed\n");
+ ret = false;
+ }
+ }
+
+ if (!test_DeleteKey(b, tctx, handle, TEST_KEY3)) {
+ torture_comment(tctx, "DeleteKey failed\n");
+ ret = false;
}
}
}
- if (created && !test_CloseKey(p, tctx, &newhandle))
- torture_fail(tctx,
- "CreateKey failed (CloseKey after Open didn't work)\n");
+ test_Cleanup(b, tctx, handle, TEST_KEY_BASE);
- if (created && !test_DeleteKey(p, tctx, &handle, TEST_KEY1)) {
- torture_comment(tctx, "DeleteKey failed\n");
+ return ret;
+}
+
+static bool test_key_base_sd(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle)
+{
+ struct policy_handle newhandle;
+ bool ret = true, created2 = false, created4 = false;
+ struct dcerpc_binding_handle *b = p->binding_handle;
+
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
+ torture_skip(tctx, "skipping security descriptor tests against Samba");
+ }
+
+ test_Cleanup(b, tctx, handle, TEST_KEY_BASE);
+
+ if (!test_CreateKey(b, tctx, handle, TEST_KEY_BASE, NULL)) {
+ torture_comment(tctx,
+ "CreateKey (TEST_KEY_BASE) failed\n");
+ }
+
+ if (test_CreateKey_sd(b, tctx, handle, TEST_KEY2,
+ NULL, &newhandle)) {
+ created2 = true;
+ }
+
+ if (created2 && !test_CloseKey(b, tctx, &newhandle)) {
+ torture_comment(tctx, "CloseKey failed\n");
ret = false;
- } else {
- deleted = true;
}
- if (created && !test_FlushKey(p, tctx, &handle)) {
- torture_comment(tctx, "FlushKey failed\n");
+ if (test_CreateKey_sd(b, tctx, handle, TEST_KEY4, NULL, &newhandle)) {
+ created4 = true;
+ }
+
+ if (created4 && !test_CloseKey(b, tctx, &newhandle)) {
+ torture_comment(tctx, "CloseKey failed\n");
ret = false;
}
- if (created && deleted &&
- !_test_OpenKey(p, tctx, &handle, TEST_KEY1,
- SEC_FLAG_MAXIMUM_ALLOWED, &newhandle,
- WERR_BADFILE, NULL)) {
- torture_comment(tctx,
- "DeleteKey failed (OpenKey after Delete "
- "did not return WERR_BADFILE)\n");
+ if (created4 && !test_SecurityDescriptors(p, tctx, handle, TEST_KEY4)) {
ret = false;
}
- if (!test_GetVersion(p, tctx, &handle)) {
+ if (created4 && !test_DeleteKey(b, tctx, handle, TEST_KEY4)) {
+ torture_comment(tctx, "DeleteKey failed\n");
+ ret = false;
+ }
+
+ if (created2 && !test_DeleteKey(b, tctx, handle, TEST_KEY2)) {
+ torture_comment(tctx, "DeleteKey failed\n");
+ ret = false;
+ }
+
+ test_Cleanup(b, tctx, handle, TEST_KEY_BASE);
+
+ return ret;
+}
+
+static bool test_Open(struct torture_context *tctx, struct dcerpc_pipe *p,
+ void *userdata)
+{
+ struct policy_handle handle;
+ bool ret = true;
+ struct winreg_OpenHKLM r;
+ struct dcerpc_binding_handle *b = p->binding_handle;
+ int hkey = 0;
+
+ winreg_open_fn open_fn = (winreg_open_fn)userdata;
+
+ r.in.system_name = 0;
+ r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ r.out.handle = &handle;
+
+ torture_assert_ntstatus_ok(tctx, open_fn(b, tctx, &r),
+ "open");
+
+ if (!test_GetVersion(b, tctx, &handle)) {
torture_comment(tctx, "GetVersion failed\n");
ret = false;
}
- if (created && test_CreateKey(p, tctx, &handle, TEST_KEY3, NULL)) {
- created3 = true;
+ if (open_fn == (winreg_open_fn)dcerpc_winreg_OpenHKLM_r) {
+ hkey = HKEY_LOCAL_MACHINE;
+ } else if (open_fn == (winreg_open_fn)dcerpc_winreg_OpenHKU_r) {
+ hkey = HKEY_USERS;
+ } else if (open_fn == (winreg_open_fn)dcerpc_winreg_OpenHKCR_r) {
+ hkey = HKEY_CLASSES_ROOT;
+ } else if (open_fn == (winreg_open_fn)dcerpc_winreg_OpenHKCU_r) {
+ hkey = HKEY_CURRENT_USER;
+ } else {
+ torture_fail(tctx, "unsupported hkey");
+ }
+
+ if (hkey == HKEY_LOCAL_MACHINE) {
+ torture_assert(tctx,
+ test_HKLM_wellknown(tctx, b, &handle),
+ "failed to test HKLM wellknown keys");
}
- if (created3 &&
- test_CreateKey(p, tctx, &handle, TEST_SUBKEY, NULL)) {
- created_subkey = true;
+ if (!test_key_base(tctx, b, &handle, hkey)) {
+ torture_warning(tctx, "failed to test TEST_KEY_BASE");
+ ret = false;
}
- if (created_subkey &&
- !test_DeleteKey(p, tctx, &handle, TEST_KEY3)) {
- printf("DeleteKey failed\n");
+ if (!test_key_base_sd(tctx, p, &handle)) {
+ torture_warning(tctx, "failed to test TEST_KEY_BASE sd");
ret = false;
}
/* The HKCR hive has a very large fanout */
- if (open_fn == (void *)dcerpc_winreg_OpenHKCR) {
+ if (hkey == HKEY_CLASSES_ROOT) {
if(!test_key(p, tctx, &handle, MAX_DEPTH - 1, false)) {
ret = false;
}
}
}
- test_Cleanup(p, tctx, &handle, TEST_KEY_BASE);
-
return ret;
}
test_InitiateSystemShutdownEx);
test->dangerous = true;
- /* Basic tests without security descriptors */
- torture_rpc_tcase_add_test_ex(tcase, "HKLM-basic",
+ torture_rpc_tcase_add_test_ex(tcase, "HKLM",
test_Open,
- (winreg_open_fn)dcerpc_winreg_OpenHKLM);
- torture_rpc_tcase_add_test_ex(tcase, "HKU-basic",
+ (winreg_open_fn)dcerpc_winreg_OpenHKLM_r);
+ torture_rpc_tcase_add_test_ex(tcase, "HKU",
test_Open,
- (winreg_open_fn)dcerpc_winreg_OpenHKU);
- torture_rpc_tcase_add_test_ex(tcase, "HKCR-basic",
+ (winreg_open_fn)dcerpc_winreg_OpenHKU_r);
+ torture_rpc_tcase_add_test_ex(tcase, "HKCR",
test_Open,
- (winreg_open_fn)dcerpc_winreg_OpenHKCR);
- torture_rpc_tcase_add_test_ex(tcase, "HKCU-basic",
+ (winreg_open_fn)dcerpc_winreg_OpenHKCR_r);
+ torture_rpc_tcase_add_test_ex(tcase, "HKCU",
test_Open,
- (winreg_open_fn)dcerpc_winreg_OpenHKCU);
-
- /* Security descriptor tests */
- torture_rpc_tcase_add_test_ex(tcase, "HKLM-security",
- test_Open_Security,
- (winreg_open_fn)dcerpc_winreg_OpenHKLM);
- torture_rpc_tcase_add_test_ex(tcase, "HKU-security",
- test_Open_Security,
- (winreg_open_fn)dcerpc_winreg_OpenHKU);
- torture_rpc_tcase_add_test_ex(tcase, "HKCR-security",
- test_Open_Security,
- (winreg_open_fn)dcerpc_winreg_OpenHKCR);
- torture_rpc_tcase_add_test_ex(tcase, "HKCU-security",
- test_Open_Security,
- (winreg_open_fn)dcerpc_winreg_OpenHKCU);
+ (winreg_open_fn)dcerpc_winreg_OpenHKCU_r);
return suite;
}
git.samba.org / amitay / samba.git / blobdiff