summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-03-02 13:44:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:04 -0500
commit04fed31e1a61366debd217510cb1a9d767fbaaec (patch)
treef13eedb3a29aa15f0deb07d2fd9c6b74c0d927e9 /source4
parent678c401d3ed6f480e237e519aa9aeeaa12b0ab52 (diff)
downloadsamba-04fed31e1a61366debd217510cb1a9d767fbaaec.tar.gz
samba-04fed31e1a61366debd217510cb1a9d767fbaaec.tar.bz2
samba-04fed31e1a61366debd217510cb1a9d767fbaaec.zip
r21653: Add two more tdr tests.
(This used to be commit cc40e3acd95aecea481a65e936d311b815c6e9ae)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/tools/ndrdump.c9
-rw-r--r--source4/torture/local/tdr.c32
2 files changed, 41 insertions, 0 deletions
diff --git a/source4/librpc/tools/ndrdump.c b/source4/librpc/tools/ndrdump.c
index 7fc3e57ff3..23cfebcb9c 100644
--- a/source4/librpc/tools/ndrdump.c
+++ b/source4/librpc/tools/ndrdump.c
@@ -166,6 +166,15 @@ const struct dcerpc_interface_table *load_iface_from_plugin(const char *plugin,
#if (_SAMBA_BUILD_ >= 4)
dcerpc_table_init();
+#else
+ /* Initialise samba stuff */
+ load_case_tables();
+
+ setlinebuf(stdout);
+
+ dbf = x_stderr;
+
+ setup_logging(argv[0],True);
#endif
pc = poptGetContext("ndrdump", argc, argv, long_options, 0);
diff --git a/source4/torture/local/tdr.c b/source4/torture/local/tdr.c
index 12887f0480..64d4ef84eb 100644
--- a/source4/torture/local/tdr.c
+++ b/source4/torture/local/tdr.c
@@ -50,12 +50,44 @@ static bool test_pull_uint8(struct torture_context *tctx)
return true;
}
+static bool test_push_uint16(struct torture_context *tctx)
+{
+ uint16_t v = 0xF32;
+ struct tdr_push *tdr = talloc_zero(tctx, struct tdr_push);
+
+ torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed");
+ torture_assert_int_equal(tctx, tdr->data.length, 2, "length incorrect");
+ torture_assert_int_equal(tctx, tdr->data.data[0], 0x32, "data incorrect");
+ torture_assert_int_equal(tctx, tdr->data.data[1], 0x0F, "data incorrect");
+ return true;
+}
+
+static bool test_pull_uint16(struct torture_context *tctx)
+{
+ uint16_t d = 782;
+ uint16_t l;
+ struct tdr_pull tdr;
+ tdr.data.data = (uint8_t *)&d;
+ tdr.data.length = 2;
+ tdr.offset = 0;
+ tdr.flags = 0;
+ torture_assert_ntstatus_ok(tctx, tdr_pull_uint16(&tdr, tctx, &l),
+ "pull failed");
+ torture_assert_int_equal(tctx, 2, tdr.offset,
+ "offset invalid");
+ torture_assert_int_equal(tctx, 782, l, "right int read");
+ return true;
+}
+
struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, "TDR");
torture_suite_add_simple_test(suite, "pull_uint8", test_pull_uint8);
torture_suite_add_simple_test(suite, "push_uint8", test_push_uint8);
+
+ torture_suite_add_simple_test(suite, "pull_uint16", test_pull_uint16);
+ torture_suite_add_simple_test(suite, "push_uint16", test_push_uint16);
return suite;
}