summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-03-11 20:20:48 +0100
committerGünther Deschner <gd@samba.org>2010-03-11 20:23:47 +0100
commite0d85f87b7a6a3c887bc0a7f93b26380369e269c (patch)
tree5192a92cf2f0f24d8bd85d6ce05333697566057e /source4
parent96a38e387e9655b14504c0c3d181db95cc84cc3d (diff)
downloadsamba-e0d85f87b7a6a3c887bc0a7f93b26380369e269c.tar.gz
samba-e0d85f87b7a6a3c887bc0a7f93b26380369e269c.tar.bz2
samba-e0d85f87b7a6a3c887bc0a7f93b26380369e269c.zip
winreg: add winreg_KeyType enum.
Guenther
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/registry/rpc.c2
-rw-r--r--source4/torture/ndr/winreg.c2
-rw-r--r--source4/torture/rpc/samba3rpc.c4
-rw-r--r--source4/torture/rpc/spoolss.c2
-rw-r--r--source4/torture/rpc/winreg.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c
index 0cb6b118a5..0064e17c9a 100644
--- a/source4/lib/registry/rpc.c
+++ b/source4/lib/registry/rpc.c
@@ -170,7 +170,7 @@ static WERROR rpc_open_key(TALLOC_CTX *mem_ctx, struct registry_key *h,
ZERO_STRUCT(r);
r.in.parent_handle = &parentkeydata->pol;
r.in.keyname.name = name;
- r.in.unknown = 0x00000000;
+ r.in.options = 0x00000000;
r.in.access_mask = 0x02000000;
r.out.handle = &mykeydata->pol;
diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index de804b7721..14ee84484a 100644
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -323,7 +323,7 @@ static const uint8_t openkey_in_data[] = {
static bool openkey_in_check(struct torture_context *tctx, struct winreg_OpenKey *r)
{
- torture_assert_int_equal(tctx, r->in.unknown, 0, "unknown");
+ torture_assert_int_equal(tctx, r->in.options, 0, "unknown");
torture_assert_int_equal(tctx, r->in.access_mask, 0x02000000, "access mask");
torture_assert_str_equal(tctx, r->in.keyname.name, "spottyfoot", "keyname");
/* FIXME: parent handle */
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 9e7b18b4d7..56b48ad8e6 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -3097,7 +3097,7 @@ static NTSTATUS enumkeys(struct dcerpc_pipe *p, struct policy_handle *handle,
o.in.parent_handle = handle;
o.in.keyname.name = r.out.name->name;
- o.in.unknown = 0;
+ o.in.options = 0;
o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
o.out.handle = &key_handle;
@@ -3453,7 +3453,7 @@ static NTSTATUS torture_samba3_setconfig(struct smbcli_state *cli,
status = NT_STATUS_NO_MEMORY;
goto done;
}
- o.in.unknown = 0;
+ o.in.options = 0;
o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
o.out.handle = &key_handle;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index d5dfee9e75..5b2bc86825 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3311,7 +3311,7 @@ static bool test_winreg_OpenKey(struct torture_context *tctx,
r.in.parent_handle = hive_handle;
init_winreg_String(&r.in.keyname, keyname);
- r.in.unknown = 0x00000000;
+ r.in.options = REG_KEYTYPE_NON_VOLATILE;
r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
r.out.handle = key_handle;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 486826c8c9..aab5dc3b69 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -365,7 +365,7 @@ static bool _test_OpenKey(struct dcerpc_pipe *p, struct torture_context *tctx,
ZERO_STRUCT(r);
r.in.parent_handle = hive_handle;
init_winreg_String(&r.in.keyname, keyname);
- r.in.unknown = 0x00000000;
+ r.in.options = REG_KEYTYPE_NON_VOLATILE;
r.in.access_mask = access_mask;
r.out.handle = key_handle;