drsblobs.idl: split explicit binary data and unknown data for ForestTrustData

For know FOREST_TRUST_SCANNER_INFO unknown.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index 561cc8d04caa16962857634b2f2314229b742604..797307e9c80e702d4dfa970153aa162a94b1f21c 100644 (file)
--- 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 070c51546c64b85f18ba946b9b770598f22cbee5..6b1ef777beff70ca0794b920063d68d613c1b97b 100644 (file)
--- 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;