Revert "s4: fix the build after winreg idl changes."

This reverts commit 61db229c08a601780da09ee4f2f4f1eb32ec3aa0.

diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c
index bcf5c8dad4dde43f45246ce9fbc02d35a7f60008..3a16ae1db59c56b875d95bee0bfabcafc8b7d303 100644 (file)
--- 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 60a3230d257edee72092c6e7cbc65c3fc657a4a8..de804b77218442942c18140aefead35cb2915987 100644 (file)
--- 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 bd897f0ada4f8c46e1638eae644a5c35d930aed9..08ec8f5ea1a1fa4678f4c6cdd432b747044abdfd 100644 (file)
--- 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;