drsblobs.idl: use dom_sid0 in ForestTrustDataDomainInfo

We already use ndr_size_dom_sid0() and when ForestTrustDataDomainInfo
is used as part of ForestTrustDataScannerInfo, sid_size is 0
and the subcontext for the sid is skipped.

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 b4f053dc19725f9fa68f0b52e2c296c63f50136d..dd78c8f2f92736743b861903e048fc5f93c6e457 100644 (file)
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -613,7 +613,7 @@ interface drsblobs {
 
        typedef [flag(NDR_NOALIGN)] struct {
                [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
-               [subcontext(0),subcontext_size(sid_size)] dom_sid sid;
+               [subcontext(0),subcontext_size(sid_size)] dom_sid0 sid;
                ForestTrustString dns_name;
                ForestTrustString netbios_name;
        } ForestTrustDataDomainInfo;

diff --git a/selftest/knownfail.d/samba4.local.ndr b/selftest/knownfail.d/samba4.local.ndr
deleted file mode 100644 (file)
index a81b52e..0000000
--- a/selftest/knownfail.d/samba4.local.ndr
+++ /dev/null
@@ -1 +0,0 @@
-^samba4.local.ndr.*.drsblobs.ForestTrustInfo_with_scanner.forest_trust_info_check_out2