r21386: Run all NDR tests in the buildfarm, import some functions from Samba3's IDL.

(This used to be commit 15a4b81ba0b5eeb25126a0b1a7bea7d3bf921ab2)

2 files changed, 185 insertions, 7 deletions

diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index c8c2b05df3..9ca60f651b 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -84,7 +84,163 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_test(
 	return test;
 }
 
-NTSTATUS torture_ndr_init(void)
+static bool test_check_string_terminator(struct torture_context *tctx)
+{
+	struct ndr_pull *ndr;
+	DATA_BLOB blob;
+	TALLOC_CTX *mem_ctx = tctx;
+
+	/* Simple test */
+	blob = strhex_to_data_blob("0000");
+	
+	ndr = ndr_pull_init_blob(&blob, mem_ctx);
+
+	torture_assert_ntstatus_ok(tctx, ndr_check_string_terminator(ndr, 1, 2),
+							   "simple check_string_terminator test failed");
+
+	torture_assert(tctx, ndr->offset == 0,
+		"check_string_terminator did not reset offset");
+
+	if (NT_STATUS_IS_OK(ndr_check_string_terminator(ndr, 1, 3))) {
+		torture_fail(tctx, "check_string_terminator checked beyond string boundaries");
+	}
+
+	torture_assert(tctx, ndr->offset == 0, 
+		"check_string_terminator did not reset offset");
+
+	talloc_free(ndr);
+
+	blob = strhex_to_data_blob("11220000");
+	ndr = ndr_pull_init_blob(&blob, mem_ctx);
+
+	torture_assert_ntstatus_ok(tctx, 
+		ndr_check_string_terminator(ndr, 4, 1),
+		"check_string_terminator failed to recognize terminator");
+
+	torture_assert_ntstatus_ok(tctx, 
+		ndr_check_string_terminator(ndr, 3, 1),
+		"check_string_terminator failed to recognize terminator");
+
+	if (NT_STATUS_IS_OK(ndr_check_string_terminator(ndr, 2, 1))) {
+		torture_fail(tctx, 
+					 "check_string_terminator erroneously reported terminator");
+	}
+
+	torture_assert(tctx, ndr->offset == 0,
+		"check_string_terminator did not reset offset");
+	return true;
+}
+
+static bool test_guid_from_string_valid(struct torture_context *tctx)
+{
+	/* FIXME */
+	return true;
+}
+
+static bool test_guid_from_string_null(struct torture_context *tctx)
+{
+	struct GUID guid;
+	torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+								  GUID_from_string(NULL, &guid), 
+								  "NULL failed");
+	return true;
+}
+
+static bool test_guid_from_string_invalid(struct torture_context *tctx)
+{
+	struct GUID g1;
+	torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+								  GUID_from_string("bla", &g1),
+								  "parameter not invalid");
+	return true;
+}	
+
+static bool test_guid_from_string(struct torture_context *tctx)
+{
+	struct GUID g1, exp;
+	torture_assert_ntstatus_ok(tctx,
+							   GUID_from_string("00000001-0002-0003-0405-060708090a0b", &g1),
+							   "invalid return code");
+	exp.time_low = 1;
+	exp.time_mid = 2;
+	exp.time_hi_and_version = 3;
+	exp.clock_seq[0] = 4;
+	exp.clock_seq[1] = 5;
+	exp.node[0] = 6;
+	exp.node[1] = 7;
+	exp.node[2] = 8;
+	exp.node[3] = 9;
+	exp.node[4] = 10;
+	exp.node[5] = 11;
+	torture_assert(tctx, GUID_equal(&g1, &exp), "UUID parsed incorrectly");
+	torture_assert_ntstatus_ok(tctx,
+							   GUID_from_string("{00000001-0002-0003-0405-060708090a0b}", &g1),
+							   "invalid return code");
+	torture_assert(tctx, GUID_equal(&g1, &exp), "UUID parsed incorrectly");
+
+	return true;
+}
+
+static bool test_guid_string_valid(struct torture_context *tctx)
+{
+	struct GUID g;
+	g.time_low = 1;
+	g.time_mid = 2;
+	g.time_hi_and_version = 3;
+	g.clock_seq[0] = 4;
+	g.clock_seq[1] = 5;
+	g.node[0] = 6;
+	g.node[1] = 7;
+	g.node[2] = 8;
+	g.node[3] = 9;
+	g.node[4] = 10;
+	g.node[5] = 11;
+	torture_assert_str_equal(tctx, "00000001-0002-0003-0405-060708090a0b", GUID_string(tctx, &g), 
+							 "parsing guid failed");
+	return true;
+}
+
+static bool test_guid_string2_valid(struct torture_context *tctx)
+{
+	struct GUID g;
+	g.time_low = 1;
+	g.time_mid = 2;
+	g.time_hi_and_version = 3;
+	g.clock_seq[0] = 4;
+	g.clock_seq[1] = 5;
+	g.node[0] = 6;
+	g.node[1] = 7;
+	g.node[2] = 8;
+	g.node[3] = 9;
+	g.node[4] = 10;
+	g.node[5] = 11;
+	torture_assert_str_equal(tctx, "{00000001-0002-0003-0405-060708090a0b}", GUID_string2(tctx, &g), 
+							 "parsing guid failed");
+	return true;
+}
+
+static bool test_compare_uuid(struct torture_context *tctx)
+{
+	struct GUID g1, g2;
+	ZERO_STRUCT(g1); ZERO_STRUCT(g2);
+	torture_assert_int_equal(tctx, 0, GUID_compare(&g1, &g2), 
+							 "GUIDs not equal");
+	g1.time_low = 1;
+	torture_assert_int_equal(tctx, 1, GUID_compare(&g1, &g2), 
+							 "GUID diff invalid");
+
+	g1.time_low = 10;
+	torture_assert_int_equal(tctx, 10, GUID_compare(&g1, &g2), 
+							 "GUID diff invalid");
+
+	g1.time_low = 0;
+	g1.clock_seq[1] = 20;
+	torture_assert_int_equal(tctx, 20, GUID_compare(&g1, &g2), 
+							 "GUID diff invalid");
+	return true;
+}
+
+struct torture_suite *torture_local_ndr(void)
 {
 	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NDR");
 
@@ -94,8 +250,30 @@ NTSTATUS torture_ndr_init(void)
 	torture_suite_add_suite(suite, ndr_epmap_suite(suite));
 	torture_suite_add_suite(suite, ndr_dfs_suite(suite));
 
-	torture_register_suite(suite);
+	torture_suite_add_simple_test(suite, "string terminator", 
+								   test_check_string_terminator);
+
+	torture_suite_add_simple_test(suite, "guid_from_string_null", 
+								   test_guid_from_string_null);
+
+	torture_suite_add_simple_test(suite, "guid_from_string", 
+								   test_guid_from_string);
+
+	torture_suite_add_simple_test(suite, "guid_from_string_invalid", 
+								   test_guid_from_string_invalid);
+
+	torture_suite_add_simple_test(suite, "guid_string_valid", 
+								   test_guid_string_valid);
+
+	torture_suite_add_simple_test(suite, "guid_string2_valid", 
+								   test_guid_string2_valid);
+
+	torture_suite_add_simple_test(suite, "guid_from_string_valid", 
+								   test_guid_from_string_valid);
+
+	torture_suite_add_simple_test(suite, "compare_uuid", 
+								   test_compare_uuid);
 
-	return NT_STATUS_OK;
+	return suite;
 }
 
diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index 8259a0a45e..b4e19e88ad 100644
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -390,7 +390,7 @@ static const uint8_t queryinfokey_in_data[] = {
 static bool queryinfokey_in_check(struct torture_context *tctx, struct winreg_QueryInfoKey *r)
 {
 	/* FIXME: Handle */
-	torture_assert(tctx, r->in.class_in->name == NULL, "class in");
+	torture_assert(tctx, r->in.classname->name == NULL, "class in");
 	return true;
 }
 
@@ -403,9 +403,9 @@ static const uint8_t queryinfokey_out_data[] = {
 
 static bool queryinfokey_out_check(struct torture_context *tctx, struct winreg_QueryInfoKey *r)
 {
-	torture_assert(tctx, r->out.class_in != NULL, "class out");
-	torture_assert(tctx, r->out.class_in->name != NULL, "class out name");
-	torture_assert_str_equal(tctx, r->out.class_in->name, "", "class out name");
+	torture_assert(tctx, r->out.classname != NULL, "class out");
+	torture_assert(tctx, r->out.classname->name != NULL, "class out name");
+	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");