The branch, master has been updated via 02f3567 smbtorture: use xxxULL notation instead of INT64_C(xxx) from bf7b026 s4-acl: Replaced talloc_reference with talloc_steal, as aclread is the only one using this result message.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 02f35678144a9878c15c3f43715f18653e74372b Author: Matthieu Patou <m...@matws.net> Date: Wed Dec 8 15:32:49 2010 +0300 smbtorture: use xxxULL notation instead of INT64_C(xxx) The first one is portable the second not always Signed-off-by: Stefan Metzmacher <me...@samba.org> Autobuild-User: Matthieu Patou <m...@samba.org> Autobuild-Date: Wed Dec 8 15:48:10 CET 2010 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source4/torture/ndr/drsblobs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/ndr/drsblobs.c b/source4/torture/ndr/drsblobs.c index c1abce2..ca3fa1d 100644 --- a/source4/torture/ndr/drsblobs.c +++ b/source4/torture/ndr/drsblobs.c @@ -41,13 +41,13 @@ static bool forest_trust_info_check_out(struct torture_context *tctx, torture_assert_int_equal(tctx, r->count, 2, "count"); torture_assert_int_equal(tctx, r->records[0].record_size, 0x00000018, "record size"); torture_assert_int_equal(tctx, r->records[0].record.flags, 0, "record flags"); - torture_assert_u64_equal(tctx, r->records[0].record.timestamp, INT64_C(0x9BD5AF0001CACA3E), "record timestamp"); + torture_assert_u64_equal(tctx, r->records[0].record.timestamp, 0x9BD5AF0001CACA3EULL, "record timestamp"); torture_assert_int_equal(tctx, r->records[0].record.type, FOREST_TRUST_TOP_LEVEL_NAME, "record type"); torture_assert_int_equal(tctx, r->records[0].record.data.name.size, 7, "record name size"); torture_assert_str_equal(tctx, r->records[0].record.data.name.string, "f2.test", "record name string"); torture_assert_int_equal(tctx, r->records[1].record_size, 0x0000003a, "record size"); torture_assert_int_equal(tctx, r->records[1].record.flags, 0, "record flags"); - torture_assert_u64_equal(tctx, r->records[1].record.timestamp, INT64_C(0x9BD5AF0001CACA3E), "record timestamp"); + torture_assert_u64_equal(tctx, r->records[1].record.timestamp, 0x9BD5AF0001CACA3EULL, "record timestamp"); torture_assert_int_equal(tctx, r->records[1].record.type, FOREST_TRUST_DOMAIN_INFO, "record type"); torture_assert_int_equal(tctx, r->records[1].record.data.info.sid_size, 0x00000018, "record info sid_size"); torture_assert_sid_equal(tctx, &r->records[1].record.data.info.sid, dom_sid_parse_talloc(tctx, "S-1-5-21-677661288-1956808876-2402106903"), "record info sid"); -- Samba Shared Repository