From 896617acae66054f1b021d72830da5b070928a03 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 17 Dec 2024 17:49:52 +0100 Subject: [PATCH] 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 Reviewed-by: Jennifer Sutton --- librpc/idl/drsblobs.idl | 2 +- selftest/knownfail.d/samba4.local.ndr | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 selftest/knownfail.d/samba4.local.ndr diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl index b4f053dc197..dd78c8f2f92 100644 --- 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 index a81b52e7bca..00000000000 --- a/selftest/knownfail.d/samba4.local.ndr +++ /dev/null @@ -1 +0,0 @@ -^samba4.local.ndr.*.drsblobs.ForestTrustInfo_with_scanner.forest_trust_info_check_out2 -- 2.47.2