From e08e5a0f3fa58a08532bb6d9a613985305e31c4f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 20 Oct 2008 15:53:24 +0200 Subject: Revert "s4: fix the build after winreg idl changes." This reverts commit 61db229c08a601780da09ee4f2f4f1eb32ec3aa0. --- source4/lib/registry/rpc.c | 4 ++-- source4/torture/ndr/winreg.c | 2 +- source4/torture/rpc/winreg.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c index bcf5c8dad4..3a16ae1db5 100644 --- a/source4/lib/registry/rpc.c +++ b/source4/lib/registry/rpc.c @@ -32,7 +32,7 @@ struct rpc_key { const char* classname; uint32_t num_subkeys; uint32_t max_subkeylen; - uint32_t max_subkeysize; + uint32_t max_classlen; uint32_t num_values; uint32_t max_valnamelen; uint32_t max_valbufsize; @@ -380,7 +380,7 @@ static WERROR rpc_query_key(TALLOC_CTX *mem_ctx, const struct registry_key *k) r.out.classname = &classname; r.out.num_subkeys = &mykeydata->num_subkeys; r.out.max_subkeylen = &mykeydata->max_subkeylen; - r.out.max_subkeysize = &mykeydata->max_subkeysize; + r.out.max_classlen = &mykeydata->max_classlen; r.out.num_values = &mykeydata->num_values; r.out.max_valnamelen = &mykeydata->max_valnamelen; r.out.max_valbufsize = &mykeydata->max_valbufsize; diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c index 60a3230d25..de804b7721 100644 --- a/source4/torture/ndr/winreg.c +++ b/source4/torture/ndr/winreg.c @@ -417,7 +417,7 @@ static bool queryinfokey_out_check(struct torture_context *tctx, struct winreg_Q torture_assert_str_equal(tctx, r->out.classname->name, "", "class out name"); torture_assert_int_equal(tctx, *r->out.num_subkeys, 0, "num subkeys"); torture_assert_int_equal(tctx, *r->out.max_subkeylen, 0, "subkey length"); - torture_assert_int_equal(tctx, *r->out.max_subkeysize, 140, "subkey size"); + torture_assert_int_equal(tctx, *r->out.max_classlen, 140, "subkey size"); torture_assert_werr_ok(tctx, r->out.result, "return code"); return true; } diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index bd897f0ada..08ec8f5ea1 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -1396,7 +1396,7 @@ static bool test_QueryInfoKey(struct dcerpc_pipe *p, struct policy_handle *handle, char *class) { struct winreg_QueryInfoKey r; - uint32_t num_subkeys, max_subkeylen, max_subkeysize, + uint32_t num_subkeys, max_subkeylen, max_classlen, num_values, max_valnamelen, max_valbufsize, secdescsize; NTTIME last_changed_time; @@ -1405,7 +1405,7 @@ static bool test_QueryInfoKey(struct dcerpc_pipe *p, r.in.handle = handle; r.out.num_subkeys = &num_subkeys; r.out.max_subkeylen = &max_subkeylen; - r.out.max_subkeysize = &max_subkeysize; + r.out.max_classlen = &max_classlen; r.out.num_values = &num_values; r.out.max_valnamelen = &max_valnamelen; r.out.max_valbufsize = &max_valbufsize; -- cgit