From 3295e0214c5ba2e22ca6afa268c6217638be35e4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 17 Dec 2024 15:40:49 +0100 Subject: [PATCH] drsblobs.idl: split explicit binary data and unknown data for ForestTrustData For know FOREST_TRUST_SCANNER_INFO unknown. Signed-off-by: Stefan Metzmacher Reviewed-by: Jennifer Sutton --- librpc/idl/drsblobs.idl | 3 ++- source4/torture/ndr/drsblobs.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl index 561cc8d04ca..797307e9c80 100644 --- a/librpc/idl/drsblobs.idl +++ b/librpc/idl/drsblobs.idl @@ -627,7 +627,8 @@ interface drsblobs { [case(FOREST_TRUST_TOP_LEVEL_NAME)] ForestTrustString name; [case(FOREST_TRUST_TOP_LEVEL_NAME_EX)] ForestTrustString name; [case(FOREST_TRUST_DOMAIN_INFO)] ForestTrustDataDomainInfo info; - [default] ForestTrustDataBinaryData data; + [case(FOREST_TRUST_BINARY_DATA)] ForestTrustDataBinaryData binary; + [default] ForestTrustDataBinaryData unknown; } ForestTrustData; /* meaning of flags depends on record type and values are diff --git a/source4/torture/ndr/drsblobs.c b/source4/torture/ndr/drsblobs.c index 070c51546c6..6b1ef777bef 100644 --- a/source4/torture/ndr/drsblobs.c +++ b/source4/torture/ndr/drsblobs.c @@ -125,7 +125,7 @@ static bool forest_trust_info_check_out2(struct torture_context *tctx, torture_assert_int_equal(tctx, rec->flags, 0, "record flags"); torture_assert_u64_equal(tctx, rec->timestamp, 0xCF71C4FD01DB4CBAULL, "record timestamp"); torture_assert_int_equal(tctx, rec->type, FOREST_TRUST_SCANNER_INFO, "record type"); - b = &rec->data.data; + b = &rec->data.unknown; torture_assert_int_equal(tctx, b->size, 0x24, "scanner data"); return true; -- 2.47.2