diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-12-10 14:17:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-12-12 12:57:08 +0100 |
| commit | 8d3e86d6ae6300ae427cc9104edbcc1193b5e892 (patch) | |
| tree | 534ce9b27c3ecc1055b9583908c69759ebcb4f6d | |
| parent | 5ae24e1cc084b48e46e0c7e355c262962eaa0b39 (diff) | |
| download | samba-8d3e86d6ae6300ae427cc9104edbcc1193b5e892.tar.gz samba-8d3e86d6ae6300ae427cc9104edbcc1193b5e892.tar.bz2 samba-8d3e86d6ae6300ae427cc9104edbcc1193b5e892.zip | |
s4-torture Modify rpc.lsa.forest.trust test to progress further FL Win2003 R2
This modification is required to pass against a domain in functional
level Windows 2003 or later.
Andrew Bartlett
| -rw-r--r-- | source4/torture/rpc/forest_trust.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c index 7ae40e5ded..397661ed8a 100644 --- a/source4/torture/rpc/forest_trust.c +++ b/source4/torture/rpc/forest_trust.c @@ -118,7 +118,13 @@ static bool test_create_trust_and_set_info(struct dcerpc_pipe *p, trustinfo.trust_type = LSA_TRUST_TYPE_UPLEVEL; - trustinfo.trust_attributes = LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE; + /* MS-LSAD: Section 3.1.4.7.10 makes it clear that Win2k3 + * functional level and above return + * NT_STATUS_INVALID_DOMAIN_STATE if + * TRUST_ATTRIBUTE_FOREST_TRANSITIVE or + * TRUST_ATTRIBUTE_CROSS_ORGANIZATION is set here. + */ + trustinfo.trust_attributes = 0; r.in.policy_handle = handle; r.in.info = &trustinfo; @@ -651,10 +657,10 @@ static bool test_validate_trust(struct torture_context *tctx, 1, trust_info->count); return false; } - if (trust_info->data[0] != LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE) { + if (trust_info->data[0] != 0) { torture_comment(tctx, "Unexpected result, " "expected %d, got %d.\n", - LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE, + 0, trust_info->data[0]); return false; } |