3 files changed, 13 insertions, 13 deletions

diff --git a/source4/torture/ndr/lsa.c b/source4/torture/ndr/lsa.c
index a72a03fa38..0d6d786882 100644
--- a/source4/torture/ndr/lsa.c
+++ b/source4/torture/ndr/lsa.c
@@ -1538,8 +1538,8 @@ static bool lsarlookupnames2_in_check(struct torture_context *tctx,
 	torture_assert_str_equal(tctx, r->in.names[1].string, "Administrators", 
 							 "names[1]");
 	torture_assert_int_equal(tctx, r->in.level, 1, "level");
-	torture_assert_int_equal(tctx, r->in.unknown1, 0, "unknown 1");
-	torture_assert_int_equal(tctx, r->in.unknown2, 0, "unknown 2");
+	torture_assert_int_equal(tctx, r->in.lookup_options, 0, "lookup_options");
+	torture_assert_int_equal(tctx, r->in.client_revision, 0, "client_revision");
 	torture_assert_int_equal(tctx, *r->in.count, 0, "count");
 	torture_assert_int_equal(tctx, r->in.sids->count, 0, "sids count");
 	torture_assert(tctx, r->in.sids->sids == NULL, "sids sids");
@@ -1637,8 +1637,8 @@ static bool lsarlookupnames3_in_check(struct torture_context *tctx,
 	torture_assert_str_equal(tctx, r->in.names[1].string, "Administrators", 
 							 "names[1]");
 	torture_assert_int_equal(tctx, r->in.level, 1, "level");
-	torture_assert_int_equal(tctx, r->in.unknown1, 0, "unknown 1");
-	torture_assert_int_equal(tctx, r->in.unknown2, 0, "unknown 2");
+	torture_assert_int_equal(tctx, r->in.lookup_options, 0, "lookup_options");
+	torture_assert_int_equal(tctx, r->in.client_revision, 0, "client_revision");
 	torture_assert_int_equal(tctx, *r->in.count, 0, "count");
 	torture_assert_int_equal(tctx, r->in.sids->count, 0, "sids count");
 	torture_assert(tctx, r->in.sids->sids == NULL, "sids sids");
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index 63636f8c5f..70bd070009 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -22,7 +22,7 @@
 #include "torture/ndr/ndr.h"
 #include "torture/ndr/proto.h"
 #include "torture/torture.h"
-#include "util/dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "param/param.h"
 
 struct ndr_pull_test_data {
@@ -96,7 +96,7 @@ static bool test_check_string_terminator(struct torture_context *tctx)
 	TALLOC_CTX *mem_ctx = tctx;
 
 	/* Simple test */
-	blob = strhex_to_data_blob("0000");
+	blob = strhex_to_data_blob(tctx, "0000");
 	
 	ndr = ndr_pull_init_blob(&blob, mem_ctx, lp_iconv_convenience(tctx->lp_ctx));
 
@@ -115,7 +115,7 @@ static bool test_check_string_terminator(struct torture_context *tctx)
 
 	talloc_free(ndr);
 
-	blob = strhex_to_data_blob("11220000");
+	blob = strhex_to_data_blob(tctx, "11220000");
 	ndr = ndr_pull_init_blob(&blob, mem_ctx, lp_iconv_convenience(tctx->lp_ctx));
 
 	torture_assert_ndr_success(tctx,
diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index ab256a7152..de804b7721 100644
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -197,10 +197,10 @@ static const uint8_t queryvalue_in_data[] = {
 static bool queryvalue_in_check(struct torture_context *tctx, 
 								  struct winreg_QueryValue *r)
 {
-	torture_assert_str_equal(tctx, r->in.value_name.name, "HOMEPATH", "name");
+	torture_assert_str_equal(tctx, r->in.value_name->name, "HOMEPATH", "name");
 	torture_assert_int_equal(tctx, *r->in.type, 0, "type");
-	torture_assert_int_equal(tctx, *r->in.size, 4095, "size");
-	torture_assert_int_equal(tctx, *r->in.length, 0, "length");
+	torture_assert_int_equal(tctx, *r->in.data_size, 4095, "size");
+	torture_assert_int_equal(tctx, *r->in.data_length, 0, "length");
 	torture_assert(tctx, r->in.data == NULL, "data pointer");
 
 	return true;
@@ -218,8 +218,8 @@ static bool queryvalue_out_check(struct torture_context *tctx,
 	torture_assert_werr_ok(tctx, r->out.result, "return code");
 	torture_assert_int_equal(tctx, *r->out.type, 1, "type");
 	torture_assert(tctx, r->out.data == NULL, "data pointer");
-	torture_assert_int_equal(tctx, *r->out.size, 76, "size");
-	torture_assert_int_equal(tctx, *r->out.length, 0, "length");
+	torture_assert_int_equal(tctx, *r->out.data_size, 76, "size");
+	torture_assert_int_equal(tctx, *r->out.data_length, 0, "length");
 
 	return true;
 }
@@ -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;
 }